Merge #338546 from ~sylvain-pineau/plainbox-provider-checkbox:classic-friendly-2

4 files changed, 29 insertions, 11 deletions

diff --git a/bin/pm_test b/bin/pm_test
index 35cd215..481b566 100755
--- a/bin/pm_test
+++ b/bin/pm_test
@@ -637,7 +637,7 @@ class AutoStartFile(object):
 [Desktop Entry]
 Name={pm_operation} test
 Comment=Verify {pm_operation} works properly
-Exec=sudo /usr/bin/python3 {script} -r {repetitions} -w {wakeup} --hardware-delay {hardware_delay} --pm-delay {pm_delay} --min-pm-time {min_pm_time} --max-pm-time {max_pm_time} --append --total {total} --start {start} --pm-timestamp {pm_timestamp} {silent} --log-level={log_level} --log-dir={log_dir} --suspends-before-reboot={suspend_cycles} --checkbox-respawn-cmd={checkbox_respawn} {fwts} {pm_operation}
+Exec=sudo {script} -r {repetitions} -w {wakeup} --hardware-delay {hardware_delay} --pm-delay {pm_delay} --min-pm-time {min_pm_time} --max-pm-time {max_pm_time} --append --total {total} --start {start} --pm-timestamp {pm_timestamp} {silent} --log-level={log_level} --log-dir={log_dir} --suspends-before-reboot={suspend_cycles} --checkbox-respawn-cmd={checkbox_respawn} {fwts} {pm_operation}
 Type=Application
 X-GNOME-Autostart-enabled=true
 Hidden=false
@@ -673,9 +673,13 @@ Hidden=false
 """
 logging.debug('Writing desktop file ({0!r})...'
 .format(self.desktop_filename))
-
+ snap_name = os.getenv('SNAP_NAME')
+ if snap_name:
+ script = '/snap/bin/{}.pm-test'.format(snap_name)
+ else:
+ script = '/usr/bin/python3 {}'.format(os.path.realpath(__file__))
 contents = (self.TEMPLATE
- .format(script=os.path.realpath(__file__),
+ .format(script=script,
 repetitions=self.args.repetitions - 1,
 wakeup=self.args.wakeup,
 hardware_delay=self.args.hardware_delay,
diff --git a/bin/removable_storage_test b/bin/removable_storage_test
index ddd4e1b..42e197a 100755
--- a/bin/removable_storage_test
+++ b/bin/removable_storage_test
@@ -99,6 +99,20 @@ def md5_hash_file(path):
 return md5.hexdigest()
 
 
+def on_ubuntucore():
+ """
+ Check if running from on ubuntu core
+ """
+ snap = os.getenv("SNAP")
+ if snap:
+ with open(os.path.join(snap, 'meta/snap.yaml')) as f:
+ for l in f.readlines():
+ if l == "confinement: classic\n":
+ return False
+ return True
+ return False
+
+
 class DiskTest():
 ''' Class to contain various methods for testing removable disks '''
 
@@ -177,7 +191,7 @@ class DiskTest():
 Indirectly sets:
 self.rem_disks{,_nm,_memory_cards,_memory_cards_nm,_speed}
 """
- if "SNAP" in os.environ:
+ if on_ubuntucore():
 self._probe_disks_udisks2_cli()
 else:
 bus, loop = connect_to_system_bus()
diff --git a/units/power-management/jobs.pxu b/units/power-management/jobs.pxu
index 976f814..be640c3 100644
--- a/units/power-management/jobs.pxu
+++ b/units/power-management/jobs.pxu
@@ -39,7 +39,7 @@ user: root
 environ: PLAINBOX_SESSION_SHARE
 requires: executable.name == 'fwts'
 command: pm_test --silent --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox poweroff --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE
-flags: noreturn autorestart
+flags: noreturn
 _description:
 This test will check the system's ability to power-off and boot.
 
@@ -61,7 +61,7 @@ user: root
 environ: PLAINBOX_SESSION_SHARE
 requires: executable.name == 'fwts'
 command: pm_test --silent --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox reboot --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE
-flags: noreturn autorestart
+flags: noreturn
 _description:
 This test will check the system's ability to reboot cleanly.
 
diff --git a/units/stress/jobs.pxu b/units/stress/jobs.pxu
index 42a79cc..8d25af9 100644
--- a/units/stress/jobs.pxu
+++ b/units/stress/jobs.pxu
@@ -74,7 +74,7 @@ depends:
 suspend/suspend_advanced
 requires:
 executable.name == 'x-terminal-emulator'
-flags: noreturn autorestart
+flags: noreturn
 user: root
 command:
 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
@@ -224,7 +224,7 @@ id: stress/reboot
 estimated_duration: 4500.0
 requires: executable.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
+flags: noreturn
 user: root
 environ: PLAINBOX_SESSION_SHARE
 _description:
@@ -245,7 +245,7 @@ id: stress/reboot_30
 requires: executable.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
+flags: noreturn
 estimated_duration: 2700
 user: root
 environ: PLAINBOX_SESSION_SHARE
@@ -268,7 +268,7 @@ requires:
 executable.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
+flags: noreturn
 user: root
 environ: PLAINBOX_SESSION_SHARE
 _description:
@@ -290,7 +290,7 @@ requires:
 executable.name == 'fwts'
 executable.name == 'x-terminal-emulator'
 command: pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 30 --wakeup 150 --silent --log-level=notset poweroff --log-dir=$PLAINBOX_SESSION_SHARE
-flags: noreturn autorestart
+flags: noreturn
 estimated_duration: 3600
 user: root
 environ: PLAINBOX_SESSION_SHARE