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

[Brendan Donegan]

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

[Marc Tardif (cr3)]

Thanks for catching this early!

review: Approve

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