Merge ~kissiel/plainbox-provider-checkbox:poweroff-autoresume into plainbox-provider-checkbox:master

[Maciej Kisielewski]

this time the single poweroff / reboot tests

[Sylvain Pineau (sylvain-pineau)]

Let's take the opportunity to also remove all package.name == 'upstart' from our job definitions.

[Maciej Kisielewski (kissiel)]

> Let's take the opportunity to also remove all package.name == 'upstart' from
> our job definitions.

Done in e039c46.

review: Needs Resubmitting

[Sylvain Pineau (sylvain-pineau)]

+1, thanks.

review: Approve

diff --git a/jobs/daemons.txt.in b/jobs/daemons.txt.in
index 362fee4..d528bdf 100644
--- a/jobs/daemons.txt.in
+++ b/jobs/daemons.txt.in
@@ -29,7 +29,6 @@ _description: Test if the getty daemon is running when the package is installed.
 plugin: shell
 category_id: com.canonical.plainbox::daemons
 id: daemons/init
-requires: package.name == 'upstart'
 command: pgrep -f '/sbin/init' >/dev/null
 _description: Test if the init daemon is running when the package is installed.
 
diff --git a/jobs/power-management.txt.in b/jobs/power-management.txt.in
index c0d73da..2521f81 100644
--- a/jobs/power-management.txt.in
+++ b/jobs/power-management.txt.in
@@ -31,7 +31,7 @@ estimated_duration: 2.0
 _description: Attach log from fwts wakealarm test
 command: [ -e ${PLAINBOX_SESSION_SHARE}/fwts-wakealarm.log ] && cat ${PLAINBOX_SESSION_SHARE}/fwts-wakealarm.log
 
-plugin: user-interact-verify
+plugin: shell
 category_id: com.canonical.plainbox::power-management
 id: power-management/poweroff
 estimated_duration: 120.0
@@ -39,22 +39,11 @@ depends: power-management/fwts_wakealarm
 user: root
 environ: PLAINBOX_SESSION_SHARE
 requires:
- package.name == 'upstart'
  package.name == 'fwts'
-command: pm_test poweroff --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE
-flags: noreturn
+command: pm_test --silent --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox poweroff --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE
+flags: noreturn autorestart
 _description:
- PURPOSE:
   This test will check the system's ability to power-off and boot.
- STEPS:
-  1. Press "Enter" to begin.
-  2. The machine will shut down.
-  3. Power the machine back on.
-  4. After rebooting, wait for the test prompts to inform you that the test is complete.
-  5. Once the test has completed, restart checkbox and select 'Re-run' when prompted.
- VERIFICATION:
-  If the machine successfully shuts down and boots, select Pass, otherwise,
-  select Fail.
 
 plugin: attachment
 category_id: com.canonical.plainbox::power-management
@@ -66,28 +55,18 @@ command:
 _description:
  This will attach any logs from the power-management/poweroff test to the results.
 
-plugin: user-interact-verify
+plugin: shell
 category_id: com.canonical.plainbox::power-management
 id: power-management/reboot
 estimated_duration: 120.0
 user: root
 environ: PLAINBOX_SESSION_SHARE
 requires:
- package.name == 'upstart'
  package.name == 'fwts'
-command: pm_test reboot --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE
-flags: noreturn
+command: pm_test --silent --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox reboot --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE
+flags: noreturn autorestart
 _description:
- PURPOSE:
   This test will check the system's ability to reboot cleanly.
- STEPS:
-  1. Press "Enter" to begin.
-  2. The machine will reboot.
-  3. After rebooting, wait for the test prompts to inform you that the test is complete.
-  4. Once the test has completed, restart checkbox and select Re-Run when prompted.
- VERIFICATION:
-  If the machine successfully reboots, select Pass, otherwise,
-  select Fail.
 
 plugin: attachment
 category_id: com.canonical.plainbox::power-management
diff --git a/jobs/stress.txt.in b/jobs/stress.txt.in
index 37f58f8..9749a4e 100644
--- a/jobs/stress.txt.in
+++ b/jobs/stress.txt.in
@@ -228,7 +228,6 @@ category_id: com.canonical.plainbox::stress
 id: stress/reboot
 estimated_duration: 4500.0
 requires:
- package.name == 'upstart'
  package.name == 'fwts'
 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
@@ -250,7 +249,6 @@ plugin: shell
 category_id: com.canonical.plainbox::stress
 id: stress/reboot_30
 requires:
- package.name == 'upstart'
  package.name == 'fwts'
  executable.name == 'x-terminal-emulator'
 command: pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 30 --silent --log-level=notset reboot --log-dir=$PLAINBOX_SESSION_SHARE
@@ -274,7 +272,6 @@ category_id: com.canonical.plainbox::stress
 id: stress/poweroff
 estimated_duration: 4500.0
 requires:
- package.name == 'upstart'
  package.name == 'fwts'
  executable.name == 'x-terminal-emulator'
 command: pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox --r 100 --silent --log-level=notset poweroff --log-dir=$PLAINBOX_SESSION_SHARE
@@ -297,7 +294,6 @@ plugin: shell
 category_id: com.canonical.plainbox::stress
 id: stress/poweroff_30
 requires:
- package.name == 'upstart'
  package.name == 'fwts'
  executable.name == 'x-terminal-emulator'
 command: pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox --r 30 --silent --log-level=notset poweroff --log-dir=$PLAINBOX_SESSION_SHARE