Merge lp:~bladernr/checkbox/1188221-fix-sleep-tests into lp:checkbox

[Jeff Lane ]

sleep_test and fwts_test now look for "Resuming tasks ..." rather than the original "PM: Finishing wakeup." message

Also cleaned up sleep_test output to match that of fwts_test so that sleep_time_check doesn't break due to unexpected python log timestamps (that aren't really necessary for the log output anyway)

[Daniel Manrique (roadmr)]

+1, thanks for fixing this!

review: Approve

=== modified file 'checkbox-old/debian/changelog'
--- checkbox-old/debian/changelog	2013-06-07 13:33:16 +0000
+++ checkbox-old/debian/changelog	2013-06-11 16:33:26 +0000
@@ -7,6 +7,9 @@
   * jobs/stress.txt.in: added dependencies on single cycle tests to the 30
     cycle S3 and S4 test to avoid unnecessary rebooting by tester on expected
     failures. (LP: #1188284)
+  * scripts/fwts_test, scripts/sleep_test: Tests now use a more reliabe marker
+    to determine when the system completed resume. sleep_test output cleaned up
+    to match fwts_test output and not break sleep_time_check (LP: #1188221)
 
   [ Brendan Donegan ]
   * jobs/optical.txt.in - Added VERIFICATION section for cdrom-write job so that
 
=== modified file 'checkbox-old/scripts/fwts_test'
--- checkbox-old/scripts/fwts_test	2013-05-29 07:50:30 +0000
+++ checkbox-old/scripts/fwts_test	2013-06-11 16:33:26 +0000
@@ -63,7 +63,7 @@
             sleep_end_time = re.split('[\[\]]', loglist[idx - 1])[1].strip()
             resume_start_time = re.split('[\[\]]', loglist[idx])[1].strip()
             idx += 1
-        if 'PM: Finishing wakeup.' in loglist[idx]:
+        if 'Restarting tasks' in loglist[idx]:
             resume_end_time = re.split('[\[\]]', loglist[idx])[1].strip()
         if end_marker in loglist[idx]:
             run = 'PASS'
 
=== modified file 'checkbox-old/scripts/sleep_test'
--- checkbox-old/scripts/sleep_test	2013-05-29 07:50:30 +0000
+++ checkbox-old/scripts/sleep_test	2013-06-11 16:33:26 +0000
@@ -189,7 +189,7 @@
                                                  loglist[idx])[1].strip()
                     logging.debug('Resume started at %s' % resume_start_time)
                     idx += 1
-                if 'PM: Finishing wakeup' in loglist[idx]:
+                if 'Restarting tasks' in loglist[idx]:
                     resume_end_time = re.split('[\[\]]',
                                                loglist[idx])[1].strip()
                     logging.debug('Resume ended at %s' % resume_end_time)
@@ -322,7 +322,7 @@
         return 1
 
     # Set up logging handler
-    format = '%(asctime)s %(levelname)-8s %(message)s'
+    format = '%(message)s'
     handler = ListDictHandler(sys.stdout)
     handler.setFormatter(logging.Formatter(format))
     handler.setLevel(logging.INFO)