diff options
author | Sylvain Pineau <sylvain.pineau@canonical.com> | 2020-07-14 13:22:54 +0200 |
---|---|---|
committer | Sylvain Pineau <sylvain.pineau@canonical.com> | 2020-07-14 13:22:54 +0200 |
commit | 77b17f872c9ad1780a018eef9cea1ab4c957b5a7 (patch) | |
tree | 38f7cdca3f441926704d27c9f7ce9bb51682d2fe | |
parent | da5eae54280095fadd2ac0b5d630a31824ab16e9 (diff) |
bin:sleep_test -> sleep_test.py
-rwxr-xr-x | bin/pm_test.py | 8 | ||||
-rwxr-xr-x | bin/sleep_test.py (renamed from bin/sleep_test) | 0 | ||||
-rw-r--r-- | units/hibernate/jobs.pxu | 8 | ||||
-rw-r--r-- | units/stress/jobs.pxu | 16 | ||||
-rw-r--r-- | units/suspend/suspend-graphics.pxu | 4 | ||||
-rw-r--r-- | units/suspend/suspend.pxu | 8 |
6 files changed, 22 insertions, 22 deletions
diff --git a/bin/pm_test.py b/bin/pm_test.py index 3afde2a..18cf97c 100755 --- a/bin/pm_test.py +++ b/bin/pm_test.py @@ -194,7 +194,7 @@ class PowerManagementOperation(): self.args.log_dir) + command_tpl command_tpl = '{} ' + command_tpl else: - script_name = 'sleep_test' + script_name = 'sleep_test.py' command_tpl = '{} -s mem -p -i {} -w 10' script_path = os.path.join( os.path.dirname(os.path.realpath(__file__)), script_name) @@ -208,9 +208,9 @@ class PowerManagementOperation(): input() else: try: - # We call sleep_test or fwts_test script and log its output as - # it contains average times we need to compute global average - # times later. + # We call sleep_test.py or fwts_test script and log its output + # as it contains average times we need to compute global + # average times later. logging.info(subprocess.check_output( command_str, universal_newlines=True, shell=True)) except subprocess.CalledProcessError as e: diff --git a/bin/sleep_test b/bin/sleep_test.py index 423fd6c..423fd6c 100755 --- a/bin/sleep_test +++ b/bin/sleep_test.py diff --git a/units/hibernate/jobs.pxu b/units/hibernate/jobs.pxu index 75f233f..e33c0b7 100644 --- a/units/hibernate/jobs.pxu +++ b/units/hibernate/jobs.pxu @@ -11,8 +11,8 @@ command: echo "Calling fwts" checkbox-support-fwts_test -l $PLAINBOX_SESSION_SHARE/hibernate-single -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 else - echo "Calling sleep_test" - sleep_test -s disk -w 120 + echo "Calling sleep_test.py" + sleep_test.py -s disk -w 120 fi estimated_duration: 300.00 _description: @@ -56,8 +56,8 @@ command: echo "Calling fwts" checkbox-support-fwts_test -l $PLAINBOX_SESSION_SHARE/{index}_hibernate-single -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 else - echo "Calling sleep_test" - sleep_test -s disk -w 120 + echo "Calling sleep_test.py" + sleep_test.py -s disk -w 120 fi _purpose: This test will check to make sure your system can successfully hibernate (if supported) diff --git a/units/stress/jobs.pxu b/units/stress/jobs.pxu index 21e06c2..21c7b57 100644 --- a/units/stress/jobs.pxu +++ b/units/stress/jobs.pxu @@ -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: @@ -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: @@ -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: diff --git a/units/suspend/suspend-graphics.pxu b/units/suspend/suspend-graphics.pxu index 6f270de..f108249 100644 --- a/units/suspend/suspend-graphics.pxu +++ b/units/suspend/suspend-graphics.pxu @@ -257,8 +257,8 @@ command: echo "Calling fwts" set -o pipefail; checkbox-support-fwts_test -f none -l $PLAINBOX_SESSION_SHARE/{index}_suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/{index}_suspend_single_times.log else - echo "Calling sleep_test" - set -o pipefail; sleep_test -p | tee $PLAINBOX_SESSION_SHARE/{index}_suspend_single_times.log + echo "Calling sleep_test.py" + set -o pipefail; sleep_test.py -p | tee $PLAINBOX_SESSION_SHARE/{index}_suspend_single_times.log fi _purpose: Suspend SUT 30 times while using {product_slug} graphics card diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu index c6af51f..e59d931 100644 --- a/units/suspend/suspend.pxu +++ b/units/suspend/suspend.pxu @@ -198,8 +198,8 @@ command: fi set -o pipefail; checkbox-support-fwts_test -f none -l $PLAINBOX_SESSION_SHARE/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/suspend_single_times.log else - echo "Calling sleep_test" - set -o pipefail; sleep_test -p | tee $PLAINBOX_SESSION_SHARE/2_suspend_single_times.log + echo "Calling sleep_test.py" + set -o pipefail; sleep_test.py -p | tee $PLAINBOX_SESSION_SHARE/2_suspend_single_times.log fi estimated_duration: 90.0 _summary: Manual test of suspend function @@ -235,8 +235,8 @@ command: fi set -o pipefail; checkbox-support-fwts_test -f none -l $PLAINBOX_SESSION_SHARE/{index}_suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/{index}_suspend_single_times.log else - echo "Calling sleep_test" - set -o pipefail; sleep_test -p | tee $PLAINBOX_SESSION_SHARE/{index}_suspend_single_times.log + echo "Calling sleep_test.py" + set -o pipefail; sleep_test.py -p | tee $PLAINBOX_SESSION_SHARE/{index}_suspend_single_times.log fi estimated_duration: 90.0 _summary: Test suspend/resume after switching to {vendor} {product} |