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

2 files changed, 13 insertions, 11 deletions

diff --git a/units/cpu/jobs.pxu b/units/cpu/jobs.pxu
index 33446a8..c442bee 100644
--- a/units/cpu/jobs.pxu
+++ b/units/cpu/jobs.pxu
@@ -12,7 +12,7 @@ command:
 if [[ -v SNAP ]]; then
 export LD_LIBRARY_PATH=$SNAP/usr/lib/fwts:$LD_LIBRARY_PATH
 fi
- checkbox-support-fwts_test -t cpufreq -l ${PLAINBOX_SESSION_SHARE}/scaling_test.log
+ checkbox-support-fwts_test -t cpufreq -l "${PLAINBOX_SESSION_SHARE}"/scaling_test.log
 _summary:
 Test the CPU scaling capabilities
 _description:
@@ -24,7 +24,7 @@ category_id: com.canonical.plainbox::cpu
 id: cpu/scaling_test-log-attach
 estimated_duration: 1.0
 depends: cpu/scaling_test
-command: [[ -e ${PLAINBOX_SESSION_SHARE}/scaling_test.log ]] && cat ${PLAINBOX_SESSION_SHARE}/scaling_test.log
+command: [[ -e "${PLAINBOX_SESSION_SHARE}"/scaling_test.log ]] && cat "${PLAINBOX_SESSION_SHARE}"/scaling_test.log
 _summary:
 Attach CPU scaling capabilities log
 _description:
@@ -42,7 +42,7 @@ command:
 if [[ -v SNAP ]]; then
 export LD_LIBRARY_PATH=$SNAP/usr/lib/fwts:$LD_LIBRARY_PATH
 fi
- checkbox-support-fwts_test -t maxfreq -l $PLAINBOX_SESSION_SHARE/maxfreq_test.log
+ checkbox-support-fwts_test -t maxfreq -l "$PLAINBOX_SESSION_SHARE"/maxfreq_test.log
 _summary:
 Test that the CPU can run at its max frequency
 _description:
@@ -54,7 +54,7 @@ category_id: com.canonical.plainbox::cpu
 id: cpu/maxfreq_test-log-attach
 estimated_duration: 1.0
 depends: cpu/maxfreq_test
-command: [ -e $PLAINBOX_SESSION_SHARE/maxfreq_test.log ] && cat $PLAINBOX_SESSION_SHARE/maxfreq_test.log
+command: [ -e "$PLAINBOX_SESSION_SHARE"/maxfreq_test.log ] && cat "$PLAINBOX_SESSION_SHARE"/maxfreq_test.log
 _summary:
 Attach CPU max frequency log
 _description:
@@ -75,7 +75,7 @@ category_id: com.canonical.plainbox::cpu
 id: cpu/offlining_test
 estimated_duration: 128.0
 user: root
-command: cpu_offlining
+command: cpu_offlining.py
 _summary:
 Test offlining of each CPU core
 _description:
@@ -87,7 +87,7 @@ category_id: com.canonical.plainbox::cpu
 id: cpu/topology
 estimated_duration: 1.0
 requires: int(cpuinfo.count) > 1 and (cpuinfo.platform == 'i386' or cpuinfo.platform == 'x86_64' or cpuinfo.platform == 's390x')
-command: cpu_topology
+command: cpu_topology.py
 _summary:
 Check CPU topology for accuracy between proc and sysfs
 _description:
@@ -99,7 +99,7 @@ category_id: com.canonical.plainbox::cpu
 id: cpu/frequency_governors
 estimated_duration: 22.0
 user: root
-command: nice -n -20 frequency_governors_test --debug
+command: nice -n -20 frequency_governors_test.py --debug
 _description:
 This test checks that CPU frequency governors are obeyed when set.
 
@@ -151,7 +151,7 @@ command:
 if [[ -v SNAP ]]; then
 export LD_LIBRARY_PATH=$SNAP/usr/lib/fwts:$LD_LIBRARY_PATH
 fi
- checkbox-support-fwts_test -l $PLAINBOX_SESSION_SHARE/fwts_cstates_results.log -t cstates
+ checkbox-support-fwts_test -l "$PLAINBOX_SESSION_SHARE"/fwts_cstates_results.log -t cstates
 
 plugin: attachment
 category_id: com.canonical.plainbox::cpu
@@ -159,7 +159,7 @@ estimated_duration: 0.5
 id: cpu/cstates_results.log
 after: cpu/cstates
 command:
- [ -e ${PLAINBOX_SESSION_SHARE}/fwts_cstates_results.log ] && cat ${PLAINBOX_SESSION_SHARE}/fwts_cstates_results.log
+ [ -e "${PLAINBOX_SESSION_SHARE}"/fwts_cstates_results.log ] && cat "${PLAINBOX_SESSION_SHARE}"/fwts_cstates_results.log
 _summary:
 Attach C-States test log
 _description:
@@ -170,10 +170,10 @@ category_id: com.canonical.plainbox::cpu
 id: cpu/cpuinfo_before_suspend
 estimated_duration: 1.2
 _summary: Verify that all the CPUs are online before suspending
-command: cpuinfo_resource > $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend
+command: cpuinfo_resource.py > "$PLAINBOX_SESSION_SHARE"/cpuinfo_before_suspend
 _siblings: [
 { "id": "after-suspend-cpu/cpuinfo_after_suspend",
 "_summary": "Verify that all the CPUs are online after suspending",
- "command": "cpuinfo_resource | diff $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend -",
+ "command": "cpuinfo_resource.py | diff $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend -",
 "depends": "com.canonical.certification::suspend/suspend_advanced_auto"}
 ]
diff --git a/units/cpu/test-plan.pxu b/units/cpu/test-plan.pxu
index e5313f1..5d06090 100644
--- a/units/cpu/test-plan.pxu
+++ b/units/cpu/test-plan.pxu
@@ -32,6 +32,8 @@ include:
 cpu/offlining_test certification-status=blocker
 cpu/topology certification-status=blocker
 cpu/clocktest
+ power-management/cpu-low-power-idle
+ power-management/system-low-power-idle
 
 id: cpu-cert-blockers
 unit: test plan