Checkbox

Merge lp:~cr3/checkbox/1018354 into lp:checkbox

  1. 1018354
  2. Merge into trunk
Proposed by Marc Tardif
Status: Merged
Merged at revision: 1471
Proposed branch: lp:~cr3/checkbox/1018354
Merge into: lp:checkbox
Diff against target: 50 lines (+8/-3)
3 files modified
debian/changelog (+3/-0)
jobs/suspend.txt.in (+1/-1)
scripts/run_templates (+4/-2)
To merge this branch: bzr merge lp:~cr3/checkbox/1018354
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+112395@code.launchpad.net

Description of the change

Tested the changes: no ERROR lines in checkbox.log and submission successfully uploaded:

http://launchpadlibrarian.net/108785464/jrrr.xml.bz2

To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

Looks good, I tested it and returns valid stuff, and good catch with the suspend.txt problem! Merging. 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-06-27 15:25:50 +0000
3+++ debian/changelog 2012-06-27 17:06:21 +0000
4@@ -12,6 +12,9 @@
5
6 [Marc Tardif]
7 * New version 0.14.1 for Quantal Quetzal development.
8+ * jobs/suspend.txt.in: Fixed trailing newline on otherwise empty line.
9+ * scripts/run_templates: Fixed calls to Popen to use universal_newlines
10+ to return strings instead of bytes (LP: #1018354)
11
12 [Daniel Manrique]
13 * Fixed duplicate suspend/bluetooth_obex_after_suspend job name.
14
15=== modified file 'jobs/suspend.txt.in'
16--- jobs/suspend.txt.in 2012-06-26 15:29:40 +0000
17+++ jobs/suspend.txt.in 2012-06-27 17:06:21 +0000
18@@ -83,7 +83,7 @@
19 3. If your system fails to wake at all and must be rebooted, restart System Testing after reboot and mark this test as Failed
20 VERIFICATION:
21 Did your system suspend and resume correctly?
22-
23+
24 plugin: shell
25 name: suspend/suspend_advanced_auto
26 depends: power-management/rtc
27
28=== modified file 'scripts/run_templates'
29--- scripts/run_templates 2012-06-06 16:34:06 +0000
30+++ scripts/run_templates 2012-06-27 17:06:21 +0000
31@@ -35,7 +35,8 @@
32 return env
33
34 def process(self, args, shell=False):
35- process = Popen(args, shell=shell, stdout=PIPE)
36+ process = Popen(
37+ args, shell=shell, stdout=PIPE, universal_newlines=True)
38 records = self.process_output(process.stdout)
39
40 for nr, record in enumerate(records):
41@@ -50,7 +51,8 @@
42
43 process = Popen(command,
44 env=env,
45- stdout=self.output)
46+ stdout=self.output,
47+ universal_newlines=True)
48 process.communicate()
49
50 def process_output(self, output):

Subscribers

People subscribed via source and target branches