Merge #387358 from ~sylvain-pineau/plainbox-provider-checkbox:extensions4all

2 files changed, 35 insertions, 35 deletions

diff --git a/units/stress/jobs.pxu b/units/stress/jobs.pxu
index 71a1ebf..93ea3f6 100644
--- a/units/stress/jobs.pxu
+++ b/units/stress/jobs.pxu
@@ -5,7 +5,7 @@ estimated_duration: 7200.0
 requires:
 package.name == 'stress'
 user: root
-command: num_vm=$(awk '/MemTotal/ {x=$2/262144; print ((x == int(x)) ? x : int(x) +1)}' /proc/meminfo); vm_bytes=$(($(awk '/MemTotal/ {print int($2/1024)}' /proc/meminfo)/$num_vm/4))M; stress --cpu `cpuinfo_resource | awk '/count:/ {print $2}'` --vm $num_vm --vm-bytes $vm_bytes --timeout 7200s
+command: num_vm=$(awk '/MemTotal/ {x=$2/262144; print ((x == int(x)) ? x : int(x) +1)}' /proc/meminfo); vm_bytes=$(($(awk '/MemTotal/ {print int($2/1024)}' /proc/meminfo)/$num_vm/4))M; stress --cpu `cpuinfo_resource.py | awk '/count:/ {print $2}'` --vm $num_vm --vm-bytes $vm_bytes --timeout 7200s
 _description:
 Simulate high system load using the 'stress' tool to exercise the CPU for
 several hours. The test is considered passed if the system does not freeze or
@@ -22,10 +22,10 @@ command:
 if [ -n "$STRESS_NG_CPU_TIME" ]
 then
 echo "Found STRESS_NG_CPU_TIME env var, stress_ng cpu running time is now: $STRESS_NG_CPU_TIME seconds"
- stress_ng_test cpu --base-time $STRESS_NG_CPU_TIME
+ stress_ng_test.py cpu --base-time $STRESS_NG_CPU_TIME
 else
 echo STRESS_NG_CPU_TIME env var is not found, stress_ng cpu running time is default value
- stress_ng_test cpu --base-time 7200
+ stress_ng_test.py cpu --base-time 7200
 fi
 _summary:
 Stress of CPUs (very long runtime)
@@ -50,8 +50,8 @@ command:
 echo "Calling fwts"
 checkbox-support-fwts_test -l $PLAINBOX_SESSION_SHARE/hibernate_30_cycles -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 --s4-multiple=30
 else
- echo "Calling sleep_test"
- set -o pipefail; sleep_test -s disk -i 30 -w 120 | tee $PLAINBOX_SESSION_SHARE/hibernate_30_cycles.log
+ echo "Calling sleep_test.py"
+ set -o pipefail; sleep_test.py -s disk -i 30 -w 120 | tee $PLAINBOX_SESSION_SHARE/hibernate_30_cycles.log
 fi
 _description:
 PURPOSE:
@@ -61,7 +61,7 @@ plugin: shell
 category_id: com.canonical.plainbox::stress
 id: power-management/hibernate-30-cycles-log-check
 estimated_duration: 1.0
-command: [ -e $PLAINBOX_SESSION_SHARE/hibernate_30_cycles.log ] && sleep_test_log_check -v s4 $PLAINBOX_SESSION_SHARE/hibernate_30_cycles.log
+command: [ -e $PLAINBOX_SESSION_SHARE/hibernate_30_cycles.log ] && sleep_test_log_check.py -v s4 $PLAINBOX_SESSION_SHARE/hibernate_30_cycles.log
 _description:
 Automated check of the 30 cycle hibernate log for errors detected by fwts.
 
@@ -87,13 +87,13 @@ user: root
 environ: PM_TEST_DRY_RUN
 command:
 rm -f $PLAINBOX_SESSION_SHARE/__result
- pm_test reboot --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox --fwts --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE --suspends-before-reboot=30 -r 3 --silent --check-hardware-list
+ pm_test.py reboot --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox --fwts --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE --suspends-before-reboot=30 -r 3 --silent --check-hardware-list
 _summary: 30 suspend/resume cycles and 1 reboot, 3 times (automated stress test)
 _description:
 This is an automated stress test that will run a sequence of '30 suspend/resume cycles and one reboot' 3 times.
 _siblings: [
 { "id": "power-management/suspend_30_cycles_with_coldboots",
- "command": "rm -f $PLAINBOX_SESSION_SHARE/__result; pm_test poweroff --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox --fwts --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE --suspends-before-reboot=30 -r 3 --silent --check-hardware-list",
+ "command": "rm -f $PLAINBOX_SESSION_SHARE/__result; pm_test.py poweroff --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox --fwts --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE --suspends-before-reboot=30 -r 3 --silent --check-hardware-list",
 "_description": "This is an automated stress test that will run a sequence of '30 suspend/resume cycles and one poweroff' 3 times.",
 "_summary": "30 suspend/resume cycles and 1 poweroff, 3 times (automated stress test)"
 }
@@ -113,8 +113,8 @@ command:
 echo "Calling fwts"
 set -o pipefail; checkbox-support-fwts_test -l $PLAINBOX_SESSION_SHARE/suspend_30_cycles -f none -s s3 --s3-device-check --s3-device-check-delay=60 --s3-sleep-delay=60 --s3-multiple=30 | tee $PLAINBOX_SESSION_SHARE/suspend_30_cycles_times.log
 else
- echo "Calling sleep_test"
- set -o pipefail; sleep_test -p -s mem -i 30 | tee $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log
+ echo "Calling sleep_test.py"
+ set -o pipefail; sleep_test.py -p -s mem -i 30 | tee $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log
 fi
 _description:
 PURPOSE:
@@ -125,7 +125,7 @@ category_id: com.canonical.plainbox::stress
 id: power-management/suspend-30-cycles-log-check
 depends: power-management/suspend_30_cycles
 estimated_duration: 1.0
-command: [ -e $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log ] && sleep_test_log_check -v s3 $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log ] && sleep_test_log_check.py -v s3 $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log
 _description:
 Automated check of the 30 cycle suspend log for errors detected by fwts.
 
@@ -134,14 +134,14 @@ category_id: com.canonical.plainbox::stress
 id: power-management/suspend-30-cycles-log-check-with-reboots
 depends: power-management/suspend_30_cycles_with_reboots
 estimated_duration: 1.0
-command: [ -e $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log ] && sleep_test_log_check -v s3 $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log
+command: [ -e $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log ] && sleep_test_log_check.py -v s3 $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log
 _summary: 30 suspend/resume cycles and 1 reboot, 3 times (check logs for errors)
 _description:
 Automated check of the '30 cycle suspend and 1 reboot times 3' logs for errors detected by fwts.
 _siblings: [
 { "id": "power-management/suspend-30-cycles-log-check-with-coldboots",
 "depends": "power-management/suspend_30_cycles_with_coldboots",
- "command": "[ -e $PLAINBOX_SESSION_SHARE/pm_test.poweroff.3.log ] && sleep_test_log_check -v s3 $PLAINBOX_SESSION_SHARE/pm_test.poweroff.3.log",
+ "command": "[ -e $PLAINBOX_SESSION_SHARE/pm_test.poweroff.3.log ] && sleep_test_log_check.py -v s3 $PLAINBOX_SESSION_SHARE/pm_test.poweroff.3.log",
 "_description": "Automated check of the '30 cycle suspend and 1 poweroff times 3' logs for errors detected by fwts.",
 "_summary": "30 suspend/resume cycles and 1 poweroff, 3 times (check logs for errors)"
 }
@@ -179,7 +179,7 @@ category_id: com.canonical.plainbox::stress
 id: power-management/suspend-30-cycles-time-check
 estimated_duration: 1.0
 depends: power-management/suspend_30_cycles
-command: [ -e $PLAINBOX_SESSION_SHARE/suspend_30_cycles_times.log ] && sleep_time_check $PLAINBOX_SESSION_SHARE/suspend_30_cycles_times.log
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_30_cycles_times.log ] && sleep_time_check.py $PLAINBOX_SESSION_SHARE/suspend_30_cycles_times.log
 _description:
 Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
 
@@ -188,14 +188,14 @@ category_id: com.canonical.plainbox::stress
 id: power-management/suspend-30-cycles-time-check-with-reboots
 estimated_duration: 1.0
 depends: power-management/suspend_30_cycles_with_reboots
-command: [ -e $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log ] && sleep_time_check $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log
+command: [ -e $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log ] && sleep_time_check.py $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log
 _summary: 30 suspend/resume cycles and 1 reboot, 3 times (check logs for timing issues)
 _description:
 Checks the sleep times to ensure that a machine suspends and resumes within a given threshold (warm boots)
 _siblings: [
 { "id": "power-management/suspend-30-cycles-time-check-with-coldboots",
 "depends": "power-management/suspend_30_cycles_with_coldboots",
- "command": "[ -e $PLAINBOX_SESSION_SHARE/pm_test.poweroff.3.log ] && sleep_time_check $PLAINBOX_SESSION_SHARE/pm_test.poweroff.3.log",
+ "command": "[ -e $PLAINBOX_SESSION_SHARE/pm_test.poweroff.3.log ] && sleep_time_check.py $PLAINBOX_SESSION_SHARE/pm_test.poweroff.3.log",
 "_description": "Checks the sleep times to ensure that a machine suspends and resumes within a given threshold (cold boots)",
 "_summary": "30 suspend/resume cycles and 1 poweroff, 3 times (check logs for timing issues)"
 }
@@ -213,8 +213,8 @@ command:
 echo "Calling fwts"
 checkbox-support-fwts_test -l $PLAINBOX_SESSION_SHARE/hibernate_250_cycles -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 --s4-multiple=250
 else
- echo "Calling sleep_test"
- set -o pipefail; sleep_test -s disk -i 250 -w 120 | tee $PLAINBOX_SESSION_SHARE/hibernate_250_cycles.log
+ echo "Calling sleep_test.py"
+ set -o pipefail; sleep_test.py -s disk -i 250 -w 120 | tee $PLAINBOX_SESSION_SHARE/hibernate_250_cycles.log
 fi
 _description:
 PURPOSE:
@@ -240,8 +240,8 @@ command:
 echo "Calling fwts"
 set -o pipefail; checkbox-support-fwts_test -l $PLAINBOX_SESSION_SHARE/suspend_250_cycles -s s3 --s3-device-check --s3-device-check-delay=45 --s3-sleep-delay=30 --s3-multiple=250 | tee $PLAINBOX_SESSION_SHARE/suspend_250_cycles_times.log
 else
- echo "Calling sleep_test"
- set -o pipefail; sleep_test -p -s mem -i 250 | tee $PLAINBOX_SESSION_SHARE/suspend_250_cycles.log
+ echo "Calling sleep_test.py"
+ set -o pipefail; sleep_test.py -p -s mem -i 250 | tee $PLAINBOX_SESSION_SHARE/suspend_250_cycles.log
 fi
 _description:
 PURPOSE:
@@ -259,7 +259,7 @@ plugin: shell
 category_id: com.canonical.plainbox::stress
 id: stress/suspend-250-cycles-time-check
 estimated_duration: 1.0
-command: [ -e $PLAINBOX_SESSION_SHARE/suspend_250_cycles_times.log ] && sleep_time_check $PLAINBOX_SESSION_SHARE/suspend_250_cycles_times.log
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_250_cycles_times.log ] && sleep_time_check.py $PLAINBOX_SESSION_SHARE/suspend_250_cycles_times.log
 _description:
 Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
 
@@ -270,7 +270,7 @@ estimated_duration: 4500.0
 requires: executable.name == 'fwts'
 command:
 rm -f $PLAINBOX_SESSION_SHARE/__result
- pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 100 --silent --log-level=notset reboot --log-dir=$PLAINBOX_SESSION_SHARE
+ pm_test.py --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 100 --silent --log-level=notset reboot --log-dir=$PLAINBOX_SESSION_SHARE
 flags: noreturn
 user: root
 environ: PLAINBOX_SESSION_SHARE PM_TEST_DRY_RUN
@@ -293,7 +293,7 @@ requires: executable.name == 'fwts'
 executable.name == 'x-terminal-emulator'
 command:
 rm -f $PLAINBOX_SESSION_SHARE/__result
- pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 30 --silent --log-level=notset reboot --log-dir=$PLAINBOX_SESSION_SHARE
+ pm_test.py --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 30 --silent --log-level=notset reboot --log-dir=$PLAINBOX_SESSION_SHARE
 flags: noreturn
 estimated_duration: 2700
 user: root
@@ -318,7 +318,7 @@ requires:
 executable.name == 'x-terminal-emulator'
 command:
 rm -f $PLAINBOX_SESSION_SHARE/__result
- pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 100 --silent --log-level=notset poweroff --log-dir=$PLAINBOX_SESSION_SHARE
+ pm_test.py --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 100 --silent --log-level=notset poweroff --log-dir=$PLAINBOX_SESSION_SHARE
 flags: noreturn
 user: root
 environ: PLAINBOX_SESSION_SHARE PM_TEST_DRY_RUN
@@ -342,7 +342,7 @@ requires:
 executable.name == 'x-terminal-emulator'
 command:
 rm -f $PLAINBOX_SESSION_SHARE/__result
- pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 30 --wakeup 150 --silent --log-level=notset poweroff --log-dir=$PLAINBOX_SESSION_SHARE
+ pm_test.py --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 30 --wakeup 150 --silent --log-level=notset poweroff --log-dir=$PLAINBOX_SESSION_SHARE
 flags: noreturn
 estimated_duration: 3600
 user: root
@@ -363,7 +363,7 @@ category_id: com.canonical.plainbox::stress
 id: stress/reboot_30_check
 estimated_duration: 1.0
 depends: stress/reboot_30
-command: pm_log_check --log-level=notset $PLAINBOX_SESSION_SHARE/pm_test.reboot.30.log $PLAINBOX_SESSION_SHARE/pm_log_check_reboot.30.log
+command: pm_log_check.py --log-level=notset $PLAINBOX_SESSION_SHARE/pm_test.reboot.30.log $PLAINBOX_SESSION_SHARE/pm_log_check_reboot.30.log
 _description: Check logs for the stress reboot (30 cycles) test case
 
 plugin: attachment
@@ -380,7 +380,7 @@ category_id: com.canonical.plainbox::stress
 id: stress/poweroff_30_check
 estimated_duration: 1.0
 depends: stress/poweroff_30
-command: pm_log_check --log-level=notset $PLAINBOX_SESSION_SHARE/pm_test.poweroff.30.log $PLAINBOX_SESSION_SHARE/pm_log_check_poweroff.30.log
+command: pm_log_check.py --log-level=notset $PLAINBOX_SESSION_SHARE/pm_test.poweroff.30.log $PLAINBOX_SESSION_SHARE/pm_log_check_poweroff.30.log
 _description: Check logs for the stress poweroff (30 cycles) test case
 
 plugin: attachment
@@ -397,7 +397,7 @@ category_id: com.canonical.plainbox::stress
 id: stress/reboot_check
 estimated_duration: 1.0
 depends: stress/reboot
-command: pm_log_check --log-level=notset $PLAINBOX_SESSION_SHARE/pm_test.reboot.100.log $PLAINBOX_SESSION_SHARE/pm_log_check_reboot.100.log
+command: pm_log_check.py --log-level=notset $PLAINBOX_SESSION_SHARE/pm_test.reboot.100.log $PLAINBOX_SESSION_SHARE/pm_log_check_reboot.100.log
 _description: Check logs for the stress reboot (100 cycles) test case
 
 plugin: attachment
@@ -414,7 +414,7 @@ category_id: com.canonical.plainbox::stress
 id: stress/poweroff_check
 estimated_duration: 1.0
 depends: stress/poweroff
-command: pm_log_check --log-level=notset $PLAINBOX_SESSION_SHARE/pm_test.poweroff.100.log $PLAINBOX_SESSION_SHARE/pm_log_check_poweroff.100.log
+command: pm_log_check.py --log-level=notset $PLAINBOX_SESSION_SHARE/pm_test.poweroff.100.log $PLAINBOX_SESSION_SHARE/pm_log_check_poweroff.100.log
 _description: Check logs for the stress poweroff (100 cycles) test case
 
 plugin: attachment
@@ -434,7 +434,7 @@ requires:
 package.name == 'x11-apps'
 user: root
 environ: PLAINBOX_SESSION_SHARE
-command: graphics_stress_test --iterations 20 -b repeat -d -o $PLAINBOX_SESSION_SHARE/graphics-stress-results && echo "Graphics Stress Test completed successfully" || echo "Graphics Stress Test completed, but there are errors. Please see the log $PLAINBOX_SESSION_SHARE/graphics-stress-results for details" && false
+command: graphics_stress_test.py --iterations 20 -b repeat -d -o $PLAINBOX_SESSION_SHARE/graphics-stress-results && echo "Graphics Stress Test completed successfully" || echo "Graphics Stress Test completed, but there are errors. Please see the log $PLAINBOX_SESSION_SHARE/graphics-stress-results for details" && false
 _description:
 Run the graphics stress test. This test can take a few minutes.
 
@@ -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
@@ -481,7 +481,7 @@ id: stress/network_restart
 estimated_duration: 1500.0
 user: root
 environ: PLAINBOX_SESSION_SHARE
-command: network_restart -t 100 -o $PLAINBOX_SESSION_SHARE
+command: network_restart.py -t 100 -o $PLAINBOX_SESSION_SHARE
 _description: Ping ubuntu.com and restart network interfaces 100 times
 
 plugin: attachment
diff --git a/units/stress/s3s4.pxu b/units/stress/s3s4.pxu
index 9a62f8e..f7a3c77 100644
--- a/units/stress/s3s4.pxu
+++ b/units/stress/s3s4.pxu
@@ -68,7 +68,7 @@ category_id: stress-tests/suspend
 id: stress-tests/suspend-{s3_iterations}-cycles-log-check
 after: stress-tests/suspend_{s3_iterations}_cycles
 estimated_duration: 1.0
-command: [ -e $PLAINBOX_SESSION_SHARE/suspend_{s3_iterations}_cycles.log ] && sleep_test_log_check -v s3 $PLAINBOX_SESSION_SHARE/suspend_{s3_iterations}_cycles.log
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_{s3_iterations}_cycles.log ] && sleep_test_log_check.py -v s3 $PLAINBOX_SESSION_SHARE/suspend_{s3_iterations}_cycles.log
 _description:
 Automated check of the {s3_iterations} cycles suspend log for errors detected by fwts.
 
@@ -118,7 +118,7 @@ category_id: stress-tests/hibernate
 id: stress-tests/hibernate-{s4_iterations}-cycles-log-check
 after: stress-tests/hibernate_{s4_iterations}_cycles
 estimated_duration: 1.0
-command: [ -e $PLAINBOX_SESSION_SHARE/hibernate_{s4_iterations}_cycles.log ] && sleep_test_log_check -v s4 $PLAINBOX_SESSION_SHARE/hibernate_{s4_iterations}_cycles.log
+command: [ -e $PLAINBOX_SESSION_SHARE/hibernate_{s4_iterations}_cycles.log ] && sleep_test_log_check.py -v s4 $PLAINBOX_SESSION_SHARE/hibernate_{s4_iterations}_cycles.log
 _description:
 Automated check of the {s4_iterations} cycles hibernate log for errors detected by fwts.