bin:removable_storage_test -> removable_storage_test.py

9 files changed, 70 insertions, 70 deletions

diff --git a/units/dock/jobs.pxu b/units/dock/jobs.pxu
index 4decc95..9196f44 100644
--- a/units/dock/jobs.pxu
+++ b/units/dock/jobs.pxu
@@ -701,7 +701,7 @@ depends: dock/usb-insert
 user: root
 estimated_duration: 45.0
 _summary: USB drive storage test
-command: removable_storage_test -s 268400000 usb
+command: removable_storage_test.py -s 268400000 usb
 _description:
 This test is automated and executes after the dock/usb_insert test is run.
 
@@ -712,7 +712,7 @@ depends: dock/usb3-insert
 user: root
 estimated_duration: 45.0
 _summary: USB3 drive storage test
-command: removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
+command: removable_storage_test.py -s 268400000 -m 500000000 usb --driver xhci_hcd
 _description:
 This test is automated and executes after the dock/usb3_insert test is run.
 
@@ -812,7 +812,7 @@ requires:
 depends: dock/usb-c/c-to-a-adapter/insert
 user: root
 estimated_duration: 45.0
-command: removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
+command: removable_storage_test.py -s 268400000 -m 500000000 usb --driver xhci_hcd
 _description:
 This test is automated and executes after the usb-c/c-to-a-adapter/insert test
 is run.
@@ -827,7 +827,7 @@ requires:
 depends: dock/usb-c/insert
 user: root
 estimated_duration: 45.0
-command: removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
+command: removable_storage_test.py -s 268400000 -m 500000000 usb --driver xhci_hcd
 _description:
 This test is automated and executes after the usb-c/insert test
 is run.
@@ -928,7 +928,7 @@ requires:
 depends: dock/usb-c/c-to-a-adapter/insert
 user: root
 estimated_duration: 45.0
-command: removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
+command: removable_storage_test.py -s 268400000 -m 500000000 usb --driver xhci_hcd
 _description:
 This test is automated and executes after the usb-c/c-to-a-adapter/insert test
 is run.
@@ -943,7 +943,7 @@ requires:
 depends: dock/usb-c/insert
 user: root
 estimated_duration: 45.0
-command: removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
+command: removable_storage_test.py -s 268400000 -m 500000000 usb --driver xhci_hcd
 _description:
 This test is automated and executes after the usb-c/insert test
 is run.
@@ -1039,7 +1039,7 @@ depends: dock/hotplug-usb-insert
 user: root
 estimated_duration: 45.0
 _summary: USB drive storage test
-command: removable_storage_test -s 268400000 usb
+command: removable_storage_test.py -s 268400000 usb
 _description:
 This test is automated and executes after the dock/usb_insert test is run.
 
@@ -1050,7 +1050,7 @@ depends: dock/hotplug-usb3-insert
 user: root
 estimated_duration: 45.0
 _summary: USB3 drive storage test
-command: removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
+command: removable_storage_test.py -s 268400000 -m 500000000 usb --driver xhci_hcd
 _description:
 This test is automated and executes after the dock/usb3_insert test is run.
 
@@ -1329,7 +1329,7 @@ depends: dock/usb-insert-after-suspend
 user: root
 estimated_duration: 45.0
 _summary: USB drive storage test after resuming
-command: removable_storage_test -s 268400000 usb
+command: removable_storage_test.py -s 268400000 usb
 _description:
 This test is automated and executes after the dock/usb-insert test is run.
 
@@ -1340,7 +1340,7 @@ depends: dock/usb3-insert-after-suspend
 user: root
 estimated_duration: 45.0
 _summary: USB3 drive storage test after resuming
-command: removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
+command: removable_storage_test.py -s 268400000 -m 500000000 usb --driver xhci_hcd
 _description:
 This test is automated and executes after the dock/usb3-insert test is run.
 
@@ -1732,7 +1732,7 @@ depends: dock/usb3-insert-after-suspend-undock-resume
 user: root
 estimated_duration: 45.0
 _summary: USB3 drive storage test
-command: removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
+command: removable_storage_test.py -s 268400000 -m 500000000 usb --driver xhci_hcd
 _description:
 This test is automated and executes after the dock/usb3_insert test is run.
 
@@ -1822,7 +1822,7 @@ estimated_duration: 45.0
 _summary: FireWire HDD storage test
 depends: dock/cold-plug dock/firewire-insert
 user: root
-command: removable_storage_test -s 268400000 firewire
+command: removable_storage_test.py -s 268400000 firewire
 _description:
 This is an automated test which performs read/write operations on an attached
 FireWire HDD
@@ -1870,7 +1870,7 @@ estimated_duration: 20.0
 _summary: eSATA HDD storage test
 user: root
 depends: dock/esata-insert
-command: removable_storage_test -s 268400000 ata_serial_esata
+command: removable_storage_test.py -s 268400000 ata_serial_esata
 _description:
 This is an automated test which performs read/write operations on an attached
 eSATA HDD
@@ -1954,7 +1954,7 @@ depends: dock/thunderbolt3-insert
 imports: from com.canonical.plainbox import manifest
 requires: manifest.has_thunderbolt3 == 'True'
 flags: also-after-suspend-manual
-command: removable_storage_test -s 268400000 scsi
+command: removable_storage_test.py -s 268400000 scsi
 _summary: Thunderbolt3 storage test
 _description:
 This is an automated test which performs read/write operations on an attached
@@ -1987,7 +1987,7 @@ flags: also-after-suspend-manual
 estimated_duration: 45.0
 imports: from com.canonical.plainbox import manifest
 requires: manifest.has_thunderbolt3 == 'True'
-command: removable_storage_test -s 268400000 scsi
+command: removable_storage_test.py -s 268400000 scsi
 _summary: Daisy-chain testing for Thunderbolt 3 storage and display device
 _description:
 _purpose:
@@ -2082,7 +2082,7 @@ depends: dock/hotplug-usb-insert-after-suspend
 user: root
 estimated_duration: 45.0
 _summary: USB drive storage test after resuming
-command: removable_storage_test -s 268400000 usb
+command: removable_storage_test.py -s 268400000 usb
 _description:
 This test is automated and executes after the dock/usb-insert test is run.
 
@@ -2093,7 +2093,7 @@ depends: dock/hotplug-usb3-insert-after-suspend
 user: root
 estimated_duration: 45.0
 _summary: USB3 drive storage test
-command: removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
+command: removable_storage_test.py -s 268400000 -m 500000000 usb --driver xhci_hcd
 _description:
 This test is automated and executes after the dock/usb3_insert test is run.
 
@@ -2211,7 +2211,7 @@ depends: dock/usb-insert-after-suspend-dock-resume
 user: root
 estimated_duration: 45.0
 _summary: USB drive storage test after resuming
-command: removable_storage_test -s 268400000 usb
+command: removable_storage_test.py -s 268400000 usb
 _description:
 This test is automated and executes after the dock/usb-insert test is run.
 
@@ -2222,7 +2222,7 @@ depends: dock/usb3-insert-after-suspend-dock-resume
 user: root
 estimated_duration: 45.0
 _summary: USB3 drive storage test
-command: removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
+command: removable_storage_test.py -s 268400000 -m 500000000 usb --driver xhci_hcd
 _description:
 This test is automated and executes after the dock/usb3_insert test is run.
 
diff --git a/units/esata/jobs.pxu b/units/esata/jobs.pxu
index 65778eb..7067e9e 100644
--- a/units/esata/jobs.pxu
+++ b/units/esata/jobs.pxu
@@ -18,7 +18,7 @@ category_id: com.canonical.plainbox::esata
 id: esata/storage-test
 user: root
 depends: esata/insert
-command: removable_storage_test -s 268400000 ata_serial_esata
+command: removable_storage_test.py -s 268400000 ata_serial_esata
 _description:
 This is an automated test which performs read/write operations on an attached
 eSATA HDD
diff --git a/units/firewire/jobs.pxu b/units/firewire/jobs.pxu
index 9a0df3f..b0ca229 100644
--- a/units/firewire/jobs.pxu
+++ b/units/firewire/jobs.pxu
@@ -20,7 +20,7 @@ id: firewire/storage-test
 user: root
 require: device.category == 'FIREWIRE'
 depends: firewire/insert
-command: removable_storage_test -s 268400000 firewire
+command: removable_storage_test.py -s 268400000 firewire
 _description:
 This is an automated test which performs read/write operations on an attached
 FireWire HDD
diff --git a/units/mediacard/jobs.pxu b/units/mediacard/jobs.pxu
index 1d27f48..f1f7e0d 100644
--- a/units/mediacard/jobs.pxu
+++ b/units/mediacard/jobs.pxu
@@ -37,7 +37,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-usb_read_write
 {%- else %}
- removable_storage_test -s 67120000 --memorycard sdio usb scsi --auto-reduce-size
+ removable_storage_test.py -s 67120000 --memorycard sdio usb scsi --auto-reduce-size
 {% endif -%}
 _description:
 This test is automated and executes after the mediacard/mmc-insert
@@ -107,7 +107,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-usb_read_write
 {%- else %}
- removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ removable_storage_test.py -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
 {% endif -%}
 _summary: Test reading & writing to a SD Card
 _description:
@@ -145,7 +145,7 @@ id: mediacard/sd-preinserted
 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
+command: removable_storage_test.py -s 268400000 --memorycard -l sdio usb scsi && removable_storage_test.py --memorycard sdio usb scsi
 imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
@@ -162,7 +162,7 @@ id: mediacard/sd-preinserted-server
 estimated_duration: 30.0
 user: root
 flags: preserve-cwd
-command: removable_storage_test -s 268400000 --memorycard -l sdio usb && removable_storage_test --memorycard sdio usb
+command: removable_storage_test.py -s 268400000 --memorycard -l sdio usb && removable_storage_test.py --memorycard sdio usb
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
 _summary: Automated test of SD Card reading & writing (udisk2) for servers
@@ -211,7 +211,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-usb_read_write
 {%- else %}
- removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ removable_storage_test.py -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
 {% endif -%}
 _summary: Test that insertion of an SDHC card is detected
 _description:
@@ -282,7 +282,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-usb_read_write
 {%- else %}
- removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ removable_storage_test.py -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
 {% endif -%}
 _description:
 This test is automated and executes after the mediacard/cf-insert
@@ -352,7 +352,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-usb_read_write
 {%- else %}
- removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ removable_storage_test.py -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
 {% endif -%}
 _summary: Test reading & writing to a SDXC Card
 _description:
@@ -423,7 +423,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-usb_read_write
 {%- else %}
- removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ removable_storage_test.py -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
 {% endif -%}
 _description:
 This test is automated and executes after the mediacard/ms-insert
@@ -492,7 +492,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-usb_read_write
 {%- else %}
- removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ removable_storage_test.py -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
 {% endif -%}
 _description:
 This test is automated and executes after the mediacard/msp-insert
@@ -561,7 +561,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-usb_read_write
 {%- else %}
- removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ removable_storage_test.py -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
 {% endif -%}
 _description:
 This test is automated and executes after the mediacard/xd-insert
@@ -603,7 +603,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-usb_read_write
 {%- else %}
- removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ removable_storage_test.py -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
 {% endif -%}
 environ: LD_LIBRARY_PATH GI_TYPELIB_PATH
 _description:
@@ -627,7 +627,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-usb_read_write
 {%- else %}
- removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ removable_storage_test.py -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
 {% endif -%}
 environ: LD_LIBRARY_PATH GI_TYPELIB_PATH
 _description:
@@ -651,7 +651,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-usb_read_write
 {%- else %}
- removable_storage_test -s 209715200 --memorycard sdio usb scsi --auto-reduce-size
+ removable_storage_test.py -s 209715200 --memorycard sdio usb scsi --auto-reduce-size
 {% endif -%}
 environ: LD_LIBRARY_PATH GI_TYPELIB_PATH
 _description:
@@ -675,7 +675,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-usb_read_write
 {%- else %}
- removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ removable_storage_test.py -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
 {% endif -%}
 environ: LD_LIBRARY_PATH GI_TYPELIB_PATH
 _description:
@@ -699,7 +699,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-usb_read_write
 {%- else %}
- removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ removable_storage_test.py -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
 {% endif -%}
 environ: LD_LIBRARY_PATH GI_TYPELIB_PATH
 _description:
@@ -723,7 +723,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-usb_read_write
 {%- else %}
- removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ removable_storage_test.py -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
 {% endif -%}
 environ: LD_LIBRARY_PATH GI_TYPELIB_PATH
 _description:
@@ -747,7 +747,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-usb_read_write
 {%- else %}
- removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ removable_storage_test.py -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
 {% endif -%}
 environ: LD_LIBRARY_PATH GI_TYPELIB_PATH
 _description:
@@ -771,7 +771,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-usb_read_write
 {%- else %}
- removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ removable_storage_test.py -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
 {% endif -%}
 environ: LD_LIBRARY_PATH GI_TYPELIB_PATH
 _description:
diff --git a/units/stress/jobs.pxu b/units/stress/jobs.pxu
index cdd1ed8..21e06c2 100644
--- a/units/stress/jobs.pxu
+++ b/units/stress/jobs.pxu
@@ -452,7 +452,7 @@ category_id: com.canonical.plainbox::stress
 id: stress/usb
 estimated_duration: 710.0
 user: root
-command: removable_storage_test -s 10240000 -c 100 -i 3 usb
+command: removable_storage_test.py -s 10240000 -c 100 -i 3 usb
 _description: Runs a test that transfers 100 10MB files 3 times to usb.
 
 plugin: user-interact
@@ -461,7 +461,7 @@ id: stress/sdhc
 user: root
 _summary: Stress test for SDHC card
 estimated_duration: 780.0
-command: removable_storage_test -s 10240000 -c 100 -i 3 sdio scsi usb --memorycard
+command: removable_storage_test.py -s 10240000 -c 100 -i 3 sdio scsi usb --memorycard
 _description:
 PURPOSE:
 This test will transfers 100 10MB files 3 times to a SDHC card, to
diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu
index f5b2b9d..91608d3 100644
--- a/units/suspend/suspend.pxu
+++ b/units/suspend/suspend.pxu
@@ -1574,7 +1574,7 @@ id: suspend/usb_storage_automated_after_suspend
 estimated_duration: 1.2
 depends: suspend/usb_insert_after_suspend
 user: root
-command: removable_storage_test -s 268400000 usb
+command: removable_storage_test.py -s 268400000 usb
 _description:
 This test is automated and executes after the suspend/usb_insert_after_suspend
 test is run.
@@ -1587,7 +1587,7 @@ requires:
 usb.usb3 == 'supported'
 depends: suspend/usb3_insert_after_suspend
 user: root
-command: removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
+command: removable_storage_test.py -s 268400000 -m 500000000 usb --driver xhci_hcd
 _description:
 This test is automated and executes after the suspend/usb3_insert_after_suspend
 test is run.
@@ -1598,7 +1598,7 @@ id: suspend/usb_storage_preinserted_after_suspend
 estimated_duration: 1.2
 user: root
 depends: suspend/suspend_advanced_auto
-command: removable_storage_test -l usb && removable_storage_test -s 268400000 usb
+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
@@ -1612,7 +1612,7 @@ user: root
 requires:
 usb.usb3 == 'supported'
 depends: suspend/suspend_advanced_auto
-command: removable_storage_test -l usb && removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
+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
@@ -1624,7 +1624,7 @@ id: suspend/usb_performance_after_suspend
 depends: suspend/usb_insert_after_suspend
 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.
@@ -1637,7 +1637,7 @@ requires:
 depends: suspend/usb3_insert_after_suspend
 user: root
 estimated_duration: 45.00
-command: removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
+command: removable_storage_test.py -s 268400000 -m 500000000 usb --driver xhci_hcd
 _description:
 This test will check that your USB 3.0 port could be recognized
 as SuperSpeed USB device using xhci_hcd driver and transfers data correctly.
@@ -1671,7 +1671,7 @@ id: suspend/mmc-storage-after-suspend
 depends: suspend/mmc-insert-after-suspend
 estimated_duration: 10.0
 user: root
-command: removable_storage_test -s 67120000 --memorycard sdio usb scsi
+command: removable_storage_test.py -s 67120000 --memorycard sdio usb scsi
 _description:
 This test is automated and executes after the mediacard/mmc-insert-after-suspend test
 is run. It tests reading and writing to the MMC card after the system has been suspended.
@@ -1723,7 +1723,7 @@ id: suspend/sd-storage-after-suspend
 estimated_duration: 10.0
 depends: suspend/sd-insert-after-suspend
 user: root
-command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
+command: removable_storage_test.py -s 268400000 --memorycard sdio usb scsi
 _description:
 This test is automated and executes after the mediacard/sd-insert-after-suspend test
 is run. It tests reading and writing to the SD card after the system has been suspended.
@@ -1776,7 +1776,7 @@ id: suspend/sdhc-storage-after-suspend
 estimated_duration: 10.0
 depends: suspend/sdhc-insert-after-suspend
 user: root
-command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
+command: removable_storage_test.py -s 268400000 --memorycard sdio usb scsi
 _description:
 This test is automated and executes after the mediacard/sdhc-insert-after-suspend test
 is run. It tests reading and writing to the SDHC card after the system has been suspended.
@@ -1827,7 +1827,7 @@ id: mediacard/cf-storage-after-suspend
 estimated_duration: 10.0
 depends: mediacard/cf-insert-after-suspend
 user: root
-command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
+command: removable_storage_test.py -s 268400000 --memorycard sdio usb scsi
 _description:
 This test is automated and executes after the mediacard/cf-insert-after-suspend test
 is run. It tests reading and writing to the CF card after the system has been suspended.
@@ -1878,7 +1878,7 @@ id: mediacard/sdxc-storage-after-suspend
 estimated_duration: 10.0
 depends: mediacard/sdxc-insert-after-suspend
 user: root
-command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
+command: removable_storage_test.py -s 268400000 --memorycard sdio usb scsi
 _description:
 This test is automated and executes after the mediacard/sdxc-insert-after-suspend test
 is run. It tests reading and writing to the SDXC card after the system has been suspended.
@@ -1929,7 +1929,7 @@ id: mediacard/ms-storage-after-suspend
 estimated_duration: 10.0
 depends: mediacard/ms-insert-after-suspend
 user: root
-command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
+command: removable_storage_test.py -s 268400000 --memorycard sdio usb scsi
 _description:
 This test is automated and executes after the mediacard/ms-insert-after-suspend test
 is run. It tests reading and writing to the MS card after the system has been suspended.
@@ -1980,7 +1980,7 @@ id: mediacard/msp-storage-after-suspend
 estimated_duration: 10.0
 depends: mediacard/msp-insert-after-suspend
 user: root
-command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
+command: removable_storage_test.py -s 268400000 --memorycard sdio usb scsi
 _description:
 This test is automated and executes after the mediacard/msp-insert-after-suspend test
 is run. It tests reading and writing to the MSP card after the system has been suspended.
@@ -2031,7 +2031,7 @@ id: mediacard/xd-storage-after-suspend
 estimated_duration: 10.0
 depends: mediacard/xd-insert-after-suspend
 user: root
-command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
+command: removable_storage_test.py -s 268400000 --memorycard sdio usb scsi
 _description:
 This test is automated and executes after the mediacard/xd-insert-after-suspend test
 is run. It tests reading and writing to the xD card after the system has been suspended.
diff --git a/units/thunderbolt/jobs.pxu b/units/thunderbolt/jobs.pxu
index 8bb54c4..5095267 100644
--- a/units/thunderbolt/jobs.pxu
+++ b/units/thunderbolt/jobs.pxu
@@ -31,7 +31,7 @@ imports: from com.canonical.plainbox import manifest
 requires: manifest.has_thunderbolt == 'True'
 depends: thunderbolt/insert
 estimated_duration: 45.0
-command: removable_storage_test -s 268400000 scsi
+command: removable_storage_test.py -s 268400000 scsi
 _siblings: [
 { "id": "after-suspend-manual-thunderbolt/storage-test",
 "_summary": "thunderbolt/storage-test after suspend",
@@ -74,7 +74,7 @@ imports: from com.canonical.plainbox import manifest
 requires: manifest.has_thunderbolt == 'True'
 flags: also-after-suspend-manual
 estimated_duration: 45.0
-command: removable_storage_test -s 268400000 scsi
+command: removable_storage_test.py -s 268400000 scsi
 _summary: Daisy-chain testing for Thunderbolt storage and display device
 _description:
 PURPOSE:
@@ -123,7 +123,7 @@ imports: from com.canonical.plainbox import manifest
 requires: manifest.has_thunderbolt3 == 'True'
 depends: thunderbolt3/insert
 estimated_duration: 45.0
-command: removable_storage_test -s 268400000 scsi
+command: removable_storage_test.py -s 268400000 scsi
 _siblings: [
 { "id": "after-suspend-manual-thunderbolt3/storage-test",
 "_summary": "thunderbolt3/storage-test after suspend",
@@ -141,7 +141,7 @@ user: root
 imports: from com.canonical.plainbox import manifest
 requires: manifest.has_thunderbolt3 == 'True'
 estimated_duration: 45.0
-command: removable_storage_test -s 268400000 scsi
+command: removable_storage_test.py -s 268400000 scsi
 flags: also-after-suspend
 _summary: Storage test on Thunderbolt 3 -preinserted
 _description:
@@ -180,7 +180,7 @@ imports: from com.canonical.plainbox import manifest
 requires: manifest.has_thunderbolt3 == 'True'
 flags: also-after-suspend-manual
 estimated_duration: 45.0
-command: removable_storage_test -s 268400000 scsi
+command: removable_storage_test.py -s 268400000 scsi
 _summary: Daisy-chain testing for Thunderbolt 3 storage and display device
 _description:
 PURPOSE:
diff --git a/units/usb/usb-c.pxu b/units/usb/usb-c.pxu
index 0d709e2..a1f24c4 100644
--- a/units/usb/usb-c.pxu
+++ b/units/usb/usb-c.pxu
@@ -56,7 +56,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
@@ -151,7 +151,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
diff --git a/units/usb/usb.pxu b/units/usb/usb.pxu
index 26da9af..ccf4528 100644
--- a/units/usb/usb.pxu
+++ b/units/usb/usb.pxu
@@ -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.
@@ -153,7 +153,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 +173,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 +202,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 +224,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 +234,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 +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 && 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 +288,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.