Merge lp:~zyga/checkbox/fix-1313581 into lp:checkbox

[Zygmunt Krynicki]

Squashed version of https://code.launchpad.net/~taihsiangho/checkbox/fix-1313581

[Zygmunt Krynicki (zyga)]

+1

review: Approve

=== modified file 'checkbox-support/checkbox_support/udev.py'
--- checkbox-support/checkbox_support/udev.py	2014-01-07 13:39:44 +0000
+++ checkbox-support/checkbox_support/udev.py	2014-05-02 09:27:37 +0000
@@ -91,3 +91,20 @@
     # look better.
     devices.sort(key=lambda device: device.get_device_file())
     return devices
+
+
+def get_udev_xhci_devices(udev_client):
+    """
+    Get a list of all devices on pci slots using xhci drivers
+    """
+    # setup an enumerator so that we can list devices
+    enumerator = GUdev.Enumerator(client=udev_client)
+    # Iterate over pci devices only
+    enumerator.add_match_subsystem('pci')
+    devices = [
+        device for device in enumerator.execute()
+        if (device.get_driver() == 'xhci_hcd')]
+    # Sort the list, this is not needed but makes various debugging dumps
+    # look better.
+    devices.sort(key=lambda device: device.get_property('PCI_SLOT_NAME'))
+    return devices

=== modified file 'providers/plainbox-provider-checkbox/bin/removable_storage_test'
--- providers/plainbox-provider-checkbox/bin/removable_storage_test	2014-01-07 13:43:22 +0000
+++ providers/plainbox-provider-checkbox/bin/removable_storage_test	2014-05-02 09:27:37 +0000
@@ -22,9 +22,12 @@
 from checkbox_support.dbus.udisks2 import lookup_udev_device
 from checkbox_support.dbus.udisks2 import map_udisks1_connection_bus
 from checkbox_support.heuristics.udisks2 import is_memory_card
-from checkbox_support.parsers.udevadm import CARD_READER_RE, GENERIC_RE, FLASH_RE
+from checkbox_support.parsers.udevadm import CARD_READER_RE
+from checkbox_support.parsers.udevadm import GENERIC_RE
+from checkbox_support.parsers.udevadm import FLASH_RE
 from checkbox_support.udev import get_interconnect_speed
 from checkbox_support.udev import get_udev_block_devices
+from checkbox_support.udev import get_udev_xhci_devices
 
 
 class ActionTimer():
@@ -99,6 +102,8 @@
         self.rem_disks_memory_cards = {}
         self.rem_disks_memory_cards_nm = {}
         self.rem_disks_speed = {}
+        # LP: #1313581, TODO: extend to be rem_disks_driver
+        self.rem_disks_xhci = {}
         self.data = ''
         self.device = device
         self.memorycard = memorycard
@@ -174,8 +179,8 @@
             have both the filesystem and block device interfaces
             """
             for udisks2_object_path, interfaces in udisks2_objects.items():
-                if (UDISKS2_FILESYSTEM_INTERFACE in interfaces
-                    and UDISKS2_BLOCK_INTERFACE in interfaces):
+                if (UDISKS2_FILESYSTEM_INTERFACE in interfaces and
+                        UDISKS2_BLOCK_INTERFACE in interfaces):
                     yield udisks2_object_path
         # We need to know about all IO candidates,
         # let's iterate over all the block devices reported by udisks2
@@ -247,6 +252,23 @@
             else:
                 self.rem_disks_memory_cards_nm[dev_file] = None
                 self.rem_disks_nm[dev_file] = None
+        # LP: #1313581
+        # Compare the pci slot name of the devices using xhci and
+        # the pci slot name of the disks,
+        # which is usb3 disks in this case so far,
+        # to make sure the usb3 disk does be on the bus using xhci
+        # TODO: it will be better to extend to be all kinds of drivers.
+        try:
+            udev_devices_xhci = get_udev_xhci_devices(udev_client)
+            for udev_device_xhci in udev_devices_xhci:
+                pci_slot_name = udev_device_xhci.get_property('PCI_SLOT_NAME')
+                for udev_device in udev_devices:
+                    if (pci_slot_name ==
+                            udev_device.get_property('DEVPATH').split('/')[3]):
+                        self.rem_disks_xhci[
+                            udev_device.get_property('DEVNAME')] = 'xhci'
+        except:
+            logging.error("Failed to get driver information.")
 
     def _probe_disks_udisks1(self, bus):
         """
@@ -275,14 +297,14 @@
                         parent_media = parent_props.Get(udisks, "DriveMedia")
                     if self.memorycard:
                         if (dev_bus != 'sdio'
-                            and not FLASH_RE.search(parent_media)
-                            and not CARD_READER_RE.search(parent_model)
-                            and not GENERIC_RE.search(parent_vendor)):
+                                and not FLASH_RE.search(parent_media)
+                                and not CARD_READER_RE.search(parent_model)
+                                and not GENERIC_RE.search(parent_vendor)):
                             continue
                     else:
                         if (FLASH_RE.search(parent_media)
-                            or CARD_READER_RE.search(parent_model)
-                            or GENERIC_RE.search(parent_vendor)):
+                                or CARD_READER_RE.search(parent_model)
+                                or GENERIC_RE.search(parent_vendor)):
                             continue
                     dev_file = str(device_props.Get(udisks, "DeviceFile"))
                     dev_speed = str(device_props.Get(udisks,
@@ -393,6 +415,10 @@
                         help=("Memory cards devices on bus other than sdio "
                               "require this parameter to identify "
                               "them as such"))
+    parser.add_argument('--driver',
+                        choices=['xhci_hcd'],
+                        help=("Detect the driver of the host controller."
+                              "Only xhci_hcd for usb3 is supported so far."))
 
     args = parser.parse_args()
 
@@ -444,7 +470,7 @@
 
                 if errors_mount > 0:
                     print("There're total %d device(s) failed at mounting."
-                           % errors_mount)
+                          % errors_mount)
                     errors += errors_mount
 
                 disks_all = dict(list(test.rem_disks.items())
@@ -452,17 +478,17 @@
 
             if len(disks_all) > 0:
                 print("Found the following mounted %s partitions:"
-                       % ', '.join(args.device))
+                      % ', '.join(args.device))
 
                 for disk, mount_point in disks_all.items():
                     supported_speed = test.rem_disks_speed[disk]
                     print("    %s : %s : %s bits/s" %
-                            (disk, mount_point, supported_speed),
-                            end="")
-                    if (args.min_speed
-                        and int(args.min_speed) > int(supported_speed)):
+                          (disk, mount_point, supported_speed),
+                          end="")
+                    if (args.min_speed and
+                            int(args.min_speed) > int(supported_speed)):
                         print(" (Will not test it, speed is below %s bits/s)" %
-                                args.min_speed, end="")
+                              args.min_speed, end="")
 
                     print("")
 
@@ -478,7 +504,7 @@
                 for count in range(args.count):
                     test_files[count] = RandomData(args.size)
                     write_sizes.append(os.path.getsize(
-                                        test_files[count].tfile.name))
+                        test_files[count].tfile.name))
                     total_write_size = sum(write_sizes)
 
                 try:
@@ -525,7 +551,7 @@
                             for file in target_file_list:
                                 test.clean_up(file)
                             total_write_time = sum(write_times)
-                            avg_write_time = total_write_time / args.count
+                            # avg_write_time = total_write_time / args.count
                             try:
                                 avg_write_speed = ((
                                     total_write_size / total_write_time)
@@ -547,7 +573,7 @@
                               (iteration_write_time / args.iterations))
                         try:
                             avg_write_speed = (iteration_write_size /
-                                              iteration_write_time)
+                                               iteration_write_time)
                         except ZeroDivisionError:
                             avg_write_speed = 0.00
                         finally:
@@ -573,9 +599,17 @@
                     return 1
 
                 else:
-                    #Pass is not assured!
+                    # LP: 1313581
+                    if (args.driver == 'xhci_hcd'):
+                        if(5000000000 == test.rem_disks_speed[disk] and
+                           'xhci' == test.rem_disks_xhci[disk]):
+                            print("\t\tDevice Detected: SuperSpeed USB")
+                            print("\t\tDriver Detected: xhci_hcd")
+                        else:
+                            return 1
+                    # Pass is not assured
                     if (not args.pass_speed or
-                        avg_write_speed >= args.pass_speed):
+                            avg_write_speed >= args.pass_speed):
                         return 0
                     else:
                         print("FAIL: Average speed was lower than desired "

=== modified file 'providers/plainbox-provider-checkbox/jobs/suspend.txt.in'
--- providers/plainbox-provider-checkbox/jobs/suspend.txt.in	2014-04-29 21:10:14 +0000
+++ providers/plainbox-provider-checkbox/jobs/suspend.txt.in	2014-05-02 09:27:37 +0000
@@ -1667,11 +1667,10 @@
 depends: suspend/usb3_insert_after_suspend
 user: root
 estimated_duration: 45.00
-command: removable_storage_test -s 268400000 -m 500000000 -p 60 usb
+command: removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
 _description:
- This test will check that your USB 3.0 port transfers data at a
- minimum expected speed in accordance with the specification of
- USB 3.0 SuperSpeed mode.
+ This test will check that your USB 3.0 port could be recognized
+ as SuperSpeed USB device using xhci_hcd driver and transfers data correctly.
 
 plugin: user-interact
 id: suspend/mmc-insert-after-suspend

=== modified file 'providers/plainbox-provider-checkbox/jobs/usb.txt.in'
--- providers/plainbox-provider-checkbox/jobs/usb.txt.in	2014-04-10 21:51:48 +0000
+++ providers/plainbox-provider-checkbox/jobs/usb.txt.in	2014-05-02 09:27:37 +0000
@@ -217,8 +217,7 @@
 depends: usb3/insert
 user: root
 estimated_duration: 45.00
-command: removable_storage_test -s 268400000 -m 500000000 -p 60 usb
+command: removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
 _description:
- This test will check that your USB 3.0 port transfers data at a
- minimum expected speed in accordance with the specification of
- USB 3.0 SuperSpeed mode.
+ This test will check that your USB 3.0 port could be recognized
+ as SuperSpeed USB device using xhci_hcd driver and transfers data correctly.