Merge lp:~pieq/checkbox/add-30suspend-1reboot-cycles-support into lp:checkbox

[Pierre Equoy]

[Sylvain Pineau (sylvain-pineau)]

tested ok on my own system too. Thanks the new jobs work flawlessly

review: Approve

[Zygmunt Krynicki (zyga)]

Hi

Could you please land a patch on top of this merge requests that uses
"after" rather than "depends" for each attachment. Depends will skip
adding the attachment. We should either use just attachment jobs for
everything or shell jobs that log to a file that have an "after" job
that collects the attachment.

On Thu, Oct 1, 2015 at 1:51 PM, <email address hidden> wrote:
> The proposal to merge lp:~pierre-equoy/checkbox/add-30suspend-1reboot-cycles-support into lp:checkbox has been updated.
>
> Status: Approved => Merged
>
> For more details, see:
> https://code.launchpad.net/~pierre-equoy/checkbox/add-30suspend-1reboot-cycles-support/+merge/273033
> --
> You are subscribed to branch lp:checkbox.

=== modified file 'providers/plainbox-provider-checkbox/bin/pm_test'
--- providers/plainbox-provider-checkbox/bin/pm_test	2015-09-04 06:15:05 +0000
+++ providers/plainbox-provider-checkbox/bin/pm_test	2015-10-01 09:27:23 +0000
@@ -163,7 +163,10 @@
             sleep_test_path, cycles_count)
         logging.info('Running suspend/resume cycles')
         logging.debug('Executing: {0!r}...'.format(command_str))
-        subprocess.check_call(command_str, shell=True)
+        # We call sleep_test script and log its output as it contains
+        # average times we need to compute global average times later.
+        logging.info(subprocess.check_output(command_str,
+            universal_newlines=True, shell=True))
 
     def summary(self):
         """

=== modified file 'providers/plainbox-provider-checkbox/bin/sleep_time_check'
--- providers/plainbox-provider-checkbox/bin/sleep_time_check	2015-04-17 17:56:29 +0000
+++ providers/plainbox-provider-checkbox/bin/sleep_time_check	2015-10-01 09:27:23 +0000
@@ -2,6 +2,7 @@
 
 import sys
 import argparse
+from statistics import mean
 
 
 def main():
@@ -35,20 +36,25 @@
         return False
 
     sleep_time = None
+    sleep_times = []
     resume_time = None
+    resume_times = []
     # find our times
     for line in lines:
         if "Average time to sleep" in line:
             sleep_time = float(line.split(':')[1].strip())
+            sleep_times.append(sleep_time)
         elif "Average time to resume" in line:
             resume_time = float(line.split(':')[1].strip())
+            resume_times.append(resume_time)
 
-    if sleep_time is None or resume_time is None:
+    if (sleep_time is None or resume_time is None) or \
+    (len(sleep_times) != len(resume_times)):
         print("ERROR: One or more times was not reported correctly")
         return False
 
-    print("Average time to enter sleep state: %s seconds" % sleep_time)
-    print("Average time to resume from sleep state: %s seconds" % resume_time)
+    print("Average time to enter sleep state: %.4f seconds" % mean(sleep_times))
+    print("Average time to resume from sleep state: %.4f seconds" % mean(resume_times))
 
     failed = False
     if sleep_time > args.sleep_threshold:

=== modified file 'providers/plainbox-provider-checkbox/jobs/stress.txt.in'
--- providers/plainbox-provider-checkbox/jobs/stress.txt.in	2015-09-08 22:04:46 +0000
+++ providers/plainbox-provider-checkbox/jobs/stress.txt.in	2015-10-01 09:27:23 +0000
@@ -90,7 +90,16 @@
 estimated_duration: 1.0
 command: [ -e $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log ] && sleep_test_log_check -v s3 $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log
 _description:
- Automated check of the 30 cycle hibernate log for errors detected by fwts.
+ Automated check of the 30 cycle suspend log for errors detected by fwts.
+
+plugin: shell
+category_id: 2013.com.canonical.plainbox::stress
+id: power-management/suspend-30-cycles-log-check-with-reboots
+depends: power-management/suspend_30_cycles_with_reboots
+estimated_duration: 1.0
+command: [ -e $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log ] && sleep_test_log_check -v s3 $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log
+_description:
+ Automated check of the '30 cycle suspend and 1 reboot times 3' logs for errors detected by fwts.
 
 plugin: attachment
 category_id: 2013.com.canonical.plainbox::stress
@@ -101,6 +110,15 @@
 _description:
  Attaches the log from the 30 cycle Suspend/Resume test if it exists
 
+plugin: attachment
+category_id: 2013.com.canonical.plainbox::stress
+id: power-management/suspend-30-cycle-log-attach-with-reboots
+estimated_duration: 1.0
+depends: power-management/suspend_30_cycles_with_reboots
+command: [ -e $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log ] && cat $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log
+_description:
+ Attaches the log from the '30 cycle Suspend/Resume and one reboot times 3' test if it exists
+
 plugin: shell
 category_id: 2013.com.canonical.plainbox::stress
 id: power-management/suspend-30-cycles-time-check
@@ -112,6 +130,15 @@
 
 plugin: shell
 category_id: 2013.com.canonical.plainbox::stress
+id: power-management/suspend-30-cycles-time-check-with-reboots
+estimated_duration: 1.0
+depends: power-management/suspend_30_cycles_with_reboots
+command: [ -e $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log ] && sleep_time_check $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log
+_description:
+ Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
+
+plugin: shell
+category_id: 2013.com.canonical.plainbox::stress
 id: stress/hibernate_250_cycles
 estimated_duration: 43400.0
 depends: power-management/rtc