Checkbox

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

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

Description of the change

Really basic typo probably introduced in the Python3 conversion of this script. args.program was args,program

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

Thanks for catching this early!

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-21 19:10:08 +0000
3+++ debian/changelog 2012-06-22 07:17:25 +0000
4@@ -20,6 +20,8 @@
5 check the return code is success instead (LP: #1013537)
6 * base64 encode the after suspend screenshot attachement so that it can
7 be uploaded properly (LP: #1016126)
8+ * Fixed simple type in xorg_memory_test, introduced by Python3
9+ conversion (LP: #1016387)
10
11
12 [Marc Tardif]
13
14=== modified file 'scripts/xorg_memory_test'
15--- scripts/xorg_memory_test 2012-06-19 18:28:47 +0000
16+++ scripts/xorg_memory_test 2012-06-22 07:17:25 +0000
17@@ -112,7 +112,7 @@
18 begin_gem_obj = get_gem_objects()
19
20 #Open windows and let the system come upto speed
21- pids = start_processes(args,program, args.processes)
22+ pids = start_processes(args.program, args.processes)
23 time.sleep(args.sleep)
24
25 #Close windows

Subscribers

People subscribed via source and target branches