Merge ~sylvain-pineau/plainbox-provider-checkbox:fix-1903244 into plainbox-provider-checkbox:master

[Sylvain Pineau]

Fixes the usb3 storage test to work on arm.

Tested using sideloading on the target:

# ./test.py -s 268400000 -m 500000000 usb --driver xhci_hcd
Found the following mounted usb partitions:
    /dev/sda1 : /media/ubuntu/a : 5000000000 bits/s
--------------------
/dev/sda1 (Total Data Size / iteration: 255.9662 MB):
 [Iteration 0] Average Speed: 22.1739
 Summary:
  Total Data Attempted: 255.9662 MB
  Total Time to write: 11.5436 secs
  Average Write Time: 11.5436 secs
  Average Write Speed: 22.1739 MB/s
  --------------------------------
  Device Detected: SuperSpeed USB
  Driver Detected: xhci_hcd

[Sylvain Pineau (sylvain-pineau)]

self-approved

review: Approve

diff --git a/bin/removable_storage_test.py b/bin/removable_storage_test.py
index 4253cbf..a3eaa4b 100755
--- a/bin/removable_storage_test.py
+++ b/bin/removable_storage_test.py
@@ -6,6 +6,7 @@ import dbus
 import hashlib
 import logging
 import os
+import platform
 import re
 import shlex
 import subprocess
@@ -476,14 +477,24 @@ class DiskTest():
         udev_devices = get_udev_block_devices(udev_client)
         # Get a collection of all udev devices corresponding to xhci devices
         udev_devices_xhci = get_udev_xhci_devices(udev_client)
+        if platform.machine() in ("aarch64", "armv7l"):
+            enumerator = GUdev.Enumerator(client=udev_client)
+            udev_devices_xhci = [
+                device for device in enumerator.execute()
+                if (device.get_driver() == 'xhci-hcd')]
         for udev_device_xhci in udev_devices_xhci:
             pci_slot_name = udev_device_xhci.get_property('PCI_SLOT_NAME')
+            xhci_devpath = udev_device_xhci.get_property('DEVPATH')
             for udev_device in udev_devices:
                 devpath = udev_device.get_property('DEVPATH')
                 if (self._compare_pci_slot_from_devpath(devpath,
                                                         pci_slot_name)):
                     self.rem_disks_xhci[
                         udev_device.get_property('DEVNAME')] = 'xhci'
+                if platform.machine() in ("aarch64", "armv7l"):
+                    if xhci_devpath in devpath:
+                        self.rem_disks_xhci[
+                            udev_device.get_property('DEVNAME')] = 'xhci'
         return self.rem_disks_xhci
 
     def mount(self):