Merge lp:~bladernr/checkbox/1188284-fix-s3-s4-30cycle-deps into lp:checkbox

[Jeff Lane ]

With this, the 30 cycle S3 and S4 tests will only run if the single cycle S3 and S4 tests have run and passed. If we can't successfully do a single cycle of each (The tests are manual and only fail if the system doesn't actually suspend/hibernate and resume) there's no point in running the 30 cycle tests.

When we do run them, what happens is the tester wastes time rebooting a system expected to fail, and clicking through checkbox to get passed the failing 30 cycle tests.

[Daniel Manrique (roadmr)]

I think this hadn't been done before because we had the stress tests on a separate whitelist, so we didn't want to add the single-test dependency to that list.

Anyway, this looks good, +1, thanks!

review: Approve

=== modified file 'checkbox-old/debian/changelog'
--- checkbox-old/debian/changelog	2013-06-06 07:39:23 +0000
+++ checkbox-old/debian/changelog	2013-06-06 17:50:36 +0000
@@ -4,6 +4,9 @@
   * scripts/virtualization: script no longer fails when trying to cast an
     empty timeout setting in config file to int(). Added additional error
     handling. (LP: #1186259)
+  * 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)
 
   [ Brendan Donegan ]
   * jobs/optical.txt.in - Added VERIFICATION section for cdrom-write job so that
 
=== modified file 'checkbox-old/jobs/stress.txt.in'
--- checkbox-old/jobs/stress.txt.in	2013-06-03 21:07:18 +0000
+++ checkbox-old/jobs/stress.txt.in	2013-06-06 17:50:36 +0000
@@ -10,7 +10,9 @@
 
 plugin: shell
 name: power-management/hibernate_30_cycles
-depends: power-management/rtc
+depends: 
+ power-management/rtc
+ power-management/hibernate_advanced
 environ: CHECKBOX_DATA
 user: root
 command:
@@ -39,7 +41,9 @@
 
 plugin: shell
 name: power-management/suspend_30_cycles
-depends: power-management/rtc
+depends: 
+ power-management/rtc
+ suspend/suspend_advanced
 environ: CHECKBOX_DATA
 user: root
 command: