Merge lp:~brendan-donegan/checkbox/bug887049_usb_test into lp:checkbox

[Brendan Donegan]

Previously the usb_test script wasn't checking that the device in question actually had a path in the filesystem. This was causing an exception when the script was trying to read the non-existent path. This merge adds a guard around the statements which depend on the path existing.

[Daniel Manrique (roadmr)]

I tested on a USB drive containing multiple partitions (3 primary and one extended containing 2 logical partitions) and it handles them correctly. A problem remains when there are no write permissions but that's outside the scope of the linked bug, so I'm merging this as it works as intended. Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-10 09:21:34 +0000
+++ debian/changelog	2011-11-10 14:02:06 +0000
@@ -35,6 +35,8 @@
    * Have the bluetooth/detect tests require a device with the category
      BLUETOOTH to run, thus preventing the test from failing on systems with
      no Bluetooth device (LP: #862322)
+   * Guard against trying to write files to logical partitions on USB sticks
+     (which will obviously fail) in usb_test (LP: #887049)
 
   [ Javier Collado ]
   * Broken job dependencies fixed (LP: #888447)

=== modified file 'scripts/usb_test'
--- scripts/usb_test	2011-09-20 10:43:56 +0000
+++ scripts/usb_test	2011-11-10 14:02:06 +0000
@@ -68,9 +68,11 @@
         if not device_props.Get('org.freedesktop.UDisks.Device',"DeviceIsDrive"):
             if device_props.Get('org.freedesktop.UDisks.Device', "DriveConnectionInterface") == 'usb':
                 devFile = str(device_props.Get('org.freedesktop.UDisks.Device',"DeviceFile"))
-                print str(device_props.Get('org.freedesktop.UDisks.Device',"DeviceMountPaths"))
-                devPath = str(device_props.Get('org.freedesktop.UDisks.Device',"DeviceMountPaths")[0])
-                disks[devFile] = devPath
+
+                if len(device_props.Get('org.freedesktop.UDisks.Device',"DeviceMountPaths")) > 0:
+                    print str(device_props.Get('org.freedesktop.UDisks.Device',"DeviceMountPaths"))
+                    devPath = str(device_props.Get('org.freedesktop.UDisks.Device',"DeviceMountPaths")[0])
+                    disks[devFile] = devPath
         
     return disks