summaryrefslogtreecommitdiff
diff options
authorMaciej Kisielewski <maciej.kisielewski@canonical.com>2017-09-06 11:02:09 +0200
committerMaciej Kisielewski <maciej.kisielewski@canonical.com>2017-09-06 14:41:19 +0200
commit45db040f2ebaad3c578534c07ebb2ca457dd66bf (patch)
tree81f146366cf5f1bb9d3f5d6766c346511854612a
parent2af5e66657e6b0c276834eb6bbbe25079dc0afa6 (diff)
pm_test: use x-terminal-emulator instead of gnome-terminal
Signed-off-by: Maciej Kisielewski <maciej.kisielewski@canonical.com>
-rwxr-xr-xbin/pm_test2
-rw-r--r--jobs/stress.txt.in5
2 files changed, 6 insertions, 1 deletions
diff --git a/bin/pm_test b/bin/pm_test
index 42de2d84..395498c6 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 c42168eb..37f58f82 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,6 +276,7 @@ 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
flags: noreturn autorestart
user: root
@@ -295,6 +299,7 @@ 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
flags: noreturn autorestart
estimated_duration: 3600