diff options
| -rw-r--r-- | units/suspend/suspend.pxu | 26 | ||||
| -rw-r--r-- | units/usb/usb.pxu | 4 |
2 files changed, 4 insertions, 26 deletions
diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu index 034f97b..a2830d4 100644 --- a/units/suspend/suspend.pxu +++ b/units/suspend/suspend.pxu @@ -1636,32 +1636,6 @@ _description: plugin: shell category_id: com.canonical.plainbox::suspend -id: suspend/usb_storage_preinserted_after_suspend -estimated_duration: 1.2 -user: root -depends: suspend/suspend_advanced_auto -command: removable_storage_test.py -l usb && removable_storage_test.py -s 268400000 usb -_description: - This is an automated version of usb/storage-automated and assumes that the - server has usb storage devices plugged in prior to checkbox execution. It - is intended for servers and SRU automated testing. - -plugin: shell -category_id: com.canonical.plainbox::suspend -id: suspend/usb3_storage_preinserted_after_suspend -estimated_duration: 1.2 -user: root -requires: - usb.usb3 == 'supported' -depends: suspend/suspend_advanced_auto -command: removable_storage_test.py -l usb && removable_storage_test.py -s 268400000 -m 500000000 usb --driver xhci_hcd -_description: - This is an automated version of usb3/storage-automated and assumes that the - server has usb 3.0 storage devices plugged in prior to checkbox execution. It - is intended for servers and SRU automated testing. - -plugin: shell -category_id: com.canonical.plainbox::suspend id: suspend/usb_performance_after_suspend depends: suspend/usb_insert_after_suspend user: root diff --git a/units/usb/usb.pxu b/units/usb/usb.pxu index 0b923cb..f9e45da 100644 --- a/units/usb/usb.pxu +++ b/units/usb/usb.pxu @@ -240,10 +240,12 @@ user: root estimated_duration: 45.0 command: removable_storage_test.py -l usb && timeout 300 removable_storage_test.py -s 268400000 usb flags: also-after-suspend preserve-cwd +imports: from com.canonical.plainbox import manifest requires: cpuinfo.platform != 's390x' package.name == 'udisks2' or snap.name == 'udisks2' package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804) + manifest.has_usb_storage == 'True' _summary: Test USB 2.0 or 1.1 ports _description: @@ -256,11 +258,13 @@ category_id: com.canonical.plainbox::usb id: usb3/storage-preinserted user: root flags: also-after-suspend +imports: from com.canonical.plainbox import manifest requires: cpuinfo.platform != 's390x' usb.usb3 == 'supported' package.name == 'udisks2' or snap.name == 'udisks2' package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804) + manifest.has_usb_storage == 'True' estimated_duration: 45.0 command: removable_storage_test.py -l usb && timeout 300 removable_storage_test.py -s 268400000 -m 500000000 usb --driver xhci_hcd _summary: |