Merge lp:~pieq/checkbox/fix-1569191-stress-test-log-time-check into lp:checkbox

[Pierre Equoy]

[Sylvain Pineau (sylvain-pineau)]

Tested using the same way described in the bug report:

touch /tmp/test.log
./sleep_time_check /tmp/test.log

It works now, +1

review: Approve

=== modified file 'providers/plainbox-provider-checkbox/bin/sleep_time_check'
--- providers/plainbox-provider-checkbox/bin/sleep_time_check	2015-10-01 07:12:33 +0000
+++ providers/plainbox-provider-checkbox/bin/sleep_time_check	2016-04-12 09:08:02 +0000
@@ -33,7 +33,7 @@
             lines = file.readlines()
     except IOError as e:
         print(e)
-        return False
+        return 1
 
     sleep_time = None
     sleep_times = []
@@ -51,23 +51,23 @@
     if (sleep_time is None or resume_time is None) or \
     (len(sleep_times) != len(resume_times)):
         print("ERROR: One or more times was not reported correctly")
-        return False
+        return 1
 
     print("Average time to enter sleep state: %.4f seconds" % mean(sleep_times))
     print("Average time to resume from sleep state: %.4f seconds" % mean(resume_times))
 
-    failed = False
+    failed = 0
     if sleep_time > args.sleep_threshold:
         print("System failed to suspend in less than %s seconds" %
               args.sleep_threshold)
-        failed = True
+        failed = 1
     if resume_time > args.resume_threshold:
         print("System failed to resume in less than %s seconds" %
               args.resume_threshold)
-        failed = True
+        failed = 1
     if sleep_time <= 0.00 or resume_time <= 0.00:
         print("ERROR: One or more times was not reported correctly")
-        failed = True
+        failed = 1
 
     return failed