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

[Brendan Donegan]

This merge changes the lines in sleep_test which deal with checking whether the wake_alarm is set from failing if the wake alarm is still set to only warning if it is

[Jeff Lane  (bladernr)]

Looks good. Something I'd been meaning to fix for a while but it always got pushed aside. Glad you got it taken care of :)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-21 17:26:41 +0000
+++ debian/changelog	2012-01-03 11:19:25 +0000
@@ -12,6 +12,7 @@
     script to check automatically for a systems 'laptopness' (LP: #886668)
   * 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)
 
   [Gabor Kelemen]
   * Fixed last two remaining strings with backslashes (LP: #868571)

=== modified file 'scripts/sleep_test'
--- scripts/sleep_test	2011-07-15 20:15:22 +0000
+++ scripts/sleep_test	2012-01-03 11:19:25 +0000
@@ -369,9 +369,8 @@
         run_count += 1
         if suspender.CheckAlarm(options.mode):
             logging.debug('The alarm is still set')
-            run_result[run_count] = 'Fail'
-        else:
-            run_result[run_count] = 'Pass'
+        
+        run_result[run_count] = 'Pass'
 
     # Be reasonably sure the network is up before returning, we want
     # the network to be up for possible following tests.