Merge lp:~roadmr/checkbox/fix-sleep-time-check-crash into lp:checkbox

[Daniel Manrique]

providers:checkbox: Minor fixes on sleep_time_test

Fixes the linked bug, some PEP8 and misc fixes.

[Zygmunt Krynicki (zyga)]

+1, thanks, though it would be easier if there were separate commits for unrelated changes

review: Approve

=== modified file 'providers/plainbox-provider-checkbox/bin/sleep_time_check'
--- providers/plainbox-provider-checkbox/bin/sleep_time_check	2014-04-11 12:25:16 +0000
+++ providers/plainbox-provider-checkbox/bin/sleep_time_check	2015-04-17 17:58:20 +0000
@@ -26,13 +26,16 @@
                               'resume from a sleep state. (Default: '
                               '%(default)s)'))
     args = parser.parse_args()
-    
+
     try:
-        file = open(args.filename)
-        lines = file.readlines()
-    finally:
-        file.close()
+        with open(args.filename) as file:
+            lines = file.readlines()
+    except IOError as e:
+        print(e)
+        return False
 
+    sleep_time = None
+    resume_time = None
     # find our times
     for line in lines:
         if "Average time to sleep" in line:
@@ -40,17 +43,21 @@
         elif "Average time to resume" in line:
             resume_time = float(line.split(':')[1].strip())
 
+    if sleep_time is None or resume_time is None:
+        print("ERROR: One or more times was not reported correctly")
+        return False
+
     print("Average time to enter sleep state: %s seconds" % sleep_time)
     print("Average time to resume from sleep state: %s seconds" % resume_time)
-    
+
     failed = False
     if sleep_time > args.sleep_threshold:
-        print("System failed to suspend in less than %s seconds" % 
-                args.sleep_threshold)
+        print("System failed to suspend in less than %s seconds" %
+              args.sleep_threshold)
         failed = True
     if resume_time > args.resume_threshold:
         print("System failed to resume in less than %s seconds" %
-                args.resume_threshold)
+              args.resume_threshold)
         failed = True
     if sleep_time <= 0.00 or resume_time <= 0.00:
         print("ERROR: One or more times was not reported correctly")