Merge lp:~bladernr/checkbox/1291664-removable-storage-traceback-on-ro-usb into lp:checkbox

[Jeff Lane ]

Fixes a condition where a write-protected USB device (or probably any WP device) causes the removable_storage_test script to dump a trace and exit prematurely due to the unhandled exception.

Write protected USB devices (and maybe others) cause an IOError in a section where they weren't caught.

Now we catch them

I've tried this on two servers that have embedded USB storage that is write protected, and this resolved the issue on both.

[Zygmunt Krynicki (zyga)]

I think this is a bit eager to jump to conclusions. We can check if the device is read only but we shouldn't treat *all* IOErrors as the device being read only. If you reword the error message to:

+ logging.error("I/O error accessing the device %s", dest)

I will gladly merge it.

review: Needs Fixing

[lp:~bladernr/checkbox/1291664-removable-storage-traceback-on-ro-usb]

2782. By Jeff Lane  on 2014-03-13

Fixed the error message for IOError in write_file to be more generic and not assume a read-only mount

[Jeff Lane  (bladernr)]

Thanks, that makes a lot of sense and I've changed the error message accordingly. You're right, the RO filesystem errors WOULD be I/O errors, but not all I/O errors would be due to a read-only filesystem.

review: Needs Resubmitting

[Zygmunt Krynicki (zyga)]

Thanks, +1

review: Approve

=== modified file 'checkbox-old/CHANGELOG'
--- checkbox-old/CHANGELOG	2014-02-27 05:56:02 +0000
+++ checkbox-old/CHANGELOG	2014-03-13 03:02:58 +0000
@@ -20,6 +20,8 @@
     new 14.04 only version for Trusty testing. This is the foundation for 14.04
     server cert changes.
   * Added usb3/storage-preinserted to server-selftest-14.04.whitelist
+  * /scripts/removable_storage_test: fixed an unhandled exception with write
+    protected devices that caused the script to crash (LP: #1291664)
 
   [ Po-Hsu Lin]
   * jobs/power-management.txt.in: add product requirement for laptops into 
 
=== modified file 'checkbox-old/scripts/removable_storage_test'
--- checkbox-old/scripts/removable_storage_test	2013-05-29 07:50:30 +0000
+++ checkbox-old/scripts/removable_storage_test	2014-03-13 03:02:58 +0000
@@ -121,6 +121,10 @@
             logging.error("Unable to open %s for writing.", dest)
             logging.error("  %s", exc)
             return False
+        except IOError as exc:
+            logging.error("I/O Error when accessing device %s.", dest)
+            logging.error("  %s", exc)
+            return False
         with outfile:
             try:
                 outfile.write(self.data)