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

[Marc Tardif]

Merged fix to bug #1075625 by cr3.

This merge request fixes the submission process, so urgent attention would be much appreciated.

[Daniel Manrique (roadmr)]

Looks good, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-05 14:18:08 +0000
+++ debian/changelog	2012-11-06 16:47:18 +0000
@@ -56,6 +56,8 @@
     and simplified horizontal/vertical scrolling tests.
   * scripts/touchpad_scroll_resource, scripts/xinput_resource: Replaced
     the touchpad_scroll_resource by reusing the xinput_resource script.
+  * jobs/camera.txt.in: Piped output of multiple-resolution-images into
+    the ansi_parser script (LP: #1075625)
 
   [Sean Feole]
   * [FEATURE] jobs/optical.txt.in: modified existing automation test

=== modified file 'jobs/camera.txt.in'
--- jobs/camera.txt.in	2012-10-26 07:48:44 +0000
+++ jobs/camera.txt.in	2012-11-06 16:47:18 +0000
@@ -43,7 +43,7 @@
 requires:
  package.name == 'fswebcam' or package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
  device.category == 'CAPTURE'
-command: camera_test resolutions
+command: camera_test resolutions | ansi_parser
 _description:
   Takes multiple pictures based on the resolutions supported by the camera and
   validates their size and that they are of a valid format.