diff options
| author | PMR <pmr@pmr-lander> | 2017-09-01 13:54:29 +0000 |
|---|---|---|
| committer | PMR <pmr@pmr-lander> | 2017-09-01 13:54:29 +0000 |
| commit | 8ad9b4b3a77273bc4c6cffee609ee7f205667f28 (patch) | |
| tree | 30fe7588ab304c266c5da7d20771b50d3890c36b | |
| parent | 507703710fa1332109e5d90d49d30b45d545c5c6 (diff) | |
| parent | b09f11afcda05bb3cab5a6fac2aab6f9e59fc369 (diff) | |
Merge #328654 from ~kissiel/plainbox-provider-checkbox:respawn-after-pmtest-reboots
| -rwxr-xr-x | bin/pm_test | 2 | ||||
| -rw-r--r-- | jobs/stress.txt.in | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/bin/pm_test b/bin/pm_test index 868b92b..42de2d8 100755 --- a/bin/pm_test +++ b/bin/pm_test @@ -202,7 +202,7 @@ class PowerManagementOperation(object): MessageDialog(title, message).run() if self.args.checkbox_respawn_cmd: subprocess.run( - r'DISPLAY=:0 gnome-terminal -e "bash -c \"source {}\""'.format( + r'DISPLAY=:0 gnome-terminal -e "bash -c \"source {}; exec bash\""'.format( self.args.checkbox_respawn_cmd), shell=True) def teardown(self): diff --git a/jobs/stress.txt.in b/jobs/stress.txt.in index 75b497c..5eae797 100644 --- a/jobs/stress.txt.in +++ b/jobs/stress.txt.in @@ -77,9 +77,10 @@ estimated_duration: 5400.0 depends: power-management/rtc suspend/suspend_advanced +flags: noreturn autorestart user: root command: - pm_test reboot --fwts --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE --suspends-before-reboot=30 -r 3 + 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 _description: This is an automated stress test that will run a sequence of '30 suspend/resume cycles and one reboot' 3 times. @@ -227,8 +228,8 @@ estimated_duration: 4500.0 requires: package.name == 'upstart' package.name == 'fwts' -command: pm_test -r 100 --silent --log-level=notset reboot --log-dir=$PLAINBOX_SESSION_SHARE -flags: noreturn +command: pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 100 --silent --log-level=notset reboot --log-dir=$PLAINBOX_SESSION_SHARE +flags: noreturn autorestart user: root environ: PLAINBOX_SESSION_SHARE _description: @@ -249,8 +250,8 @@ id: stress/reboot_30 requires: package.name == 'upstart' package.name == 'fwts' -command: pm_test -r 30 --silent --log-level=notset reboot --log-dir=$PLAINBOX_SESSION_SHARE -flags: noreturn +command: pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 30 --silent --log-level=notset reboot --log-dir=$PLAINBOX_SESSION_SHARE +flags: noreturn autorestart estimated_duration: 2700 user: root environ: PLAINBOX_SESSION_SHARE |