Merge lp:~fboucault/camera-app/test_picture_quality_robust into lp:camera-app/staging

[Florian Boucault]

Make test_capture.TestCapture.test_picture_quality_setting robust by selecting only pictures.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:666
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/54/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/54/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/54/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/54/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/433
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/1036
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28036

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/54/rebuild

review: Needs Fixing (continuous-integration)

[Ugo Riboni (uriboni)]

Look good and tests are ok

review: Approve

=== modified file 'tests/autopilot/camera_app/tests/test_capture.py'
--- tests/autopilot/camera_app/tests/test_capture.py	2016-03-07 14:50:18 +0000
+++ tests/autopilot/camera_app/tests/test_capture.py	2016-03-15 20:50:39 +0000
@@ -17,6 +17,7 @@
 import unittest
 import time
 import os
+import glob
 
 
 class TestCapture(CameraAppTestCase):
@@ -264,7 +265,7 @@
     def get_first_picture(self, timeout=10):
         pictures = []
         for i in range(0, timeout):
-            pictures = os.listdir(self.pictures_dir)
+            pictures = glob.glob(os.path.join(self.pictures_dir, "*.jpg"))
             if len(pictures) != 0:
                 break
             time.sleep(1)