From 98485755eae9690347809cdb1da2d98a5622495c Mon Sep 17 00:00:00 2001
From: Sylvain Pineau <sylvain.pineau@canonical.com>
Date: Wed, 8 Jan 2020 10:55:54 +0100
Subject: stress: Always remove the magic __result file with jobs respawning
 checkbox

Note: Since most of the time those jobs run as root, it can't be done from
checkbox-ng.

Fixes: lp:1794644
---
 units/stress/jobs.pxu | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/units/stress/jobs.pxu b/units/stress/jobs.pxu
index a5ef86a6..cf44c6cb 100644
--- a/units/stress/jobs.pxu
+++ b/units/stress/jobs.pxu
@@ -86,13 +86,14 @@ flags: noreturn
 user: root
 environ: PM_TEST_DRY_RUN
 command:
+ rm -f $PLAINBOX_SESSION_SHARE/__result
  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 --check-hardware-list
 _summary: 30 suspend/resume cycles and 1 reboot, 3 times (automated stress test)
 _description:
  This is an automated stress test that will run a sequence of '30 suspend/resume cycles and one reboot' 3 times.
 _siblings: [
     { "id": "power-management/suspend_30_cycles_with_coldboots",
-      "command": "pm_test poweroff --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox --fwts --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE --suspends-before-reboot=30 -r 3 --silent --check-hardware-list",
+      "command": "rm -f $PLAINBOX_SESSION_SHARE/__result; pm_test poweroff --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox --fwts --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE --suspends-before-reboot=30 -r 3 --silent --check-hardware-list",
       "_description": "This is an automated stress test that will run a sequence of '30 suspend/resume cycles and one poweroff' 3 times.",
       "_summary": "30 suspend/resume cycles and 1 poweroff, 3 times (automated stress test)"
     }
@@ -267,7 +268,9 @@ category_id: com.canonical.plainbox::stress
 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
+command:
+ rm -f $PLAINBOX_SESSION_SHARE/__result
+ pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 100 --silent --log-level=notset reboot --log-dir=$PLAINBOX_SESSION_SHARE
 flags: noreturn
 user: root
 environ: PLAINBOX_SESSION_SHARE PM_TEST_DRY_RUN
@@ -288,7 +291,9 @@ category_id: com.canonical.plainbox::stress
 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
+command:
+ rm -f $PLAINBOX_SESSION_SHARE/__result
+ pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 30 --silent --log-level=notset reboot --log-dir=$PLAINBOX_SESSION_SHARE
 flags: noreturn
 estimated_duration: 2700
 user: root
@@ -311,7 +316,9 @@ estimated_duration: 4500.0
 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
+command:
+ rm -f $PLAINBOX_SESSION_SHARE/__result
+ pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 100 --silent --log-level=notset poweroff --log-dir=$PLAINBOX_SESSION_SHARE
 flags: noreturn
 user: root
 environ: PLAINBOX_SESSION_SHARE PM_TEST_DRY_RUN
@@ -333,7 +340,9 @@ id: stress/poweroff_30
 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
+command:
+ rm -f $PLAINBOX_SESSION_SHARE/__result
+ 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
 estimated_duration: 3600
 user: root
-- 
cgit v1.2.3