Merge lp:~phablet-team/camera-app/fix-tests into lp:camera-app

[Ugo Riboni]

Fix failing capture test by using the correct target path

Fix failing capture test by using the correct target path

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:397
http://jenkins.qa.ubuntu.com/job/camera-app-ci/292/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/108
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/108/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/108
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/448
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3758
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/591
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/708
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13693
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3146
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4069
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4069/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'tests/autopilot/camera_app/tests/test_capture.py'
--- tests/autopilot/camera_app/tests/test_capture.py	2014-07-03 10:28:23 +0000
+++ tests/autopilot/camera_app/tests/test_capture.py	2014-09-24 17:17:36 +0000
@@ -35,7 +35,7 @@
     @unittest.skipIf(model() == 'Galaxy Nexus', 'Unusable with Mir on maguro')
     def test_take_picture(self):
         exposure_button = self.main_window.get_exposure_button()
-        pictures_dir = os.path.expanduser("~/Pictures/camera")
+        pictures_dir = os.path.expanduser("~/Pictures/com.ubuntu.camera")
 
         # Remove all pictures from pictures_dir that match our pattern
         files = [