Import plainbox-provider-checkbox_0.55.0~rc1.orig.tar.gzupstream-0.55.0_rc1patched-0.55.0_rc1-1

2 files changed, 36 insertions, 28 deletions

diff --git a/units/usb/usb-c.pxu b/units/usb/usb-c.pxu
index 0d709e2..9ec912a 100644
--- a/units/usb/usb-c.pxu
+++ b/units/usb/usb-c.pxu
@@ -20,11 +20,13 @@ id: usb-c/c-to-a-adapter/insert
 _purpose:
 This test will check that the system correctly detects the insertion of
 a USB 3 storage device in a USB Type-C connector using a "Type-C to Type-A"
- adapter
+ adapter.
+ NOTE: Make sure the USB storage device has a partition before starting
+ the test.
 _steps:
 1. Commence the test
 2. Connect a USB 3 storage device to a USB Type-C port using a
- "Type-C to Type-A" adapter
+ "Type-C to Type-A" adapter.
 3. Do not unplug the device after the test.
 _verification:
 The verification of this test is automated. Do not change the
@@ -36,7 +38,7 @@ command:
 if [[ -v SNAP ]]; then
 checkbox-support-run_watcher insertion usb3
 else
- removable_storage_watcher -m 500000000 insert usb
+ removable_storage_watcher.py -m 500000000 insert usb
 fi
 category_id: com.canonical.plainbox::usb
 imports: from com.canonical.plainbox import manifest
@@ -56,7 +58,7 @@ command:
 if [[ -v SNAP ]]; then
 checkbox-support-usb_read_write
 else
- removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
+ removable_storage_test.py -s 268400000 -m 500000000 usb --driver xhci_hcd
 fi
 category_id: com.canonical.plainbox::usb
 imports: from com.canonical.plainbox import manifest
@@ -84,7 +86,7 @@ command:
 if [[ -v SNAP ]]; then
 checkbox-support-run_watcher removal usb3
 else
- removable_storage_watcher -m 500000000 remove usb
+ removable_storage_watcher.py -m 500000000 remove usb
 fi
 category_id: com.canonical.plainbox::usb
 depends: usb-c/c-to-a-adapter/insert
@@ -115,10 +117,12 @@ id: usb-c/insert
 _summary: USB 3.0 storage device insertion detected on USB Type-C port
 _purpose:
 This test will check that the system correctly detects the insertion of
- a USB 3 storage device in a USB Type-C connector
+ a USB 3 storage device in a USB Type-C connector.
+ NOTE: Make sure the USB storage device has a partition before starting
+ the test.
 _steps:
- 1. Commence the test
- 2. Connect a USB 3 storage device to a USB Type-C port
+ 1. Commence the test.
+ 2. Connect a USB 3 storage device to a USB Type-C port.
 3. Do not unplug the device after the test.
 _verification:
 The verification of this test is automated. Do not change the
@@ -130,7 +134,7 @@ command:
 if [[ -v SNAP ]]; then
 checkbox-support-run_watcher insertion usb3
 else
- removable_storage_watcher -m 500000000 insert usb
+ removable_storage_watcher.py -m 500000000 insert usb
 fi
 category_id: com.canonical.plainbox::usb
 imports: from com.canonical.plainbox import manifest
@@ -151,7 +155,7 @@ command:
 if [[ -v SNAP ]]; then
 checkbox-support-usb_read_write
 else
- removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
+ removable_storage_test.py -s 268400000 -m 500000000 usb --driver xhci_hcd
 fi
 category_id: com.canonical.plainbox::usb
 imports: from com.canonical.plainbox import manifest
@@ -178,7 +182,7 @@ command:
 if [[ -v SNAP ]]; then
 checkbox-support-run_watcher removal usb3
 else
- removable_storage_watcher -m 500000000 remove usb
+ removable_storage_watcher.py -m 500000000 remove usb
 fi
 category_id: com.canonical.plainbox::usb
 depends: usb-c/insert
diff --git a/units/usb/usb.pxu b/units/usb/usb.pxu
index 77dd601..0b923cb 100644
--- a/units/usb/usb.pxu
+++ b/units/usb/usb.pxu
@@ -7,7 +7,7 @@ estimated_duration: 1.0
 command:
 set -o pipefail
 if [[ -v SNAP ]]; then
- checkbox-support-lsusb -f $CHECKBOX_RUNTIME/var/lib/usbutils/usb.ids 2>/dev/null | sed 's/.*\(ID .*\)/\1/' | head -n 4 || echo "No USB devices were detected" >&2
+ checkbox-support-lsusb -f "$CHECKBOX_RUNTIME"/var/lib/usbutils/usb.ids 2>/dev/null | sed 's/.*\(ID .*\)/\1/' | head -n 4 || echo "No USB devices were detected" >&2
 else
 lsusb 2>/dev/null | sort || echo "No USB devices were detected" >&2
 fi
@@ -21,7 +21,7 @@ depends: usb/detect
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
 estimated_duration: 1.0
-command: removable_storage_test -l usb
+command: removable_storage_test.py -l usb
 _description:
 PURPOSE:
 This test will check that your system detects USB storage devices.
@@ -36,7 +36,7 @@ category_id: com.canonical.plainbox::usb
 id: usb/HID
 depends: usb/detect
 estimated_duration: 1.0
-command: keyboard_test
+command: keyboard_test.py
 _description:
 PURPOSE:
 This test will check that you can use a USB HID device
@@ -51,7 +51,9 @@ id: usb/insert
 template-engine: jinja2
 _summary: USB 2.0 storage device insertion detected
 _purpose:
- Check system can detect USB 2.0 storage when inserted
+ Check system can detect USB 2.0 storage when inserted.
+ NOTE: Make sure the USB storage device has a partition before starting
+ the test.
 _steps:
 1. Press continue
 2. Wait until the message "INSERT NOW" is printed on the screen
@@ -66,7 +68,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-run_watcher insertion usb2
 {%- else %}
- removable_storage_watcher --unmounted insert usb
+ removable_storage_watcher.py --unmounted insert usb
 {% endif -%}
 category_id: com.canonical.plainbox::usb
 estimated_duration: 120
@@ -77,7 +79,9 @@ requires:
 usb.usb3 == 'supported'
 _summary: USB 3.0 storage device insertion detected
 _purpose:
- Check system can detect insertion of a USB 3.0 storage device
+ Check system can detect insertion of a USB 3.0 storage device.
+ NOTE: Make sure the USB storage device has a partition before starting
+ the test.
 _steps:
 1. Press continue
 2. Wait until the message "INSERT NOW" is printed on the screen
@@ -92,7 +96,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-run_watcher insertion usb3
 {%- else %}
- removable_storage_watcher --unmounted -m 500000000 insert usb
+ removable_storage_watcher.py --unmounted -m 500000000 insert usb
 {% endif -%}
 category_id: com.canonical.plainbox::usb
 estimated_duration: 120
@@ -117,7 +121,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-run_watcher removal usb2
 {%- else %}
- removable_storage_watcher --unmounted remove usb
+ removable_storage_watcher.py --unmounted remove usb
 {% endif -%}
 category_id: com.canonical.plainbox::usb
 estimated_duration: 120
@@ -142,7 +146,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-run_watcher removal usb3
 {%- else %}
- removable_storage_watcher --unmounted -m 500000000 remove usb
+ removable_storage_watcher.py --unmounted -m 500000000 remove usb
 {% endif -%}
 category_id: com.canonical.plainbox::usb
 estimated_duration: 120
@@ -153,7 +157,7 @@ id: usb/storage-transfer
 depends: usb/insert
 user: root
 estimated_duration: 45.0
-command: removable_storage_test -s 268400000 usb
+command: removable_storage_test.py -s 268400000 usb
 _description:
 PURPOSE:
 This test will check your USB connection.
@@ -173,7 +177,7 @@ requires:
 depends: usb3/insert
 user: root
 estimated_duration: 45.0
-command: removable_storage_test -s 268400000 -m 500000000 usb
+command: removable_storage_test.py -s 268400000 -m 500000000 usb
 _description:
 PURPOSE:
 This test will check your USB 3.0 connection.
@@ -202,7 +206,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-usb_read_write
 {%- else %}
- removable_storage_test -s 268400000 usb
+ removable_storage_test.py -s 268400000 usb
 {% endif -%}
 category_id: com.canonical.plainbox::usb
 estimated_duration: 300
@@ -224,7 +228,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-usb_read_write
 {%- else %}
- removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
+ removable_storage_test.py -s 268400000 -m 500000000 usb --driver xhci_hcd
 {% endif -%}
 category_id: com.canonical.plainbox::usb
 estimated_duration: 300
@@ -234,7 +238,7 @@ category_id: com.canonical.plainbox::usb
 id: usb/storage-preinserted
 user: root
 estimated_duration: 45.0
-command: removable_storage_test -l usb && timeout 300 removable_storage_test -s 268400000 usb
+command: removable_storage_test.py -l usb && timeout 300 removable_storage_test.py -s 268400000 usb
 flags: also-after-suspend preserve-cwd
 requires:
 cpuinfo.platform != 's390x'
@@ -258,7 +262,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 && timeout 300 removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
+command: removable_storage_test.py -l usb && timeout 300 removable_storage_test.py -s 268400000 -m 500000000 usb --driver xhci_hcd
 _summary: 
 Test USB 3.0 or 3.1 ports
 _description:
@@ -288,7 +292,7 @@ id: usb/performance
 depends: usb/insert
 user: root
 estimated_duration: 45.00
-command: removable_storage_test -s 268400000 -p 15 usb
+command: removable_storage_test.py -s 268400000 -p 15 usb
 _description:
 This test will check that your USB 2.0 port transfers data at a
 minimum expected speed.
@@ -298,7 +302,7 @@ category_id: com.canonical.plainbox::usb
 plugin: shell
 _summary: Detect storage partitions on a device on the USB bus
 command:
- udev_resource -f PARTITION | grep "bus: usb"
+ udev_resource.py -f PARTITION | grep "bus: usb"
 estimated_duration: 1.0
 flags: also-after-suspend
 imports: from com.canonical.plainbox import manifest