Merge lp://staging/~bladernr/checkbox/978925-fix-rem-watcher-timeout into lp://staging/checkbox

Thanks for the 0.13.8 bump!

One thing, I noticed that the optical writing tests also have a similar problem; after finishing writing (and the disc popping out and me having to put the tray back in, and it taking about 30 seconds to spin up and start reading the disc) these tests are also very prone to failing.

Maybe an experiment to see how long the process takes, and increasing the timeout accordingly may help here. So the question is if you'd like to handle that as part of this bug/merge, or we should file and handle separately.

Just for convenience, otherwise this looks fine and I'd be OK to merge it as soon as we decide this.

I'd propose making that a separate bug because it, unfortunately, will take a bit of testing and compromise. The time limit it currently has is based on the USB CDRW I have here + a few seconds buffer. Unfortunately, I didn't have any other types of CD drives to test with, and I can certainly see where different models will behave differently.

Perhaps the proper fix for that would be to have the optical write test watch for events a la the removable_storage_watcher and either timeout after XX seconds OR move on after catching the event or mount. I think I skipped waiting for the mount initially because the automatic mount didn't always seem to work... but that could also easily have been a problem with my franken-install that was patched together from 5 different releases