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

[Brendan Donegan]

Fix bug 1064425 caused by get_wired/wifi_resume_time function returning a map instead of a list

Trying to fix the problem caused by the fact that get_time_difference was expecting a list when calling get_*_reconnect_times and in fact getting a map object. My solution is to 'cast' the map object to a list in get_time_difference, but there are lots of possibilities so if someone feels strongly about another way then I'd be happy to hear it.

[Marc Tardif (cr3)]

Good catch, approved!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-09 13:40:50 +0000
+++ debian/changelog	2012-10-09 15:37:27 +0000
@@ -156,6 +156,8 @@
     to avoid invalid characters ending up in the submission.xml (LP: #1060332)
   * scripts/network_reconnect_resume_test - map reconnect time strings to float
     that they can be used in calculations later on (LP: #1064385)
+  * scripts/network_reconnect_resume_test - convert map of reconnect times into
+    a list in order to check if the list is empty (LP: #1064425)
  
   [Sylvain Pineau]
   * jobs/suspend.txt.in: Fixed suspend/suspend_advanced dependencies to avoid
 
=== modified file 'scripts/network_reconnect_resume_test'
--- scripts/network_reconnect_resume_test	2012-10-09 13:40:50 +0000
+++ scripts/network_reconnect_resume_test	2012-10-09 15:37:27 +0000
@@ -20,9 +20,9 @@
               " system has been suspended", file=sys.stderr)
         return None
     if device == "wifi":
-        reconnect_times = get_wifi_reconnect_times()
+        reconnect_times = list(get_wifi_reconnect_times())
     elif device == "wired":
-        reconnect_times = get_wired_reconnect_times()
+        reconnect_times = list(get_wired_reconnect_times())
 
     if not reconnect_times:
         print("Error obtaining %s connection time after a S3. Please be sure"