Merge lp:~cr3/checkbox/349768 into lp:checkbox

[Marc Tardif]

[petski (petski)]

You're welcome...

[Marc Tardif (cr3)]

Hi petski, my apologies for not giving you due credit, I just made your patch available in a branch to benefit from the convenient review process in Launchpad. My intention was not to get credit for your work but rather make it available more conveniently :)

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-17 16:14:22 +0000
+++ debian/changelog	2010-04-19 15:18:23 +0000
@@ -9,6 +9,7 @@
   * Fixed starting the appropriate default browser on UNR (LP: #563050)
   * Fixed ansi_parser script when outputting to stdout (LP: #560952)
   * Fixed opening the report with the gconf preferred browser (LP: #562580)
+  * Fixed suspend_test to use relative time for wakealarm (LP: #349768)
 
  -- Marc Tardif <[e-mail]>  Tue, 06 Apr 2010 14:17:46 -0400
 
 
=== modified file 'scripts/suspend_test'
--- scripts/suspend_test	2009-03-10 17:06:06 +0000
+++ scripts/suspend_test	2010-04-19 15:18:23 +0000
@@ -109,11 +109,10 @@
 	#
 	ctl='/sys/class/rtc/rtc0/wakealarm'
 	if [ -f "$ctl" ]; then
-		time=`date '+%s' -d "+ $timeout seconds"`
 		# Cancel any outstanding timers.
 		echo "0" >"$ctl"
-		# rtcN/wakealarm uses absolute time in seconds
-		echo "$time" >"$ctl"
+		# rtcN/wakealarm can use relative time in seconds
+		echo "+$timeout" >"$ctl"
 		return 0
 	fi
 	ctl='/proc/acpi/alarm'