Merge lp:~cr3/checkbox/story554_V2 into lp:~sylvain-pineau/checkbox/story554_V2

[Marc Tardif]

[Sylvain Pineau (sylvain-pineau)]

All changes can be merged, pm_log_check is really a better name and adding the log_filename will allow pm_check to be used standalone easily.

Approved

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-05-16 15:40:19 +0000
+++ debian/changelog	2012-05-16 20:54:20 +0000
@@ -19,7 +19,7 @@
       to results.
 
   [Sylvain Pineau]
-  * scripts/pm_check: added a slightly modified version of OEM team's pm_check.py
+  * scripts/pm_log_check: added a slightly modified version of OEM team's pm_check.py
     script to analyze pm_test logs
   * jobs/stress.txt.in: add OEM team's stress tests (including reboot and poweroff)
     and log analysis jobs      

=== modified file 'jobs/stress.txt.in'
--- jobs/stress.txt.in	2012-05-16 15:40:19 +0000
+++ jobs/stress.txt.in	2012-05-16 20:54:20 +0000
@@ -20,10 +20,10 @@
     This is an automated stress test that will force the system to hibernate/resume for 30 cycles
 
 plugin: attachment
-name: power-management/hibernate-30-cycles-log-attach
+name: power-management/hibernate-30-cycle-log-attach
 command: [ -e $CHECKBOX_DATA/hibernate_30_cycles.log ] && cat $CHECKBOX_DATA/hibernate_30_cycles.log
 _description:
- Attaches the log from the 30 cycles Hibernate/Resume test if it exists
+ Attaches the log from the 30 cycle Hibernate/Resume test if it exists
 
 plugin: shell
 name: power-management/suspend_30_cycles
@@ -36,10 +36,10 @@
     This is an automated stress test that will force the system to suspend/resume for 30 cycles.
 
 plugin: attachment
-name: power-management/suspend-30-cycles-log-attach
+name: power-management/suspend-30-cycle-log-attach
 command: [ -e $CHECKBOX_DATA/suspend_30_cycles.log ] && cat $CHECKBOX_DATA/suspend_30_cycles.log
 _description:
- Attaches the log from the 30 cycles Suspend/Resume test if it exists
+ Attaches the log from the 30 cycle Suspend/Resume test if it exists
 
 plugin: shell
 name: stress/hibernate_250_cycles
@@ -52,10 +52,10 @@
     This is an automated stress test that will force the system to hibernate/resume for 250 cycles
 
 plugin: attachment
-name: stress/hibernate-250-cycles-log-attach
+name: stress/hibernate-250-cycle-log-attach
 command: [ -e $CHECKBOX_DATA/hibernate_250_cycles.log ] && cat $CHECKBOX_DATA/hibernate_250_cycles.log
 _description:
- Attaches the log from the 250 cycles Hibernate/Resume test if it exists
+ Attaches the log from the 250 cycle Hibernate/Resume test if it exists
 
 plugin: shell
 name: stress/suspend_250_cycles
@@ -68,10 +68,10 @@
     This is an automated stress test that will force the system to suspend/resume for 250 cycles.
 
 plugin: attachment
-name: stress/suspend-250-cycles-log-attach
+name: stress/suspend-250-cycle-log-attach
 command: [ -e $CHECKBOX_DATA/suspend_250_cycles.log ] && cat $CHECKBOX_DATA/suspend_250_cycles.log
 _description:
- Attaches the log from the 250 cycles Suspend/Resume test if it exists
+ Attaches the log from the 250 cycle Suspend/Resume test if it exists
 
 plugin: shell
 name: stress/reboot
@@ -106,23 +106,23 @@
 plugin: shell
 name: stress/reboot_check
 depends: stress/reboot
-command: pm_check --log-level=notset $CHECKBOX_DATA/*reboot.100.log
+command: pm_log_check --log-level=notset $CHECKBOX_DATA/*reboot.100.log $CHECKBOX_DATA/pm_log_check_reboot.100.log
 _description: Check logs for the stress reboot (100 cycles) test case
 
 plugin: attachment
 name: stress/reboot_check_log
 depends: stress/reboot_check
 command:
- tar cvfz stress_reboot_check.tgz $CHECKBOX_DATA/*check*reboot.100.log && cat $CHECKBOX_DATA/stress_reboot_check.tgz
+ tar cvfz stress_reboot_check.tgz $CHECKBOX_DATA/pm_log_check_reboot.100.log && cat $CHECKBOX_DATA/stress_reboot_check.tgz
 
 plugin: shell
 name: stress/poweroff_check
 depends: stress/poweroff
-command: pm_check --log-level=notset $CHECKBOX_DATA/*poweroff.100.log
+command: pm_log_check --log-level=notset $CHECKBOX_DATA/*poweroff.100.log $CHECKBOX_DATA/pm_log_check_poweroff.100.log
 _description: Check logs for the stress poweroff (100 cycles) test case
 
 plugin: attachment
 name: stress/poweroff_check_log
 depends: stress/poweroff_check
 command:
- tar cvfz stress_poweroff_check.tgz $CHECKBOX_DATA/*check*poweroff.100.log && cat $CHECKBOX_DATA/stress_poweroff_check.tgz
+ tar cvfz stress_poweroff_check.tgz $CHECKBOX_DATA/pm_log_check_poweroff.100.log && cat $CHECKBOX_DATA/stress_poweroff_check.tgz

=== renamed file 'scripts/pm_check' => 'scripts/pm_log_check'
--- scripts/pm_check	2012-05-16 15:40:19 +0000
+++ scripts/pm_log_check	2012-05-16 20:54:20 +0000
@@ -236,7 +236,9 @@
     """
     parser = ArgumentParser(description='Check power management test case results')
     parser.add_argument('input_log_filename', metavar='log_filename',
-                        help='Path to the log file that should be used to perform the check')
+                        help='Path to the input log file on which to perform the check')
+    parser.add_argument('output_log_filename', metavar='log_filename',
+                        help='Path to the output log file for the results of the check')
     log_levels = ['notset', 'debug', 'info', 'warning', 'error', 'critical']
     parser.add_argument('--log-level', dest='log_level', default='info',
                         choices=log_levels,
@@ -246,8 +248,6 @@
     args = parser.parse_args()
     args.log_level = getattr(logging, args.log_level.upper())
 
-    args.output_log_filename = os.path.abspath(args.input_log_filename).replace('pm_test', os.path.basename(__file__))
-
     return args
 
 

=== modified file 'scripts/pm_test'
--- scripts/pm_test	2012-05-16 15:40:19 +0000
+++ scripts/pm_test	2012-05-16 20:54:20 +0000
@@ -441,7 +441,7 @@
         # Check kernel logs using firmware test suite
         command = Command('fwts -r stdout klog dmesg_common oops').run()
         if command.process.returncode != 0:
-            # Don't abort the test loop, errors can be retrieved by pm_check
+            # Don't abort the test loop, errors can be retrieved by pm_log_check
             logging.error('Problem found in logs by fwts')