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

[Brendan Donegan]

During SRU testing, the suspend_advanced_auto test was running on servers and failing since none of the servers we have support the 'mem' (suspend/S3) sleep state. This merge creates a resource job for storing the status of support for the different sleep states. It also uses this to add a requirement for the 'mem' sleep state to be supported in the suspend_advanced_auto test.

[Brendan Donegan (brendan-donegan)]

I would also like to get this backported to Oneiric when it's accepted.

[Daniel Manrique (roadmr)]

Do we know how stable /sys/power/state is? how far back is it available, and is it likely to change in the future? I'm mainly asking since this is meant to be backported and it'd be good to know how likely we are to be affected by changes in this.

Other than this, I'm OK with merging this code.

review: Needs Information

[lp:~brendan-donegan/checkbox/bug804190_server_sleep]

1168. By Brendan Donegan on 2012-01-09

Added the new sleep job to the whitelist.

[Daniel Manrique (roadmr)]

OK, looks good, merging.

Just don't forget that the sleep resource has to be added to all whitelists that require it (what with whitelists not being "recursive" and all that).

Thanks!

review: Approve

[Brendan Donegan (brendan-donegan)]

Yeah. Check out the merge request of a similar name in checkbox-certification.

=== modified file 'data/whitelists/default.whitelist'
--- data/whitelists/default.whitelist	2011-12-06 21:49:20 +0000
+++ data/whitelists/default.whitelist	2012-01-09 17:33:25 +0000
@@ -9,6 +9,7 @@
 module
 package
 uname
+sleep
 __audio__
 audio/alsa_record_playback_external
 audio/alsa_record_playback_internal

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-06 22:16:35 +0000
+++ debian/changelog	2012-01-09 17:33:25 +0000
@@ -13,6 +13,8 @@
   * Fixed connect_wireless script which continued failing to correctly
     identify wireless connections.
   * Don't fail the sleep_test if the wake alarm is still set (LP: #911161)
+  * Add requirement for mem sleep state to be supported to the
+    suspend_advanced_auto job (LP: #804190)
 
   [Gabor Kelemen]
   * Fixed last two remaining strings with backslashes (LP: #868571)

=== modified file 'jobs/resource.txt.in'
--- jobs/resource.txt.in	2011-10-14 10:30:52 +0000
+++ jobs/resource.txt.in	2012-01-09 17:33:25 +0000
@@ -53,3 +53,8 @@
 plugin: resource
 command: uname_resource
 description: Creates resource info from uname output
+
+name: sleep
+plugin: resource
+command: for state in `cat /sys/power/state`; do echo $state": supported"; done
+description: Create resource info for supported sleep states

=== modified file 'jobs/suspend.txt.in'
--- jobs/suspend.txt.in	2012-01-05 16:20:12 +0000
+++ jobs/suspend.txt.in	2012-01-09 17:33:25 +0000
@@ -251,7 +251,9 @@
 plugin: shell
 name: suspend/suspend_advanced_auto
 depends: power-management/rtc networking/detect suspend/cpu_before_suspend suspend/memory_before_suspend suspend/wireless_before_suspend_auto
-requires: package.name == 'pm-utils'
+requires: 
+    package.name == 'pm-utils'
+    sleep.mem == 'supported'
 _description:
  This is the automated version of suspend/suspend_advanced. 
 user: root