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

[Ugo Riboni]

Fix some failing tests (that were failing for real test bugs, not due to infrastructure problems).

Fix some failing tests (that were failing for real test bugs, not due to infrastructure problems)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:513
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~phablet-team/camera-app/fix-failing-tests/+merge/250054/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/camera-app-ci/387/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/83/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/83/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/83/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/151
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/629/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/785
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/339
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18132
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/739/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:513
http://jenkins.qa.ubuntu.com/job/camera-app-ci/388/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/84/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/84/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/84/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/152
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/630/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/786
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/340
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18133
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/740/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'tests/autopilot/camera_app/tests/test_flash.py'
--- tests/autopilot/camera_app/tests/test_flash.py	2014-12-17 16:29:11 +0000
+++ tests/autopilot/camera_app/tests/test_flash.py	2015-02-17 19:00:33 +0000
@@ -28,35 +28,37 @@
     def tearDown(self):
         super(TestCameraFlash, self).tearDown()
 
-    """Test that flash modes cycle properly"""
+    """Test that flash modes activate properly"""
     def test_cycle_flash(self):
         bottom_edge = self.main_window.get_bottom_edge()
         bottom_edge.open()
         flash_button = self.main_window.get_flash_button()
         option_value_selector = self.main_window.get_option_value_selector()
 
-        # ensure initial state
+        # open option value selector showing the possible values
+        self.pointing_device.move_to_object(flash_button)
+        self.pointing_device.click()
+        self.assertThat(option_value_selector.visible,
+                        Eventually(Equals(True)))
+
+        # set flash to "on"
+        option = self.main_window.get_option_value_button("On")
+        self.pointing_device.move_to_object(option)
+        self.pointing_device.click()
+        self.assertThat(flash_button.iconName, Equals("flash-on"))
+
+        # set flash to "off"
+        option = self.main_window.get_option_value_button("Off")
+        self.pointing_device.move_to_object(option)
+        self.pointing_device.click()
+        self.assertThat(flash_button.iconName, Equals("flash-off"))
+
+        # set flash to "auto"
+        option = self.main_window.get_option_value_button("Auto")
+        self.pointing_device.move_to_object(option)
+        self.pointing_device.click()
         self.assertThat(flash_button.iconName, Equals("flash-auto"))
 
-        # open option value selector showing the possible values
-        self.pointing_device.move_to_object(flash_button)
-        self.pointing_device.click()
-
-        self.assertThat(option_value_selector.visible,
-                        Eventually(Equals(True)))
-
-        # set flash to "on"
-        option = self.main_window.get_option_value_button("On")
-
-        self.pointing_device.click()
-        self.assertThat(flash_button.iconName, Equals("flash-on"))
-
-        # set flash to "off"
-        option = self.main_window.get_option_value_button("Off")
-        self.pointing_device.move_to_object(option)
-        self.pointing_device.click()
-        self.assertThat(flash_button.iconName, Equals("flash-off"))
-
     """Test that video flash modes cycles properly"""
     def test_cycle_video_flash(self):
         # Click the record button to toggle photo/video mode

=== modified file 'tests/autopilot/camera_app/tests/test_gallery_view.py'
--- tests/autopilot/camera_app/tests/test_gallery_view.py	2015-01-24 18:49:15 +0000
+++ tests/autopilot/camera_app/tests/test_gallery_view.py	2015-02-17 19:00:33 +0000
@@ -55,11 +55,15 @@
     def delete_all_media(self):
         picture_files = os.listdir(self.pictures_dir)
         for f in picture_files:
-            os.remove(os.path.join(self.pictures_dir, f))
+            f = os.path.join(self.pictures_dir, f)
+            if os.path.isfile(f):
+                os.remove(f)
 
         video_files = os.listdir(self.videos_dir)
         for f in video_files:
-            os.remove(os.path.join(self.videos_dir, f))
+            f = os.path.join(self.videos_dir, f)
+            if os.path.isfile(f):
+                os.remove(f)
 
     def add_sample_photo(self):
         self.main_window.swipe_to_viewfinder(self)