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

[Sylvain Pineau]

Fixes the removable storage test by adopting the same logic found in removable storage watcher. Only use the memorycard heuristics if this was explicitly requested by --memorycard.

Doing the vice-versa approach was leading to the linked bug where a thunderbolt3 external hard drive matches the CARD_READER_RE checkbox-support regexp:

"nvme-HP_Portable_SSD_P800_256GB_HBSD28232000029" is found by re.compile(r"SD|MMC|CF|MS(?!ata)|SM|xD|Card", re.I)

SSD vs SD!

[Sylvain Pineau (sylvain-pineau)]

Tested successfully on somerville-berlinetta-p-mlk-cfl-201807-26342 (thanks Gavin)

review: Approve

diff --git a/bin/removable_storage_test b/bin/removable_storage_test
index a7abdfe..249911a 100755
--- a/bin/removable_storage_test
+++ b/bin/removable_storage_test
@@ -391,12 +391,11 @@ class DiskTest():
                     interconnect_speed * 10 ** 6)
             else:
                 self.rem_disks_speed[dev_file] = None
-            # We need to skip-non memory cards if we look for memory cards and
-            # vice-versa so let's inspect the drive and use heuristics to
-            # detect memory cards (a memory card reader actually) now.
-            if self.memorycard != is_memory_card(drive_props['Vendor'],
-                                                 drive_props['Model'],
-                                                 drive_props['Media']):
+            # Ensure it is a media card reader if this was explicitly requested
+            drive_is_reader = is_memory_card(
+                drive_props['Vendor'], drive_props['Model'],
+                drive_props['Media'])
+            if self.memorycard and not drive_is_reader:
                 continue
             # The if/else test below simply distributes the mount_point to the
             # appropriate variable, to keep the API requirements. It is