diff options
| author | Maciej Kisielewski <maciej.kisielewski@canonical.com> | 2015-02-06 10:11:04 +0100 |
|---|---|---|
| committer | Maciej Kisielewski <maciej.kisielewski@canonical.com> | 2015-02-06 10:11:04 +0100 |
| commit | fb4bc837a4cb9f24f78e05268fe1f49133d9d681 (patch) | |
| tree | cbd32f76785f34e487e33395fef8bcbccee2195e /jobs | |
| parent | 78261b02dd5a460b33dbc509f4ac4b014844dadc (diff) | |
providers:checkbox: flag jobs using pm_test with 'noreturn'
This patch attaches 'noreturn' flag to all tests using pm_test helper, as this helper runs in a non-blocking fashion. In case of pm_test those commands are reboot and poweroff, all of which killing plainbox along the way. If 'noreturn' flag is not used, this killing might come while plainbox continues to operate which may result to messed-up session state. Fixes: https://bugs.launchpad.net/plainbox/+bug/1403832 Signed-off-by: Maciej Kisielewski <maciej.kisielewski@canonical.com>
Diffstat (limited to 'jobs')
| -rw-r--r-- | jobs/power-management.txt.in | 2 | ||||
| -rw-r--r-- | jobs/stress.txt.in | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/jobs/power-management.txt.in b/jobs/power-management.txt.in index 51734ff..7fae122 100644 --- a/jobs/power-management.txt.in +++ b/jobs/power-management.txt.in @@ -40,6 +40,7 @@ requires: package.name == 'upstart' package.name == 'fwts' command: pm_test poweroff --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE +flags: noreturn _description: PURPOSE: This test will check the system's ability to power-off and boot. @@ -69,6 +70,7 @@ requires: package.name == 'upstart' package.name == 'fwts' command: pm_test reboot --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE +flags: noreturn _description: PURPOSE: This test will check the system's ability to reboot cleanly. diff --git a/jobs/stress.txt.in b/jobs/stress.txt.in index 98f96d1..bc64dd2 100644 --- a/jobs/stress.txt.in +++ b/jobs/stress.txt.in @@ -153,6 +153,7 @@ requires: package.name == 'upstart' package.name == 'fwts' command: pm_test -r 100 --silent --log-level=notset reboot --log-dir=$PLAINBOX_SESSION_SHARE +flags: noreturn user: root environ: PLAINBOX_SESSION_SHARE _description: @@ -170,6 +171,7 @@ requires: package.name == 'upstart' package.name == 'fwts' command: pm_test -r 30 --silent --log-level=notset reboot --log-dir=$PLAINBOX_SESSION_SHARE +flags: noreturn estimated_duration: 2700 user: root environ: PLAINBOX_SESSION_SHARE @@ -188,6 +190,7 @@ requires: package.name == 'upstart' package.name == 'fwts' command: pm_test -r 100 --silent --log-level=notset poweroff --log-dir=$PLAINBOX_SESSION_SHARE +flags: noreturn user: root environ: PLAINBOX_SESSION_SHARE _description: @@ -205,6 +208,7 @@ requires: package.name == 'upstart' package.name == 'fwts' command: pm_test -r 30 --silent --log-level=notset poweroff --log-dir=$PLAINBOX_SESSION_SHARE +flags: noreturn estimated_duration: 3600 user: root environ: PLAINBOX_SESSION_SHARE |