Use a manifest entry for card readers

Depending on the device driver, the card reader devices can only show up in the udev database and lsusb ouput when there's a card plugged in. Test requirements based on device.category == 'CARDREADER' must be avoided. See https://bugs.launchpad.net/plainbox-provider-checkbox/+bug/1704093 

2 files changed, 39 insertions, 17 deletions

diff --git a/jobs/mediacard.txt.in b/jobs/mediacard.txt.in
index fd17181..3b5a648 100644
--- a/jobs/mediacard.txt.in
+++ b/jobs/mediacard.txt.in
@@ -1,3 +1,8 @@
+unit: manifest entry
+id: has_card_reader
+_name: Card Reader
+value-type: bool
+
 plugin: user-interact
 category_id: com.canonical.plainbox::mediacard
 id: mediacard/mmc-insert
@@ -8,9 +13,10 @@ command:
 else
 removable_storage_watcher --memorycard insert sdio usb scsi
 fi
+imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
- device.category == 'CARDREADER'
+ manifest.has_card_reader == 'True'
 user: root
 _description:
 PURPOSE:
@@ -71,9 +77,10 @@ command:
 else
 removable_storage_watcher --memorycard insert sdio usb scsi
 fi
+imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
- device.category == 'CARDREADER'
+ manifest.has_card_reader == 'True'
 user: root
 _description:
 PURPOSE:
@@ -131,10 +138,11 @@ estimated_duration: 30.0
 user: root
 flags: preserve-cwd
 command: removable_storage_test -s 268400000 --memorycard -l sdio usb scsi && removable_storage_test --memorycard sdio usb scsi
+imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
 package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
- device.category == 'CARDREADER'
+ manifest.has_card_reader == 'True'
 _description:
 This is a fully automated version of mediacard/sd-automated and assumes that the
 system under test has a memory card device plugged in prior to checkbox execution.
@@ -150,9 +158,10 @@ command:
 else
 removable_storage_watcher --memorycard insert sdio usb scsi
 fi
+imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
- device.category == 'CARDREADER'
+ manifest.has_card_reader == 'True'
 user: root
 _description:
 PURPOSE:
@@ -214,9 +223,10 @@ command:
 else
 removable_storage_watcher --memorycard insert sdio usb scsi
 fi
+imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
- device.category == 'CARDREADER'
+ manifest.has_card_reader == 'True'
 user: root
 _description:
 PURPOSE:
@@ -276,9 +286,10 @@ command:
 else
 removable_storage_watcher --memorycard insert sdio usb scsi
 fi
+imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
- device.category == 'CARDREADER'
+ manifest.has_card_reader == 'True'
 user: root
 _description:
 PURPOSE:
@@ -338,9 +349,10 @@ command:
 else
 removable_storage_watcher --memorycard insert sdio usb scsi
 fi
+imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
- device.category == 'CARDREADER'
+ manifest.has_card_reader == 'True'
 user: root
 _description:
 PURPOSE:
@@ -401,9 +413,10 @@ command:
 removable_storage_watcher --memorycard insert sdio usb scsi
 fi
 user: root
+imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
- device.category == 'CARDREADER'
+ manifest.has_card_reader == 'True'
 _description:
 PURPOSE:
 This test will check that the systems media card reader can
@@ -462,9 +475,10 @@ command:
 else
 removable_storage_watcher --memorycard insert sdio usb scsi
 fi
+imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
- device.category == 'CARDREADER'
+ manifest.has_card_reader == 'True'
 user: root
 _description:
 PURPOSE:
diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index a267a21..26b0f09 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -2223,9 +2223,10 @@ category_id: com.canonical.plainbox::suspend
 id: suspend/mmc-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
- device.category == 'CARDREADER'
+ manifest.has_card_reader == 'True'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
@@ -2273,9 +2274,10 @@ category_id: com.canonical.plainbox::suspend
 id: suspend/sd-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
- device.category == 'CARDREADER'
+ manifest.has_card_reader == 'True'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
@@ -2325,9 +2327,10 @@ category_id: com.canonical.plainbox::suspend
 id: suspend/sdhc-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
- device.category == 'CARDREADER'
+ manifest.has_card_reader == 'True'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
@@ -2376,9 +2379,10 @@ category_id: com.canonical.plainbox::suspend
 id: mediacard/cf-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
- device.category == 'CARDREADER'
+ manifest.has_card_reader == 'True'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
@@ -2426,9 +2430,10 @@ category_id: com.canonical.plainbox::suspend
 id: mediacard/sdxc-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
- device.category == 'CARDREADER'
+ manifest.has_card_reader == 'True'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
@@ -2476,9 +2481,10 @@ category_id: com.canonical.plainbox::suspend
 id: mediacard/ms-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
- device.category == 'CARDREADER'
+ manifest.has_card_reader == 'True'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
@@ -2526,9 +2532,10 @@ category_id: com.canonical.plainbox::suspend
 id: mediacard/msp-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
- device.category == 'CARDREADER'
+ manifest.has_card_reader == 'True'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
@@ -2576,9 +2583,10 @@ category_id: com.canonical.plainbox::suspend
 id: mediacard/xd-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
- device.category == 'CARDREADER'
+ manifest.has_card_reader == 'True'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
 PURPOSE: