Merge ~sylvain-pineau/plainbox-provider-checkbox:fix-1794644 into plainbox-provider-checkbox:master

[Sylvain Pineau]

Fixes linked bug (if suspend30_with_reboots is failing both poweroff_30 and reboot_30 are failing too)

[Sylvain Pineau (sylvain-pineau)]

self-approved

review: Approve

[Devices Certification Bot (ce-certification-qa)]

The merge was fine but running tests failed.

[xenial] [11:01:07] starting container
[bionic] [11:01:07] starting container
Device project added to xenial-testing
Device project added to bionic-testing
[xenial] [11:01:18] provisioning container
[bionic] [11:01:22] provisioning container
[bionic] [11:01:38] Unable to provision requirements in container!
[bionic] output: https://paste.ubuntu.com/p/6rfWnJ2Dzz/
[bionic] [11:01:41] Fixing file permissions in source directory
[bionic] Destroying failed container to reclaim resources
[xenial] [11:02:05] Starting tests...
[xenial] Found a test script: ./requirements/container-tests-provider-checkbox
[xenial] [11:03:18] container-tests-provider-checkbox: PASS
[xenial] [11:03:18] Fixing file permissions in source directory
[xenial] [11:03:18] Destroying container

review: Needs Fixing

diff --git a/bin/pm_test b/bin/pm_test
index f455858..1ac0c53 100755
--- a/bin/pm_test
+++ b/bin/pm_test
@@ -68,7 +68,7 @@ def main():
         operation.teardown()
         result = {
             'outcome': 'fail',
-            'comment': message,
+            'comments': message,
         }
         with open(os.path.join(args.log_dir, '__result'), 'wt') as f:
             json.dump(result, f)
@@ -268,7 +268,7 @@ class PowerManagementOperation():
             if problems:
                 result = {
                     'outcome': 'fail' if problems else 'pass',
-                    'comment': problems,
+                    'comments': problems,
                 }
                 result_filename = os.path.join(self.args.log_dir, '__result')
                 with open(result_filename, 'wt') as f:
diff --git a/units/stress/jobs.pxu b/units/stress/jobs.pxu
index a5ef86a..cf44c6c 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