bin:removable_storage_watcher -> removable_storage_watcher.py

9 files changed, 88 insertions, 88 deletions

diff --git a/bin/removable_storage_watcher b/bin/removable_storage_watcher.py
index d5a0722..d5a0722 100755
--- a/bin/removable_storage_watcher
+++ b/bin/removable_storage_watcher.py
diff --git a/units/dock/jobs.pxu b/units/dock/jobs.pxu
index 9196f44..19b5983 100644
--- a/units/dock/jobs.pxu
+++ b/units/dock/jobs.pxu
@@ -626,7 +626,7 @@ id: dock/usb-insert
 category_id: dock-usb
 estimated_duration: 10.0
 _summary: USB drive insertion test
-command: removable_storage_watcher insert usb
+command: removable_storage_watcher.py insert usb
 _purpose:
 This test will check that the system correctly detects the insertion of
 a USB storage device plugged on the dock
@@ -646,7 +646,7 @@ id: dock/usb3-insert
 category_id: dock-usb
 estimated_duration: 10.0
 _summary: USB3 drive insertion test
-command: removable_storage_watcher -m 500000000 insert usb
+command: removable_storage_watcher.py -m 500000000 insert usb
 _purpose:
 This test will check that the system correctly detects the insertion of
 a USB 3.0 storage device
@@ -666,7 +666,7 @@ category_id: dock-usb
 depends: dock/usb-insert
 estimated_duration: 10.0
 _summary: USB drive removal test
-command: removable_storage_watcher remove usb
+command: removable_storage_watcher.py remove usb
 _purpose:
 This test will check that the system correctly detects the removal of
 a USB storage device
@@ -683,7 +683,7 @@ category_id: dock-usb
 depends: dock/usb3-insert
 estimated_duration: 10.0
 _summary: USB3 drive removal test
-command: removable_storage_watcher -m 500000000 remove usb
+command: removable_storage_watcher.py -m 500000000 remove usb
 _purpose:
 This test will check that the system correctly detects the removal of
 a USB 3.0 storage device
@@ -726,7 +726,7 @@ requires:
 usb.usb3 == 'supported'
 manifest.has_usb_type_c == 'True'
 estimated_duration: 10.0
-command: removable_storage_watcher -m 500000000 insert usb
+command: removable_storage_watcher.py -m 500000000 insert usb
 _purpose:
 This test will check that the system correctly detects the insertion of
 a USB 3 storage device in a USB Type-C connector on the dock using a
@@ -748,7 +748,7 @@ requires:
 usb.usb3 == 'supported'
 manifest.has_usb_type_c == 'True'
 estimated_duration: 10.0
-command: removable_storage_watcher -m 500000000 insert usb
+command: removable_storage_watcher.py -m 500000000 insert usb
 _purpose:
 This test will check that the system correctly detects the insertion of
 a USB 3 storage device in a USB Type-C connector on the dock
@@ -770,7 +770,7 @@ requires:
 usb.usb3 == 'supported'
 manifest.has_usb_type_c == 'True'
 estimated_duration: 10.0
-command: removable_storage_watcher -m 500000000 remove usb
+command: removable_storage_watcher.py -m 500000000 remove usb
 _purpose:
 This test will check that the system correctly detects the removal of
 a USB 3 storage device connected to a USB Type-C port using a "USB Type-C
@@ -791,7 +791,7 @@ requires:
 usb.usb3 == 'supported'
 manifest.has_usb_type_c == 'True'
 estimated_duration: 10.0
-command: removable_storage_watcher -m 500000000 remove usb
+command: removable_storage_watcher.py -m 500000000 remove usb
 _purpose:
 This test will check that the system correctly detects the removal of
 a USB 3 storage device connected to a USB Type-C port.
@@ -841,7 +841,7 @@ requires:
 usb.usb3 == 'supported'
 manifest.has_usb_type_c == 'True'
 estimated_duration: 10.0
-command: removable_storage_watcher -m 500000000 insert usb
+command: removable_storage_watcher.py -m 500000000 insert usb
 _purpose:
 This test will check that the system correctly detects the insertion of
 a USB 3 storage device in a USB Type-C connector on the dock using a
@@ -864,7 +864,7 @@ requires:
 usb.usb3 == 'supported'
 manifest.has_usb_type_c == 'True'
 estimated_duration: 10.0
-command: removable_storage_watcher -m 500000000 insert usb
+command: removable_storage_watcher.py -m 500000000 insert usb
 _purpose:
 This test will check that the system correctly detects the insertion of
 a USB 3 storage device in a USB Type-C connector on the dock after suspend
@@ -886,7 +886,7 @@ requires:
 usb.usb3 == 'supported'
 manifest.has_usb_type_c == 'True'
 estimated_duration: 10.0
-command: removable_storage_watcher -m 500000000 remove usb
+command: removable_storage_watcher.py -m 500000000 remove usb
 _purpose:
 This test will check that the system correctly detects the removal of
 a USB 3 storage device connected to a USB Type-C port using a "USB Type-C
@@ -907,7 +907,7 @@ requires:
 usb.usb3 == 'supported'
 manifest.has_usb_type_c == 'True'
 estimated_duration: 10.0
-command: removable_storage_watcher -m 500000000 remove usb
+command: removable_storage_watcher.py -m 500000000 remove usb
 _purpose:
 This test will check that the system correctly detects the removal of
 a USB 3 storage device connected to a USB Type-C port after suspend.
@@ -997,7 +997,7 @@ category_id: dock-hotplug
 depends: dock/hot-plug
 estimated_duration: 10.0
 _summary: USB drive insertion test
-command: removable_storage_watcher insert usb
+command: removable_storage_watcher.py insert usb
 _purpose:
 This test will check that the system correctly detects the insertion of
 a USB storage device plugged on the dock
@@ -1018,7 +1018,7 @@ category_id: dock-hotplug
 depends: dock/hot-plug
 estimated_duration: 10.0
 _summary: USB3 drive insertion test
-command: removable_storage_watcher -m 500000000 insert usb
+command: removable_storage_watcher.py -m 500000000 insert usb
 _purpose:
 This test will check that the system correctly detects the insertion of
 a USB 3.0 storage device after dock hot plugged in
@@ -1060,7 +1060,7 @@ category_id: dock-hotplug
 depends: dock/hotplug-usb-insert
 estimated_duration: 10.0
 _summary: USB drive removal test
-command: removable_storage_watcher remove usb
+command: removable_storage_watcher.py remove usb
 _purpose:
 This test will check that the system correctly detects the removal of
 a USB storage device
@@ -1077,7 +1077,7 @@ category_id: dock-hotplug
 depends: dock/hotplug-usb3-insert
 estimated_duration: 10.0
 _summary: USB3 drive removal test
-command: removable_storage_watcher -m 500000000 remove usb
+command: removable_storage_watcher.py -m 500000000 remove usb
 _purpose:
 This test will check that the system correctly detects the removal of
 a USB 3.0 storage device after dock hot plugged in
@@ -1239,7 +1239,7 @@ category_id: dock-usb
 depends: suspend/suspend_advanced
 estimated_duration: 10.0
 _summary: USB drive insertion after resuming
-command: removable_storage_watcher insert usb
+command: removable_storage_watcher.py insert usb
 _purpose:
 This test will check that the system correctly detects the insertion of
 a USB storage device plugged on the dock after suspend
@@ -1274,7 +1274,7 @@ category_id: dock-usb
 depends: suspend/suspend_advanced
 estimated_duration: 10.0
 _summary: USB3 drive insertion after resuming
-command: removable_storage_watcher -m 500000000 insert usb
+command: removable_storage_watcher.py -m 500000000 insert usb
 _purpose:
 This test will check that the system correctly detects the insertion of
 a USB 3.0 storage device after suspend
@@ -1294,7 +1294,7 @@ category_id: dock-usb
 depends: dock/usb-insert-after-suspend
 estimated_duration: 10.0
 _summary: USB drive removal after resuming
-command: removable_storage_watcher remove usb
+command: removable_storage_watcher.py remove usb
 _purpose:
 This test will check that the system correctly detects the removal of
 a USB storage device after suspend
@@ -1311,7 +1311,7 @@ category_id: dock-usb
 depends: dock/usb3-insert-after-suspend
 estimated_duration: 10.0
 _summary: USB3 drive removal after resuming
-command: removable_storage_watcher -m 500000000 remove usb
+command: removable_storage_watcher.py -m 500000000 remove usb
 _purpose:
 This test will check that the system correctly detects the removal of
 a USB 3.0 storage device after suspend
@@ -1711,7 +1711,7 @@ category_id: suspend-undock-resume
 depends: dock/suspend-undock-resume
 estimated_duration: 10.0
 _summary: USB3 drive insertion test
-command: removable_storage_watcher -m 500000000 insert usb
+command: removable_storage_watcher.py -m 500000000 insert usb
 _purpose:
 This test will check that the system correctly detects the insertion of
 a USB 3.0 storage device after suspend, undocked, resume.
@@ -1742,7 +1742,7 @@ category_id: suspend-undock-resume
 depends: dock/usb3-insert-after-suspend-undock-resume
 estimated_duration: 10.0
 _summary: USB3 drive removal test
-command: removable_storage_watcher -m 500000000 remove usb
+command: removable_storage_watcher.py -m 500000000 remove usb
 _purpose:
 This test will check that the system correctly detects the removal of
 a USB 3.0 storage device after suspend, undocked, resume.
@@ -1803,7 +1803,7 @@ category_id: dock
 estimated_duration: 20.0
 _summary: FireWire HDD insertion test
 depends: dock/cold-plug
-command: removable_storage_watcher insert firewire
+command: removable_storage_watcher.py insert firewire
 _purpose:
 This test will check the system can detect the insertion of a FireWire HDD on the dock
 _steps:
@@ -1833,7 +1833,7 @@ category_id: dock
 estimated_duration: 20.0
 _summary: FireWire HDD removal test
 depends: dock/firewire-insert
-command: removable_storage_watcher remove firewire
+command: removable_storage_watcher.py remove firewire
 _purpose:
 This test will check the system can detect the removal of a FireWire HDD
 _steps:
@@ -1851,7 +1851,7 @@ category_id: dock
 estimated_duration: 20.0
 _summary: eSATA HDD insertion test
 depends: dock/cold-plug
-command: removable_storage_watcher insert ata_serial_esata
+command: removable_storage_watcher.py insert ata_serial_esata
 _purpose:
 This test will check the system can detect the insertion of an eSATA HDD on the dock
 _steps:
@@ -1881,7 +1881,7 @@ category_id: dock
 estimated_duration: 20.0
 _summary: eSATA HDD removal test
 depends: dock/esata-insert
-command: removable_storage_watcher remove ata_serial_esata
+command: removable_storage_watcher.py remove ata_serial_esata
 _purpose:
 This test will check the system can detect the removal of an eSATA HDD from the dock
 _steps:
@@ -1932,7 +1932,7 @@ depends: dock/cold-plug
 imports: from com.canonical.plainbox import manifest
 requires: manifest.has_thunderbolt3 == 'True'
 flags: also-after-suspend-manual
-command: removable_storage_watcher insert --timeout 40 scsi
+command: removable_storage_watcher.py insert --timeout 40 scsi
 _summary: Thunderbolt3 storage insertion detection
 _purpose:
 This test will check if the connection of a Thunderbolt3 HDD to the dock could be detected
@@ -1968,7 +1968,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_watcher remove scsi
+command: removable_storage_watcher.py remove scsi
 _summary: Thunderbolt3 storage removal detection
 _purpose:
 This test will check the system can detect the removal of a Thunderbolt3 HDD
@@ -2040,7 +2040,7 @@ category_id: dock-hotplug
 depends: dock/hot-plug-after-suspend
 estimated_duration: 10.0
 _summary: USB drive insertion after resuming
-command: removable_storage_watcher insert usb
+command: removable_storage_watcher.py insert usb
 _purpose:
 This test will check that the system correctly detects the insertion of
 a USB storage device plugged on the dock after suspend
@@ -2061,7 +2061,7 @@ category_id: dock-hotplug
 depends: dock/hot-plug-after-suspend
 estimated_duration: 10.0
 _summary: USB3 drive insertion test
-command: removable_storage_watcher -m 500000000 insert usb
+command: removable_storage_watcher.py -m 500000000 insert usb
 _purpose:
 This test will check that the system correctly detects the insertion of
 a USB 3.0 storage device after dock hot plugged in
@@ -2103,7 +2103,7 @@ category_id: dock-hotplug
 depends: dock/hotplug-usb-insert-after-suspend
 estimated_duration: 10.0
 _summary: USB drive removal after resuming
-command: removable_storage_watcher remove usb
+command: removable_storage_watcher.py remove usb
 _purpose:
 This test will check that the system correctly detects the removal of
 a USB storage device after suspend
@@ -2120,7 +2120,7 @@ category_id: dock-hotplug
 depends: dock/hotplug-usb3-insert-after-suspend
 estimated_duration: 10.0
 _summary: USB3 drive removal test
-command: removable_storage_watcher -m 500000000 remove usb
+command: removable_storage_watcher.py -m 500000000 remove usb
 _purpose:
 This test will check that the system correctly detects the removal of
 a USB 3.0 storage device after dock hot plugged in
@@ -2169,7 +2169,7 @@ category_id: suspend-dock-resume
 depends: dock/suspend-dock-resume
 estimated_duration: 10.0
 _summary: USB drive insertion after resuming
-command: removable_storage_watcher insert usb
+command: removable_storage_watcher.py insert usb
 _purpose:
 This test will check that the system correctly detects the insertion of
 a USB storage device plugged on the dock after suspend
@@ -2190,7 +2190,7 @@ category_id: suspend-dock-resume
 depends: dock/suspend-dock-resume
 estimated_duration: 10.0
 _summary: USB3 drive insertion test
-command: removable_storage_watcher -m 500000000 insert usb
+command: removable_storage_watcher.py -m 500000000 insert usb
 _purpose:
 This test will check that the system correctly detects the insertion of
 a USB 3.0 storage device after suspend, undocked, docked, resume.
@@ -2232,7 +2232,7 @@ category_id: suspend-dock-resume
 depends: dock/usb-insert-after-suspend-dock-resume
 estimated_duration: 10.0
 _summary: USB drive removal after resuming
-command: removable_storage_watcher remove usb
+command: removable_storage_watcher.py remove usb
 _purpose:
 This test will check that the system correctly detects the removal of
 a USB storage device after suspend
@@ -2249,7 +2249,7 @@ category_id: suspend-dock-resume
 depends: dock/usb3-insert-after-suspend-dock-resume
 estimated_duration: 10.0
 _summary: USB3 drive removal test
-command: removable_storage_watcher -m 500000000 remove usb
+command: removable_storage_watcher.py -m 500000000 remove usb
 _purpose:
 This test will check that the system correctly detects the removal of
 a USB 3.0 storage device after suspend, undocked, docked, resume.
diff --git a/units/esata/jobs.pxu b/units/esata/jobs.pxu
index 7067e9e..1559f30 100644
--- a/units/esata/jobs.pxu
+++ b/units/esata/jobs.pxu
@@ -1,7 +1,7 @@
 plugin: user-interact
 category_id: com.canonical.plainbox::esata
 id: esata/insert
-command: removable_storage_watcher insert ata_serial_esata
+command: removable_storage_watcher.py insert ata_serial_esata
 _description:
 PURPOSE:
 This test will check the system can detect the insertion of an eSATA HDD
@@ -27,7 +27,7 @@ plugin: user-interact
 category_id: com.canonical.plainbox::esata
 id: esata/remove
 depends: esata/insert
-command: removable_storage_watcher remove ata_serial_esata
+command: removable_storage_watcher.py remove ata_serial_esata
 _description:
 PURPOSE:
 This test will check the system can detect the removal of an eSATA HDD
diff --git a/units/firewire/jobs.pxu b/units/firewire/jobs.pxu
index b0ca229..ced87cc 100644
--- a/units/firewire/jobs.pxu
+++ b/units/firewire/jobs.pxu
@@ -2,7 +2,7 @@ plugin: user-interact
 category_id: com.canonical.plainbox::firewire
 id: firewire/insert
 require: device.category == 'FIREWIRE'
-command: removable_storage_watcher insert firewire
+command: removable_storage_watcher.py insert firewire
 _description:
 PURPOSE:
 This test will check the system can detect the insertion of a FireWire HDD
@@ -30,7 +30,7 @@ category_id: com.canonical.plainbox::firewire
 id: firewire/remove
 depends: firewire/insert
 require: device.category == 'FIREWIRE'
-command: removable_storage_watcher remove firewire
+command: removable_storage_watcher.py remove firewire
 _description:
 PURPOSE:
 This test will check the system can detect the removal of a FireWire HDD
diff --git a/units/mediacard/jobs.pxu b/units/mediacard/jobs.pxu
index f1f7e0d..05b8345 100644
--- a/units/mediacard/jobs.pxu
+++ b/units/mediacard/jobs.pxu
@@ -7,7 +7,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-run_watcher insertion mediacard
 {%- else %}
- removable_storage_watcher --memorycard insert sdio usb scsi
+ removable_storage_watcher.py --memorycard insert sdio usb scsi
 {% endif -%}
 imports: from com.canonical.plainbox import manifest
 requires:
@@ -53,7 +53,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-run_watcher removal mediacard
 {%- else %}
- removable_storage_watcher --memorycard remove sdio usb scsi
+ removable_storage_watcher.py --memorycard remove sdio usb scsi
 {% endif -%}
 user: root
 _description:
@@ -76,7 +76,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-run_watcher insertion mediacard
 {%- else %}
- removable_storage_watcher --memorycard insert sdio usb scsi
+ removable_storage_watcher.py --memorycard insert sdio usb scsi
 {% endif -%}
 imports: from com.canonical.plainbox import manifest
 requires:
@@ -124,7 +124,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-run_watcher removal mediacard
 {%- else %}
- removable_storage_watcher --memorycard remove sdio usb scsi
+ removable_storage_watcher.py --memorycard remove sdio usb scsi
 {% endif -%}
 user: root
 _summary: Test that removal of an SD card is detected
@@ -179,7 +179,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-run_watcher insertion mediacard
 {%- else %}
- removable_storage_watcher --memorycard insert sdio usb scsi
+ removable_storage_watcher.py --memorycard insert sdio usb scsi
 {% endif -%}
 imports: from com.canonical.plainbox import manifest
 requires:
@@ -228,7 +228,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-run_watcher removal mediacard
 {%- else %}
- removable_storage_watcher --memorycard remove sdio usb scsi
+ removable_storage_watcher.py --memorycard remove sdio usb scsi
 {% endif -%}
 user: root
 _summary: Test that removal of an SDHC card is detected
@@ -252,7 +252,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-run_watcher insertion mediacard
 {%- else %}
- removable_storage_watcher --memorycard insert sdio usb scsi
+ removable_storage_watcher.py --memorycard insert sdio usb scsi
 {% endif -%}
 imports: from com.canonical.plainbox import manifest
 requires:
@@ -298,7 +298,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-run_watcher removal mediacard
 {%- else %}
- removable_storage_watcher --memorycard remove sdio usb scsi
+ removable_storage_watcher.py --memorycard remove sdio usb scsi
 {% endif -%}
 user: root
 _description:
@@ -321,7 +321,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-run_watcher insertion mediacard
 {%- else %}
- removable_storage_watcher --memorycard insert sdio usb scsi
+ removable_storage_watcher.py --memorycard insert sdio usb scsi
 {% endif -%}
 imports: from com.canonical.plainbox import manifest
 requires:
@@ -369,7 +369,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-run_watcher removal mediacard
 {%- else %}
- removable_storage_watcher --memorycard remove sdio usb scsi
+ removable_storage_watcher.py --memorycard remove sdio usb scsi
 {% endif -%}
 user: root
 _summary: Test that removal of an SDXC card is detected
@@ -393,7 +393,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-run_watcher insertion mediacard
 {%- else %}
- removable_storage_watcher --memorycard insert sdio usb scsi
+ removable_storage_watcher.py --memorycard insert sdio usb scsi
 {% endif -%}
 imports: from com.canonical.plainbox import manifest
 requires:
@@ -439,7 +439,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-run_watcher removal mediacard
 {%- else %}
- removable_storage_watcher --memorycard remove sdio usb scsi
+ removable_storage_watcher.py --memorycard remove sdio usb scsi
 {% endif -%}
 user: root
 _description:
@@ -462,7 +462,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-run_watcher insertion mediacard
 {%- else %}
- removable_storage_watcher --memorycard insert sdio usb scsi
+ removable_storage_watcher.py --memorycard insert sdio usb scsi
 {% endif -%}
 user: root
 imports: from com.canonical.plainbox import manifest
@@ -508,7 +508,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-run_watcher removal mediacard
 {%- else %}
- removable_storage_watcher --memorycard remove sdio usb scsi
+ removable_storage_watcher.py --memorycard remove sdio usb scsi
 {% endif -%}
 user: root
 _description:
@@ -531,7 +531,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-run_watcher insertion mediacard
 {%- else %}
- removable_storage_watcher --memorycard insert sdio usb scsi
+ removable_storage_watcher.py --memorycard insert sdio usb scsi
 {% endif -%}
 imports: from com.canonical.plainbox import manifest
 requires:
@@ -577,7 +577,7 @@ command:
 {%- if __on_ubuntucore__ %}
 checkbox-support-run_watcher removal mediacard
 {%- else %}
- removable_storage_watcher --memorycard remove sdio usb scsi
+ removable_storage_watcher.py --memorycard remove sdio usb scsi
 {% endif -%}
 user: root
 _description:
diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu
index 91608d3..c6af51f 100644
--- a/units/suspend/suspend.pxu
+++ b/units/suspend/suspend.pxu
@@ -1496,7 +1496,7 @@ id: suspend/usb_insert_after_suspend
 estimated_duration: 30.0
 depends:
 suspend/suspend_advanced
-command: removable_storage_watcher insert usb
+command: removable_storage_watcher.py insert usb
 _description:
 PURPOSE:
 This test will check that the system correctly detects the insertion of
@@ -1517,7 +1517,7 @@ requires:
 usb.usb3 == 'supported'
 depends:
 suspend/suspend_advanced
-command: removable_storage_watcher -m 500000000 insert usb
+command: removable_storage_watcher.py -m 500000000 insert usb
 _description:
 PURPOSE:
 This test will check that the system correctly detects the insertion of
@@ -1536,7 +1536,7 @@ id: suspend/usb_remove_after_suspend
 estimated_duration: 30.0
 depends:
 suspend/usb_insert_after_suspend
-command: removable_storage_watcher remove usb
+command: removable_storage_watcher.py remove usb
 _description:
 PURPOSE:
 This test will check that the system correctly detects the removal of
@@ -1556,7 +1556,7 @@ depends:
 suspend/usb3_insert_after_suspend
 requires:
 usb.usb3 == 'supported'
-command: removable_storage_watcher -m 500000000 remove usb
+command: removable_storage_watcher.py -m 500000000 remove usb
 _description:
 PURPOSE:
 This test will check that the system correctly detects the removal of
@@ -1651,7 +1651,7 @@ imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
 manifest.has_card_reader == 'True'
-command: removable_storage_watcher --memorycard insert sdio usb scsi
+command: removable_storage_watcher.py --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the systems media card reader can
@@ -1681,7 +1681,7 @@ category_id: com.canonical.plainbox::suspend
 id: suspend/mmc-remove-after-suspend
 depends: suspend/mmc-insert-after-suspend
 estimated_duration: 30.0
-command: removable_storage_watcher --memorycard remove sdio usb scsi
+command: removable_storage_watcher.py --memorycard remove sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the system correctly detects the removal
@@ -1702,7 +1702,7 @@ imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
 manifest.has_card_reader == 'True'
-command: removable_storage_watcher --memorycard insert sdio usb scsi
+command: removable_storage_watcher.py --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the systems media card reader can
@@ -1733,7 +1733,7 @@ category_id: com.canonical.plainbox::suspend
 id: suspend/sd-remove-after-suspend
 estimated_duration: 30.0
 depends: suspend/sd-insert-after-suspend
-command: removable_storage_watcher --memorycard remove sdio usb scsi
+command: removable_storage_watcher.py --memorycard remove sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the system correctly detects
@@ -1755,7 +1755,7 @@ imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
 manifest.has_card_reader == 'True'
-command: removable_storage_watcher --memorycard insert sdio usb scsi
+command: removable_storage_watcher.py --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the systems media card reader can
@@ -1786,7 +1786,7 @@ category_id: com.canonical.plainbox::suspend
 id: suspend/sdhc-remove-after-suspend
 estimated_duration: 30.0
 depends: suspend/sdhc-insert-after-suspend
-command: removable_storage_watcher --memorycard remove sdio usb scsi
+command: removable_storage_watcher.py --memorycard remove sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the system correctly detects the removal
@@ -1807,7 +1807,7 @@ imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
 manifest.has_card_reader == 'True'
-command: removable_storage_watcher --memorycard insert sdio usb scsi
+command: removable_storage_watcher.py --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the systems media card reader can
@@ -1837,7 +1837,7 @@ category_id: com.canonical.plainbox::suspend
 id: mediacard/cf-remove-after-suspend
 estimated_duration: 30.0
 depends: mediacard/cf-insert-after-suspend
-command: removable_storage_watcher --memorycard remove sdio usb scsi
+command: removable_storage_watcher.py --memorycard remove sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the system correctly detects the removal
@@ -1858,7 +1858,7 @@ imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
 manifest.has_card_reader == 'True'
-command: removable_storage_watcher --memorycard insert sdio usb scsi
+command: removable_storage_watcher.py --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the systems media card reader can
@@ -1888,7 +1888,7 @@ category_id: com.canonical.plainbox::suspend
 id: mediacard/sdxc-remove-after-suspend
 depends: mediacard/sdxc-insert-after-suspend
 estimated_duration: 30.0
-command: removable_storage_watcher --memorycard remove sdio usb scsi
+command: removable_storage_watcher.py --memorycard remove sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the system correctly detects the removal
@@ -1909,7 +1909,7 @@ imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
 manifest.has_card_reader == 'True'
-command: removable_storage_watcher --memorycard insert sdio usb scsi
+command: removable_storage_watcher.py --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the systems media card reader can
@@ -1939,7 +1939,7 @@ category_id: com.canonical.plainbox::suspend
 id: mediacard/ms-remove-after-suspend
 estimated_duration: 30.0
 depends: mediacard/ms-insert-after-suspend
-command: removable_storage_watcher --memorycard remove sdio usb scsi
+command: removable_storage_watcher.py --memorycard remove sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the system correctly detects the removal
@@ -1960,7 +1960,7 @@ imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
 manifest.has_card_reader == 'True'
-command: removable_storage_watcher --memorycard insert sdio usb scsi
+command: removable_storage_watcher.py --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the systems media card reader can
@@ -1990,7 +1990,7 @@ category_id: com.canonical.plainbox::suspend
 id: mediacard/msp-remove-after-suspend
 estimated_duration: 30.0
 depends: mediacard/msp-insert-after-suspend
-command: removable_storage_watcher --memorycard remove sdio usb scsi
+command: removable_storage_watcher.py --memorycard remove sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the system correctly detects the removal
@@ -2011,7 +2011,7 @@ imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
 manifest.has_card_reader == 'True'
-command: removable_storage_watcher --memorycard insert sdio usb scsi
+command: removable_storage_watcher.py --memorycard insert sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the systems media card reader can
@@ -2041,7 +2041,7 @@ category_id: com.canonical.plainbox::suspend
 id: mediacard/xd-remove-after-suspend
 estimated_duration: 30.0
 depends: mediacard/xd-insert-after-suspend
-command: removable_storage_watcher --memorycard remove sdio usb scsi
+command: removable_storage_watcher.py --memorycard remove sdio usb scsi
 _description:
 PURPOSE:
 This test will check that the system correctly detects the removal
diff --git a/units/thunderbolt/jobs.pxu b/units/thunderbolt/jobs.pxu
index 5095267..73fadb5 100644
--- a/units/thunderbolt/jobs.pxu
+++ b/units/thunderbolt/jobs.pxu
@@ -4,7 +4,7 @@ id: thunderbolt/insert
 imports: from com.canonical.plainbox import manifest
 requires: manifest.has_thunderbolt == 'True'
 estimated_duration: 20.0
-command: removable_storage_watcher insert --timeout 40 scsi
+command: removable_storage_watcher.py insert --timeout 40 scsi
 _siblings: [
 { "id": "after-suspend-manual-thunderbolt/insert",
 "_summary": "thunderbolt/insert after suspend",
@@ -49,7 +49,7 @@ imports: from com.canonical.plainbox import manifest
 requires: manifest.has_thunderbolt == 'True'
 depends: thunderbolt/insert
 estimated_duration: 10.0
-command: removable_storage_watcher remove scsi
+command: removable_storage_watcher.py remove scsi
 _summary: Storage removal detection on Thunderbolt
 _siblings: [
 { "id": "after-suspend-manual-thunderbolt/remove",
@@ -96,7 +96,7 @@ id: thunderbolt3/insert
 imports: from com.canonical.plainbox import manifest
 requires: manifest.has_thunderbolt3 == 'True'
 estimated_duration: 20.0
-command: removable_storage_watcher insert --timeout 40 scsi
+command: removable_storage_watcher.py insert --timeout 40 scsi
 _siblings: [
 { "id": "after-suspend-manual-thunderbolt3/insert",
 "_summary": "thunderbolt3/insert after suspend",
@@ -155,7 +155,7 @@ imports: from com.canonical.plainbox import manifest
 requires: manifest.has_thunderbolt3 == 'True'
 depends: thunderbolt3/insert
 estimated_duration: 10.0
-command: removable_storage_watcher remove scsi
+command: removable_storage_watcher.py remove scsi
 _siblings: [
 { "id": "after-suspend-manual-thunderbolt3/remove",
 "_summary": "thunderbolt3/remove after suspend",
diff --git a/units/usb/usb-c.pxu b/units/usb/usb-c.pxu
index a1f24c4..ac17664 100644
--- a/units/usb/usb-c.pxu
+++ b/units/usb/usb-c.pxu
@@ -36,7 +36,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
@@ -84,7 +84,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
@@ -130,7 +130,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
@@ -178,7 +178,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 ccf4528..3a0b232 100644
--- a/units/usb/usb.pxu
+++ b/units/usb/usb.pxu
@@ -66,7 +66,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
@@ -92,7 +92,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 +117,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 +142,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