Merge lp:~bladernr/checkbox/1188221-fix-sleep-tests into lp:checkbox
Proposed by
Jeff Lane
Status: | Merged |
---|---|
Approved by: | Daniel Manrique |
Approved revision: | 2175 |
Merged at revision: | 2173 |
Proposed branch: | lp:~bladernr/checkbox/1188221-fix-sleep-tests |
Merge into: | lp:checkbox |
Diff against target: |
48 lines (+6/-3) 3 files modified
checkbox-old/debian/changelog (+3/-0) checkbox-old/scripts/fwts_test (+1/-1) checkbox-old/scripts/sleep_test (+2/-2) |
To merge this branch: | bzr merge lp:~bladernr/checkbox/1188221-fix-sleep-tests |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Manrique (community) | Approve | ||
Review via email: mp+168730@code.launchpad.net |
Description of the change
sleep_test and fwts_test now look for "Resuming tasks ..." rather than the original "PM: Finishing wakeup." message
Also cleaned up sleep_test output to match that of fwts_test so that sleep_time_check doesn't break due to unexpected python log timestamps (that aren't really necessary for the log output anyway)
To post a comment you must log in.
+1, thanks for fixing this!