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

[Brendan Donegan]

Original code used:

timedelta(60)

for the time delta between the current time and the start time. This creates a delta of 60 days. Specifying a keyword argument of 'seconds=60' makes sure the delta is specified in seconds.

Also added a short log statement explaining to the user that the scripts is waiting 60 seconds for NetworkManager to re-establish a connection.

[Marc Tardif (cr3)]

Thanks for the fix!

review: Approve

=== modified file 'scripts/sleep_test'
--- scripts/sleep_test	2010-06-22 14:53:01 +0000
+++ scripts/sleep_test	2011-06-06 15:02:42 +0000
@@ -337,11 +337,12 @@
         return True
 
     start = datetime.now()
+    logging.debug("Waiting 60 seconds for NetworkManager to reconnect.")
     while True:
         if nm.get_state() == nm.STATE_CONNECTED:
             return True
         # give 60 seconds to NetworkManager to get to a CONNECTED state, then give up
-        if datetime.now() - start > timedelta(60):
+        if datetime.now() - start > timedelta(seconds=60):
             return False
         sleep(5)