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

[Maciej Kisielewski]

Make poweroff tests auto-resume checkbox after they're done

[Jonathan Cave (jocave)]

I'm not in a great position to be able to test the functionality of the test, however I wonder if we should make it a bit more obvious that this is desktop only test.

For instance, given how the checkbox-respawn-cmd flag works, a package.name == 'gnome-terminal' might be appropriate?

review: Needs Information

[Maciej Kisielewski (kissiel)]

> I'm not in a great position to be able to test the functionality of the test,
> however I wonder if we should make it a bit more obvious that this is desktop
> only test.
>
> For instance, given how the checkbox-respawn-cmd flag works, a package.name ==
> 'gnome-terminal' might be appropriate?

Added packaging meta-data.

review: Needs Resubmitting

[Jonathan Cave (jocave)]

Maybe I don't understand packaging meta-data, but wont this try and install gnome-terminal on any system that installs the deb of this provider i.e. on server installs too?

review: Needs Information

[Sylvain Pineau (sylvain-pineau)]

I'd add package.name == 'x-terminal-emulator' as a job requirement and call x-terminal-emulator from pm_test, this way we're not stuck with gnome-term.

But drop the packaging meta-data, it will indeed have undesired side-effect for server-cert packaging.

review: Needs Fixing

[Maciej Kisielewski (kissiel)]

> I'd add package.name == 'x-terminal-emulator' as a job requirement and call x
> -terminal-emulator from pm_test, this way we're not stuck with gnome-term.
>
> But drop the packaging meta-data, it will indeed have undesired side-effect
> for server-cert packaging.

x-terminal-emulator is a virtual package, which doesn't get reported by package, so I decided to go with 'executable' resource instead.

This, OTOH, requires unreleased version of plainbox-provider-resource, as x-terminal-emulator is a symlink. More info: https://bugs.launchpad.net/plainbox-provider-resource/+bug/1710172

Everything works nicely provided with ppr supplied from master.

review: Needs Resubmitting

[Sylvain Pineau (sylvain-pineau)]

+1 for the executable resource.

review: Approve

diff --git a/bin/pm_test b/bin/pm_test
index 42de2d8..395498c 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 {}; exec bash\""'.format(
+                r'DISPLAY=:0 x-terminal-emulator -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 5eae797..37f58f8 100644
--- a/jobs/stress.txt.in
+++ b/jobs/stress.txt.in
@@ -77,6 +77,8 @@ estimated_duration: 5400.0
 depends:
  power-management/rtc
  suspend/suspend_advanced
+requires:
+ executable.name == 'x-terminal-emulator'
 flags: noreturn autorestart
 user: root
 command:
@@ -250,6 +252,7 @@ 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
 flags: noreturn autorestart
 estimated_duration: 2700
@@ -273,8 +276,9 @@ estimated_duration: 4500.0
 requires:
  package.name == 'upstart'
  package.name == 'fwts'
-command: pm_test -r 100 --silent --log-level=notset poweroff --log-dir=$PLAINBOX_SESSION_SHARE
-flags: noreturn
+ 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
+flags: noreturn autorestart
 user: root
 environ: PLAINBOX_SESSION_SHARE
 _description:
@@ -295,8 +299,9 @@ id: stress/poweroff_30
 requires:
  package.name == 'upstart'
  package.name == 'fwts'
-command: pm_test -r 30 --silent --log-level=notset poweroff --log-dir=$PLAINBOX_SESSION_SHARE
-flags: noreturn
+ 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
+flags: noreturn autorestart
 estimated_duration: 3600
 user: root
 environ: PLAINBOX_SESSION_SHARE