Merge lp:~om26er/camera-app/fix_autopilot_test_code into lp:camera-app

[Omer Akram]

fixes pyflakes and pep8 complaints in the autopilot code. Also improves the readability.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:231
http://jenkins.qa.ubuntu.com/job/camera-app-ci/150/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-i386-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/804
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/792
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/729
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/804
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/804/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/792
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/792/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3407
    SUCCESS: http://s-jenkins:8080/job/touch-flash-device/1495

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:232
http://jenkins.qa.ubuntu.com/job/camera-app-ci/152/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-i386-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1017
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1001
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/912
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1017
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1017/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1001
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1001/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3591
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1697

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

review: Approve (continuous-integration)

[Ugo Riboni (uriboni)]

Looks ok and passes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/camera-app-autolanding/95/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-amd64-autolanding/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-armhf-autolanding/5
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-armhf-autolanding/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-i386-autolanding/5
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1108/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1091/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/983/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1108
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1108/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1091
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1091/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3662/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1771

review: Needs Fixing (continuous-integration)

Unmerged revisions

232. By Omer Akram on 2013-11-22

fix conflicts, merge trunk

231. By Omer Akram on 2013-11-18

True in this case is actually a string not bool

230. By Omer Akram on 2013-11-18

bring docstring inside test cases instead of being outside

229. By Omer Akram on 2013-11-18

move the check to make sure app window have appeared on screen into a central place, instead of doing the same thing in each Class

228. By Omer Akram on 2013-11-18

fix pyflakes complaints

227. By Omer Akram on 2013-11-18

fix all pep8 complaints

=== modified file 'tests/autopilot/camera_app/emulators/main_window.py'
--- tests/autopilot/camera_app/emulators/main_window.py	2013-11-18 10:15:15 +0000
+++ tests/autopilot/camera_app/emulators/main_window.py	2013-11-22 11:05:37 +0000
@@ -4,7 +4,7 @@
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-import math
+
 
 class MainWindow(object):
     """An emulator class that makes it easy to interact with the camera-app."""
@@ -19,14 +19,19 @@
     def get_focus_ring(self):
         """Returns the focus ring of the camera"""
         return self.app.wait_select_single("FocusRing")
-      
+
     def get_exposure_button(self):
         """Returns the button that takes pictures"""
         return self.app.wait_select_single("ShootButton")
 
     def get_record_control(self):
-        """Returns the button that switches between photo and video recording"""
-        return self.app.wait_select_single("FadingButton", objectName="recordModeButton")
+        """Returns the button that switches between photo and video
+        recording.
+
+        """
+        return self.app.wait_select_single(
+            "FadingButton",
+            objectName="recordModeButton")
 
     def get_flash_button(self):
         """Returns the flash control button of the camera"""
@@ -46,15 +51,21 @@
 
     def get_zoom_slider_button(self):
         """Returns the zoom slider button"""
-        return self.app.wait_select_single("QQuickImage", objectName="sliderThumb")
+        return self.app.wait_select_single(
+            "QQuickImage",
+            objectName="sliderThumb")
 
     def get_zoom_plus(self):
         """Returns the zoom plus button"""
-        return self.app.wait_select_single("AbstractButton", objectName="zoomPlus")
+        return self.app.wait_select_single(
+            "AbstractButton",
+            objectName="zoomPlus")
 
     def get_zoom_minus(self):
         """Returns the zoom minus button"""
-        return self.app.wait_select_single("AbstractButton", objectName="zoomMinus")
+        return self.app.wait_select_single(
+            "AbstractButton",
+            objectName="zoomMinus")
 
     def get_viewfinder_geometry(self):
         """Returns the viewfinder geometry tracker"""
@@ -62,7 +73,9 @@
 
     def get_swap_camera_button(self):
         """Returns the button that switches between front and back cameras"""
-        return self.app.wait_select_single("CameraToolbarButton", objectName="swapButton")
+        return self.app.wait_select_single(
+            "CameraToolbarButton",
+            objectName="swapButton")
 
     def get_orientation(self):
         orientation = self.app.wait_select_single("DeviceOrientation")

=== modified file 'tests/autopilot/camera_app/tests/__init__.py'
--- tests/autopilot/camera_app/tests/__init__.py	2013-09-26 20:26:08 +0000
+++ tests/autopilot/camera_app/tests/__init__.py	2013-11-22 11:05:37 +0000
@@ -7,7 +7,6 @@
 
 """Camera-app autopilot tests."""
 
-from os import remove
 import os.path
 
 from autopilot.input import Mouse, Touch, Pointer
@@ -26,11 +25,9 @@
 
     """
     if model() == 'Desktop':
-        scenarios = [
-        ('with mouse', dict(input_device_class=Mouse))]
+        scenarios = [('with mouse', dict(input_device_class=Mouse))]
     else:
-        scenarios = [
-        ('with touch', dict(input_device_class=Touch))]
+        scenarios = [('with touch', dict(input_device_class=Touch))]
 
     local_location = "../../camera-app"
     deb_location = '/usr/bin/camera-app'
@@ -45,6 +42,9 @@
         else:
             self.launch_click_installed()
 
+        self.assertThat(
+            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
+
     def launch_test_local(self):
         self.app = self.launch_test_application(
             self.local_location)
@@ -57,7 +57,8 @@
             self.app = self.launch_test_application(
                 "camera-app",
                 "--fullscreen",
-                "--desktop_file_hint=/usr/share/applications/camera-app.desktop",
+                "--desktop_file_hint=/usr/share/applications/"
+                "camera-app.desktop",
                 app_type='qt')
 
     def launch_click_installed(self):

=== modified file 'tests/autopilot/camera_app/tests/test_capture.py'
--- tests/autopilot/camera_app/tests/test_capture.py	2013-11-18 13:34:43 +0000
+++ tests/autopilot/camera_app/tests/test_capture.py	2013-11-22 11:05:37 +0000
@@ -9,7 +9,7 @@
 
 from autopilot.matchers import Eventually
 from autopilot.platform import model
-from testtools.matchers import Equals, NotEquals, GreaterThan
+from testtools.matchers import Equals, NotEquals
 
 from camera_app.tests import CameraAppTestCase
 
@@ -22,25 +22,25 @@
 class TestCapture(CameraAppTestCase):
     """Tests the main camera features"""
 
-    """ This is needed to wait for the application to start.
-        In the testfarm, the application may take some time to show up."""
     def setUp(self):
         super(TestCapture, self).setUp()
-        self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
 
     def tearDown(self):
         super(TestCapture, self).tearDown()
 
-    """Test taking a picture"""
-    @unittest.skipIf(model() == 'Galaxy Nexus', 'Unusable with Mir enabled on maguro')
+    @unittest.skipIf(
+        model() == 'Galaxy Nexus',
+        'Unusable with Mir enabled on maguro')
     def test_take_picture(self):
-        toolbar = self.main_window.get_toolbar()
+        """Test taking a picture."""
         exposure_button = self.main_window.get_exposure_button()
         pictures_dir = path.expanduser("~/Pictures")
 
         # Remove all pictures from ~/Pictures that match our pattern
-        files = [f for f in os.listdir(pictures_dir) if f[0:5] == "image" and path.isfile(path.join(pictures_dir, f))]
+        files = [
+            f for f in os.listdir(pictures_dir) if f[0:5] == "image"
+            and path.isfile(path.join(pictures_dir, f))
+        ]
         for f in files:
             os.remove(path.join(pictures_dir, f))
 
@@ -56,7 +56,10 @@
         # is actually there
         one_picture_on_disk = False
         for i in range(0, 10):
-            files = [f for f in os.listdir(pictures_dir) if f[0:5] == "image" and path.isfile(path.join(pictures_dir, f))]
+            files = [
+                f for f in os.listdir(pictures_dir) if f[0:5] == "image"
+                and path.isfile(path.join(pictures_dir, f))
+            ]
             if len(files) == 1:
                 one_picture_on_disk = True
                 break
@@ -66,13 +69,13 @@
         # check that the camera is able to capture another photo
         self.assertThat(exposure_button.enabled, Eventually(Equals(True)))
 
-    """Tests clicking on the record control and checks if the flash changes
-    to torch off mode and the recording time appears"""
     @unittest.skip('Video recording not working for V1.0')
     def test_record_video(self):
+        """Tests clicking on the record control and checks if the flash changes
+        to torch off mode and the recording time appears.
+
+        """
         # Get all the elements
-        camera_window = self.main_window.get_camera()
-        toolbar = self.main_window.get_toolbar()
         record_control = self.main_window.get_record_control()
         flash_button = self.main_window.get_flash_button()
         stop_watch = self.main_window.get_stop_watch()
@@ -138,10 +141,12 @@
         self.assertThat(
             flash_button.torchMode, Eventually(Equals(torchmode_old_state)))
 
-    """Test that the shoot button gets disabled for a while then re-enabled
-    after shooting"""
     @unittest.skip("Disabled this test due race condition see bug 1227373")
     def test_shoot_button_disable(self):
+        """Test that the shoot button gets disabled for a while then re-enabled
+        after shooting.
+
+        """
         exposure_button = self.main_window.get_exposure_button()
 
         # The focus ring should be invisible in the beginning

=== modified file 'tests/autopilot/camera_app/tests/test_flash.py'
--- tests/autopilot/camera_app/tests/test_flash.py	2013-11-18 13:34:43 +0000
+++ tests/autopilot/camera_app/tests/test_flash.py	2013-11-22 11:05:37 +0000
@@ -12,25 +12,20 @@
 
 from camera_app.tests import CameraAppTestCase
 
-import time
 import unittest
 
 
 class TestCameraFlash(CameraAppTestCase):
     """Tests the flash"""
 
-    """ This is needed to wait for the application to start.
-        In the testfarm, the application may take some time to show up."""
     def setUp(self):
         super(TestCameraFlash, self).setUp()
-        self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
 
     def tearDown(self):
         super(TestCameraFlash, self).tearDown()
 
-    """Test that flash modes cycle properly"""
     def test_cycle_flash(self):
+        """Test that flash modes cycle properly."""
         flash_button = self.main_window.get_flash_button()
 
         #ensure initial state
@@ -51,9 +46,9 @@
         self.assertThat(flash_button.flashState, Eventually(Equals("off")))
         self.assertThat(flash_button.torchMode, Equals(False))
 
-    """Test that torch modes cycles properly"""
     @unittest.skip('Video recording not working for V1.0')
     def test_cycle_torch(self):
+        """Test that torch modes cycles properly."""
         flash_button = self.main_window.get_flash_button()
         record_button = self.main_window.get_record_control()
         self.pointing_device.click_object(record_button)
@@ -72,10 +67,12 @@
         self.assertThat(flash_button.flashState, Eventually(Equals("off")))
         self.assertThat(flash_button.torchMode, Equals(True))
 
-    """When switching between video and picture the previous flash state
-       should be preserved"""
     @unittest.skip('Video recording not working for V1.0')
     def test_remember_state(self):
+        """When switching between video and picture the previous flash state
+        should be preserved.
+
+        """
         flash_button = self.main_window.get_flash_button()
         record_button = self.main_window.get_record_control()
         initial_flash_state = flash_button.flashState
@@ -85,7 +82,9 @@
         self.pointing_device.move_to_object(flash_button)
         self.pointing_device.click()
         self.assertThat(
-            flash_button.flashState, Eventually(NotEquals(initial_flash_state)))
+            flash_button.flashState,
+            Eventually(NotEquals(initial_flash_state))
+        )
         second_flash_state = flash_button.flashState
         self.pointing_device.click()
         self.assertThat(

=== modified file 'tests/autopilot/camera_app/tests/test_focus.py'
--- tests/autopilot/camera_app/tests/test_focus.py	2013-11-18 14:18:52 +0000
+++ tests/autopilot/camera_app/tests/test_focus.py	2013-11-22 11:05:37 +0000
@@ -9,31 +9,28 @@
 
 from autopilot.matchers import Eventually
 from autopilot.platform import model
-from testtools.matchers import Equals, NotEquals, GreaterThan
+from testtools.matchers import Equals, GreaterThan
 from camera_app.tests import CameraAppTestCase
 
 import unittest
-import time
 
 
 class TestFocus(CameraAppTestCase):
     """Tests the focus"""
 
-    """ This is needed to wait for the application to start.
-        In the testfarm, the application may take some time to show up."""
     def setUp(self):
         super(TestFocus, self).setUp()
-        self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
 
     def tearDown(self):
         super(TestFocus, self).tearDown()
 
-    """Test focusing in an area where we know the picture is"""
-    @unittest.skipIf(model() == 'Galaxy Nexus', 'Unusable with Mir enabled on maguro')
+    @unittest.skipIf(
+        model() == 'Galaxy Nexus',
+        'Unusable with Mir enabled on maguro'
+    )
     def test_focus_valid_and_disappear(self):
+        """Test focusing in an area where we know the picture is."""
         focus_ring = self.main_window.get_focus_ring()
-        toolbar = self.main_window.get_toolbar()
         feed = self.main_window.get_viewfinder_geometry()
         switch_cameras = self.main_window.get_swap_camera_button()
         exposure_button = self.main_window.get_exposure_button()
@@ -60,7 +57,10 @@
         self.assertThat(exposure_button.enabled, Eventually(Equals(True)))
 
         # Click in the center of the viewfinder area
-        click_coords =[feed.globalRect[2] // 2 + feed.globalRect[0], feed.globalRect[3] // 2 + feed.globalRect[1]]
+        click_coords = [
+            feed.globalRect[2] // 2 + feed.globalRect[0],
+            feed.globalRect[3] // 2 + feed.globalRect[1]
+        ]
         self.pointing_device.move(click_coords[0], click_coords[1])
         self.pointing_device.click()
 
@@ -73,10 +73,15 @@
         # After some seconds the focus ring should fade out
         self.assertThat(focus_ring.opacity, Eventually(Equals(0.0)))
 
-    @unittest.skipIf(model() == 'Galaxy Nexus', 'Unusable with Mir enabled on maguro')
+    @unittest.skipIf(
+        model() == 'Galaxy Nexus',
+        'Unusable with Mir enabled on maguro'
+    )
     def test_focus_invalid(self):
         """Tests clicking outside of the viewfinder image area, where it should
-        not focus."""
+        not focus.
+
+        """
         toolbar = self.main_window.get_toolbar()
         zoom = self.main_window.get_zoom_control()
         feed = self.main_window.get_viewfinder_geometry()
@@ -98,8 +103,8 @@
 
         # Check if there's a gap between the viewfinder feed and the zoom
         # control. If there is, test that focusing there won't show the focus
-        #ring.
-        if zoom.y > feed.height: # Feed is aligned to the top of the window
+        # ring.
+        if zoom.y > feed.height:  # Feed is aligned to the top of the window
             x, y, h, w = zoom.globalRect
             click_coords = [x + (h / 2), y - 2]
             self.pointing_device.move(click_coords[0], click_coords[1])
@@ -119,9 +124,12 @@
             self.pointing_device.click()
         self.assertThat(focus_ring.opacity, Eventually(Equals(0.0)))
 
-    """Tests dragging the focus ring"""
-    @unittest.skipIf(model() == 'Galaxy Nexus', 'Unusable with Mir enabled on maguro')
+    @unittest.skipIf(
+        model() == 'Galaxy Nexus',
+        'Unusable with Mir enabled on maguro'
+    )
     def test_move_focus_ring(self):
+        """Tests dragging the focus ring."""
         focus_ring = self.main_window.get_focus_ring()
         feed = self.main_window.get_viewfinder_geometry()
         switch_cameras = self.main_window.get_swap_camera_button()

=== modified file 'tests/autopilot/camera_app/tests/test_zoom.py'
--- tests/autopilot/camera_app/tests/test_zoom.py	2013-11-18 13:34:43 +0000
+++ tests/autopilot/camera_app/tests/test_zoom.py	2013-11-22 11:05:37 +0000
@@ -12,25 +12,20 @@
 
 from camera_app.tests import CameraAppTestCase
 
-import time
 import unittest
 
 
 class TestCameraZoom(CameraAppTestCase):
-    """Tests the main camera features"""
+    """ Tests the main camera features. """
 
-    """ This is needed to wait for the application to start.
-        In the testfarm, the application may take some time to show up."""
     def setUp(self):
         super(TestCameraZoom, self).setUp()
-        self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
 
     def tearDown(self):
         super(TestCameraZoom, self).tearDown()
 
-    """Tests the zoom slider"""
     def test_slider(self):
+        """Tests the zoom slider."""
         zoom_control = self.main_window.get_zoom_control()
         zoom_button = self.main_window.get_zoom_slider_button()
 
@@ -106,7 +101,9 @@
         self.pointing_device.move_to_object(minus)
         self.pointing_device.click()
         self.assertThat(
-            zoom_control.value, Eventually(NotEquals(zoom_control.maximumValue)))
+            zoom_control.value,
+            Eventually(NotEquals(zoom_control.maximumValue))
+        )
 
         value_before_plus = zoom_control.value
 
@@ -115,7 +112,8 @@
         self.assertThat(
             zoom_control.value, Eventually(GreaterThan(value_before_plus)))
 
-        # Test that keeping the minus button pressed eventually reaches min zoom
+        # Test that keeping the minus button pressed eventually reaches
+        # min zoom.
         self.pointing_device.move_to_object(minus)
         self.pointing_device.press()
         self.assertThat(zoom_control.value, Eventually(Equals(1.0)))