Merge lp:~brendan-donegan/checkbox/bug1067692 into lp:checkbox

[Brendan Donegan]

suspend_advanced doesn't need any dependencies other than power-management/rtc, so I've removed them.

[Marc Tardif (cr3)]

Seems perfectly reasonable, nice troubleshooting!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-18 15:51:14 +0000
+++ debian/changelog	2012-10-19 14:44:22 +0000
@@ -10,6 +10,7 @@
   * checkbox/lib/templates.py, jobs/resources.txt.in, jobs/wireless.txt.in,
     jobs/suspend.txt.in - Don't try and coerce keys of resource jobs to
     lowercase, as it upset the core of Checkbox (LP: #1067280)
+<<<<<<< TREE
   * jobs/suspend.txt.in - created new batch of wireless tests depending only on
     suspend_advanced so that they will run in manual testing (LP: #1067678)
   * scripts/resolution_test - Slightly clarify output of script so that it's
@@ -17,6 +18,10 @@
   * Allow verification and interaction to be used as aliases for manual tests
     so that we can distinguish between tests which are partly manual and
     those which are entirely manual.
+=======
+  * jobs/suspend.txt.in - Let suspend_advanced only depend on
+    power-management/rtc (LP: #1067692)
+>>>>>>> MERGE-SOURCE
 
   [Daniel Manrique]
   * [FEATURE] checkbox/job.py: Fixed intltool warning about unnamed

=== modified file 'jobs/suspend.txt.in'
--- jobs/suspend.txt.in	2012-10-17 10:42:35 +0000
+++ jobs/suspend.txt.in	2012-10-19 14:44:22 +0000
@@ -90,7 +90,7 @@
 
 plugin: manual
 name: suspend/suspend_advanced
-depends: power-management/rtc suspend/network_before_suspend suspend/resolution_before_suspend suspend/wireless_before_suspend suspend/cpu_before_suspend suspend/memory_before_suspend
+depends: power-management/rtc
 requires:
  package.name == 'fwts' or package.name == 'pm-utils'
  sleep.mem == 'supported'