diff options
| author | Lukas Waymann <lukas.waymann@canonical.com> | 2020-10-29 15:52:31 +0800 |
|---|---|---|
| committer | Lukas Waymann <lukas.waymann@canonical.com> | 2020-10-29 15:52:31 +0800 |
| commit | aaf48246ff283744b685a92f2f7fbf8181b8f91f (patch) | |
| tree | 35e92a4fb2acb33756e271517f8a4d6548d740d7 /units | |
| parent | a0d88b59d3c15ca5af38d9f60821c1fc56848715 (diff) | |
Skip suspend/usb_storage_preinserted_after_suspend when DUT lacks USB drive
Employ the same mechanism that usb/storage-detect uses for skipping the test when the DUT doesn't have a USB drive in suspend/usb_storage_preinserted_after_suspend. This way we can skip both tests rather than letting usb_storage_preinserted_after_suspend fail.
Diffstat (limited to 'units')
| -rw-r--r-- | units/suspend/manifest.pxu | 4 | ||||
| -rw-r--r-- | units/suspend/suspend.pxu | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/units/suspend/manifest.pxu b/units/suspend/manifest.pxu new file mode 100644 index 0000000..fe415be --- /dev/null +++ b/units/suspend/manifest.pxu @@ -0,0 +1,4 @@ +unit: manifest entry +id: has_usb_storage +_name: USB Storage Device Connected +value-type: bool diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu index 034f97b..7874819 100644 --- a/units/suspend/suspend.pxu +++ b/units/suspend/suspend.pxu @@ -1645,6 +1645,8 @@ _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. +requires: + manifest.has_usb_storage == 'True' plugin: shell category_id: com.canonical.plainbox::suspend |