summaryrefslogtreecommitdiff
path: root/units/usb
diff options
authorPaul Larson <paul.larson@ubuntu.com>2019-12-16 12:39:30 -0600
committerPaul Larson <paul.larson@ubuntu.com>2019-12-16 12:39:30 -0600
commitcc0277ef01141822db392409ab7e0225b513d099 (patch)
tree797ebe9f26c1706586bfebf45a1f91f6b7639f5b /units/usb
parent9fd3ae13a9416e4508ecc3e850968f466754db35 (diff)
Also fail the usb-storage-preinserted tests if there are IO errors, or if it takes too long
Diffstat (limited to 'units/usb')
-rw-r--r--units/usb/usb.pxu4
1 files changed, 2 insertions, 2 deletions
diff --git a/units/usb/usb.pxu b/units/usb/usb.pxu
index ffc9f3c..5481f8d 100644
--- a/units/usb/usb.pxu
+++ b/units/usb/usb.pxu
@@ -234,7 +234,7 @@ category_id: com.canonical.plainbox::usb
id: usb/storage-preinserted
user: root
estimated_duration: 45.0
-command: removable_storage_test -l usb && removable_storage_test -s 268400000 usb
+command: removable_storage_test -l usb && timeout 300 removable_storage_test -s 268400000 usb
flags: also-after-suspend preserve-cwd
requires:
cpuinfo.platform != 's390x'
@@ -258,7 +258,7 @@ requires:
package.name == 'udisks2' or snap.name == 'udisks2'
package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
estimated_duration: 45.0
-command: removable_storage_test -l usb && removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
+command: removable_storage_test -l usb && timeout 300 removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
_summary:
Test USB 3.0 or 3.1 ports
_description: