Merge ~pieq/plainbox-provider-checkbox:fix-1816809-NA-times into plainbox-provider-checkbox:master

Proposed by Pierre Equoy
Status: Merged
Approved by: Pierre Equoy
Approved revision: 617d24b65edcf8b5b8948ee846efd2e94674bb8c
Merged at revision: b6bf09c6633c446a25d2ab5173ec711f9f5f1ef6
Proposed branch: ~pieq/plainbox-provider-checkbox:fix-1816809-NA-times
Merge into: plainbox-provider-checkbox:master
Diff against target: 28 lines (+11/-6)
1 file modified
bin/sleep_time_check (+11/-6)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+363952@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

Thanks for the quick fix, +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bin/sleep_time_check b/bin/sleep_time_check
2index 9e7f084..f9513fa 100755
3--- a/bin/sleep_time_check
4+++ b/bin/sleep_time_check
5@@ -41,12 +41,17 @@ def main():
6 resume_times = []
7 # find our times
8 for line in lines:
9- if "Average time to sleep" in line:
10- sleep_time = float(line.split(':')[1].strip())
11- sleep_times.append(sleep_time)
12- elif "Average time to resume" in line:
13- resume_time = float(line.split(':')[1].strip())
14- resume_times.append(resume_time)
15+ try:
16+ if "Average time to sleep" in line:
17+ sleep_time = float(line.split(':')[1].strip())
18+ sleep_times.append(sleep_time)
19+ elif "Average time to resume" in line:
20+ resume_time = float(line.split(':')[1].strip())
21+ resume_times.append(resume_time)
22+ except ValueError as e:
23+ print("ERROR: One or more times was not reported correctly:")
24+ print(e)
25+ return 1
26
27 if (sleep_time is None or resume_time is None) or \
28 (len(sleep_times) != len(resume_times)):

Subscribers

People subscribed via source and target branches