Merge lp:~sylvain-pineau/checkbox/bug990133 into lp:checkbox

[Sylvain Pineau]

Added a 10s timeout to the camera still test (same behaviour as camera/display)

[Daniel Manrique (roadmr)]

Looks OK, thanks! merging...

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-05 08:54:38 +0000
+++ debian/changelog	2012-09-05 13:12:21 +0000
@@ -55,6 +55,10 @@
     since they were missed in the previous merge    
   * Attach the output of udev_resource, for debugging purposes (LP: #974271)
 
+  [Sylvain Pineau]
+  * scripts/camera_test, jobs/camera.txt.in: Added a 10s timeout to the camera
+    still test (LP: #990133)
+
   [Zygmunt Krynicki]
   * Fixed simple duplicate 'the' mistakes (LP: #1040022)
 

=== modified file 'jobs/camera.txt.in'
--- jobs/camera.txt.in	2012-08-14 19:07:46 +0000
+++ jobs/camera.txt.in	2012-09-05 13:12:21 +0000
@@ -33,7 +33,7 @@
  PURPOSE:
      This test will check that the built-in camera works
  STEPS:
-     1. Click on Test to display a still image from the camera
+     1. Click on Test to display a still image from the camera for ten seconds.
  VERIFICATION:
      Did you see the image?
 

=== modified file 'scripts/camera_test'
--- scripts/camera_test	2012-08-14 19:07:46 +0000
+++ scripts/camera_test	2012-09-05 13:12:21 +0000
@@ -271,7 +271,10 @@
             self._pipeline.set_state(Gst.State.NULL)
 
         if not quiet:
-            call(["eog", filename])
+            try:
+                call(["timeout", "-k", "11", "10", "eog", filename])
+            except CalledProcessError:
+                pass
 
     def _supported_resolutions_to_string(self, supported_resolutions):
         """