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

Proposed by Brendan Donegan
Status: Merged
Merged at revision: 1753
Proposed branch: lp:~brendan-donegan/checkbox/bug1064385
Merge into: lp:checkbox
Diff against target: 25 lines (+3/-1)
2 files modified
debian/changelog (+2/-0)
scripts/network_reconnect_resume_test (+1/-1)
To merge this branch: bzr merge lp:~brendan-donegan/checkbox/bug1064385
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Review via email: mp+128713@code.launchpad.net

Commit message

Fix bug 1064385 by mapping the timestamp strings from dmesg into floating point numbers

Description of the change

Function to get wired interface reconnect times was not mapping the strings it grep'ed from dmesg to float's, so when they were used in calculations it was crashing. This branch fixes that.

To post a comment you must log in.
Revision history for this message
Marc Tardif (cr3) wrote :

Crap, this should've been fixed at the same time as bug #1038270. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-10-09 10:00:34 +0000
3+++ debian/changelog 2012-10-09 13:44:23 +0000
4@@ -154,6 +154,8 @@
5 sensible values are given if the required file cannot be read (LP: #823606)
6 * [FEATURE] jobs/suspend.txt.in - pipe output of bluetooth_obex jobs through ansi_parser
7 to avoid invalid characters ending up in the submission.xml (LP: #1060332)
8+ * scripts/network_reconnect_resume_test - map reconnect time strings to float
9+ that they can be used in calculations later on (LP: #1064385)
10
11 [Sylvain Pineau]
12 * jobs/suspend.txt.in: Fixed suspend/suspend_advanced dependencies to avoid
13
14=== modified file 'scripts/network_reconnect_resume_test'
15--- scripts/network_reconnect_resume_test 2012-08-28 13:39:29 +0000
16+++ scripts/network_reconnect_resume_test 2012-10-09 13:44:23 +0000
17@@ -54,7 +54,7 @@
18 data = subprocess.check_output(['dmesg'], universal_newlines=True)
19 syntax = re.compile("\[(.*)\].*eth.* Link is [uU]p")
20 results = re.findall(syntax, data)
21- return results
22+ return map(float, results)
23
24
25 def get_resume_time():

Subscribers

People subscribed via source and target branches