Merge lp:~canonical-platform-qa/camera-app/use_app_for_pointing_device into lp:camera-app

[Brendan Donegan]

Use app proxy instead of testCase for the pointing_device in MainWindow swipe_ functions

A couple of the functions in the MainWindow class oddly assume that the AutopilotTestCase has a pointing_device member. This is not necessarily the case but the app proxy is sure to have one, and the MainWindow class already stores the app proxy in self.app so we should really use that instead of the testCase to provide the pointing device

[Leo Arias (elopio)]

lgtm.
A future improvement is to make the MainWindow a custom proxy object, then there will be no need to save the app proxy as an instance var.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:514
http://jenkins.qa.ubuntu.com/job/camera-app-ci/391/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/87/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/87/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/87/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/155/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/634/console
    ABORTED: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/789/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/344
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18164
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/744/console

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

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

The mako job failed due to a device having failed. The -ci job as been restarted.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:514
http://jenkins.qa.ubuntu.com/job/camera-app-ci/392/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/88/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/88/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/88/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/157
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/637/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/791
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/350
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18205
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/749/console

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

review: Needs Fixing (continuous-integration)

[lp:~canonical-platform-qa/camera-app/use_app_for_pointing_device]

515. By Leo Arias on 2015-05-15

Merged with prerequisite.

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2015-03-12 22:20:24 +0000
+++ debian/control	2015-05-15 07:40:54 +0000
@@ -9,6 +9,7 @@
                libgles2-mesa-dev | libgles2-dev,
                pkg-config,
                python3:any,
+               python3-flake8,
                qtbase5-dev,
                qtdeclarative5-dev,
                qtdeclarative5-qtquick2-plugin,

=== modified file 'debian/rules'
--- debian/rules	2013-06-11 16:05:35 +0000
+++ debian/rules	2015-05-15 07:40:54 +0000
@@ -8,6 +8,10 @@
 %:
 	dh $@ --parallel --with translations
 
+override_dh_auto_test:
+	python3 -m flake8 .
+	dh_auto_test
+
 override_dh_install:
 	dh_install --fail-missing
 

=== modified file 'tests/autopilot/camera_app/emulators/main_window.py'
--- tests/autopilot/camera_app/emulators/main_window.py	2015-03-10 16:14:20 +0000
+++ tests/autopilot/camera_app/emulators/main_window.py	2015-05-15 07:40:54 +0000
@@ -1,12 +1,10 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2014 Canonical
+# Copyright 2014, 2015 Canonical
 #
 # 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 sys
-
 from camera_app.emulators.panel import Panel
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
@@ -47,7 +45,8 @@
         return self.app.wait_select_single("ShootButton")
 
     def get_photo_roll_hint(self):
-        """Returns the layer that serves at hinting to the existence of the photo roll"""
+        """Returns the layer that serves at hinting to the existence of the
+        photo roll"""
         return self.app.wait_select_single("PhotoRollHint")
 
     def get_record_control(self):
@@ -143,7 +142,7 @@
         tx = x + (w // 2)
         ty = y + (h // 2)
 
-        testCase.pointing_device.drag(tx, ty, x, ty, rate=1)
+        self.app.pointing_device.drag(tx, ty, x, ty, rate=1)
         viewfinder = self.get_viewfinder()
         testCase.assertThat(viewfinder.inView, Eventually(Equals(False)))
 
@@ -154,6 +153,7 @@
         tx = x + (w // 2)
         ty = y + (h // 2)
 
-        testCase.pointing_device.drag(tx, ty, (tx + main_view.width // 2), ty, rate=1)
+        self.app.pointing_device.drag(
+            tx, ty, (tx + main_view.width // 2), ty, rate=1)
         viewfinder = self.get_viewfinder()
         testCase.assertThat(viewfinder.inView, Eventually(Equals(True)))

=== modified file 'tests/autopilot/camera_app/emulators/panel.py'
--- tests/autopilot/camera_app/emulators/panel.py	2015-04-28 15:45:33 +0000
+++ tests/autopilot/camera_app/emulators/panel.py	2015-05-15 07:40:54 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2014 Canonical
+# Copyright 2014, 2015 Canonical
 #
 # 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
@@ -39,7 +39,8 @@
         start_y = y + self.height - 1
         stop_y = y
 
-        self.pointing_device.drag(line_x, start_y, line_x, stop_y, rate=sys.maxsize)
+        self.pointing_device.drag(
+            line_x, start_y, line_x, stop_y, rate=sys.maxsize)
 
     @autopilot_logging.log_action(logger.info)
     def close(self):
@@ -56,4 +57,5 @@
         start_y = y
         stop_y = y + self.height - 1
 
-        self.pointing_device.drag(line_x, start_y, line_x, stop_y, rate=sys.maxsize)
+        self.pointing_device.drag(
+            line_x, start_y, line_x, stop_y, rate=sys.maxsize)

=== modified file 'tests/autopilot/camera_app/tests/__init__.py'
--- tests/autopilot/camera_app/tests/__init__.py	2015-05-14 15:10:19 +0000
+++ tests/autopilot/camera_app/tests/__init__.py	2015-05-15 07:40:54 +0000
@@ -10,15 +10,12 @@
 import os
 import time
 import shutil
-from time import sleep
 from pkg_resources import resource_filename
 
 import ubuntuuitoolkit
 from autopilot.input import Mouse, Touch, Pointer
 from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
-from autopilot.matchers import Eventually
-from testtools.matchers import Equals
 
 from camera_app.emulators.main_window import MainWindow
 
@@ -94,10 +91,10 @@
 
     def delete_all_media(self):
         if os.path.exists(self.pictures_dir):
-            delete_all_files_in_directory(self.pictures_dir)
+            self.delete_all_files_in_directory(self.pictures_dir)
 
         if os.path.exists(self.videos_dir):
-            delete_all_files_in_directory(self.videos_dir)
+            self.delete_all_files_in_directory(self.videos_dir)
 
     def delete_all_files_in_directory(self, directory):
         files = os.listdir(directory)

=== modified file 'tests/autopilot/camera_app/tests/test_capture.py'
--- tests/autopilot/camera_app/tests/test_capture.py	2015-03-10 14:22:52 +0000
+++ tests/autopilot/camera_app/tests/test_capture.py	2015-05-15 07:40:54 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2012 Canonical
+# Copyright 2012, 2015 Canonical
 #
 # 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
@@ -8,7 +8,6 @@
 """Tests for the Camera App"""
 
 from autopilot.matchers import Eventually
-from autopilot.platform import model
 from testtools.matchers import Equals, NotEquals
 from wand.image import Image
 from MediaInfoDLL3 import MediaInfo, Stream
@@ -26,8 +25,10 @@
     """ 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):
-        # Remove configuration file where knowledge of the photo roll hint's necessity is stored
-        config_file = os.path.expanduser("~/.config/com.ubuntu.camera/com.ubuntu.camera.conf")
+        # Remove configuration file where knowledge of the photo roll hint's
+        # necessity is stored
+        config_file = os.path.expanduser(
+            "~/.config/com.ubuntu.camera/com.ubuntu.camera.conf")
         if os.path.exists(config_file):
             os.remove(config_file)
 
@@ -82,8 +83,12 @@
         # 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 recording time appears"""
     def test_record_video(self):
+        """Test clicking on the record control.
+
+        Check if the recording time appears.
+
+        """
         # Get all the elements
         record_control = self.main_window.get_record_control()
         stop_watch = self.main_window.get_stop_watch()
@@ -164,10 +169,10 @@
         # Check that the photo roll hint is hidden
         self.assertEquals(hint.visible, False)
 
-    """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
@@ -186,8 +191,7 @@
     def test_picture_quality_setting(self):
         qualities = [("Basic Quality", 60),
                      ("Normal Quality", 80),
-                     ("Fine Quality", 95)
-                    ]
+                     ("Fine Quality", 95)]
         for quality, expectedCompression in qualities:
             self.delete_all_photos()
             self.set_compression_quality(quality)
@@ -244,12 +248,15 @@
         bottom_edge = self.main_window.get_bottom_edge()
         bottom_edge.open()
 
-        # open encoding quality option value selector showing the possible values
-        encoding_quality_button = self.main_window.get_encoding_quality_button()
+        # open encoding quality option value selector showing the possible
+        # values
+        encoding_quality_button = (
+            self.main_window.get_encoding_quality_button())
         self.pointing_device.move_to_object(encoding_quality_button)
         self.pointing_device.click()
         option_value_selector = self.main_window.get_option_value_selector()
-        self.assertThat(option_value_selector.visible, Eventually(Equals(True)))
+        self.assertThat(
+            option_value_selector.visible, Eventually(Equals(True)))
 
         # tap on chosen compression quality option
         option = self.main_window.get_option_value_button(quality)
@@ -281,7 +288,8 @@
         self.record_video(2)
         video_file = self.get_first_video()
         height = self.read_video_height(video_file)
-        expected_height = self.height_from_resolution_label(expected_resolution)
+        expected_height = self.height_from_resolution_label(
+            expected_resolution)
         self.assertThat(height, Equals(expected_height))
 
     def switch_cameras(self):
@@ -303,7 +311,8 @@
             self.record_video(2)
             video_file = self.get_first_video()
             height = self.read_video_height(video_file)
-            expected_height = self.height_from_resolution_label(resolution_label)
+            expected_height = self.height_from_resolution_label(
+                resolution_label)
             self.assertThat(height, Equals(expected_height))
             self.dismiss_first_photo_hint()
 
@@ -322,12 +331,15 @@
         bottom_edge = self.main_window.get_bottom_edge()
         bottom_edge.open()
 
-        # open video resolution option value selector showing the possible values
-        video_resolution_button = self.main_window.get_video_resolution_button()
+        # open video resolution option value selector showing the possible
+        # values
+        video_resolution_button = (
+            self.main_window.get_video_resolution_button())
         self.pointing_device.move_to_object(video_resolution_button)
         self.pointing_device.click()
         option_value_selector = self.main_window.get_option_value_selector()
-        self.assertThat(option_value_selector.visible, Eventually(Equals(True)))
+        self.assertThat(
+            option_value_selector.visible, Eventually(Equals(True)))
         optionButtons = option_value_selector.select_many("OptionValueButton")
         resolutions = [button.label for button in optionButtons]
 
@@ -344,12 +356,15 @@
         bottom_edge = self.main_window.get_bottom_edge()
         bottom_edge.open()
 
-        # open video resolution option value selector showing the possible values
-        video_resolution_button = self.main_window.get_video_resolution_button()
+        # open video resolution option value selector showing the possible
+        # values
+        video_resolution_button = (
+            self.main_window.get_video_resolution_button())
         self.pointing_device.move_to_object(video_resolution_button)
         self.pointing_device.click()
         option_value_selector = self.main_window.get_option_value_selector()
-        self.assertThat(option_value_selector.visible, Eventually(Equals(True)))
+        self.assertThat(
+            option_value_selector.visible, Eventually(Equals(True)))
 
         # tap on chosen video resolution option
         option = self.main_window.get_option_value_button(resolution_label)

=== modified file 'tests/autopilot/camera_app/tests/test_diskspace.py'
--- tests/autopilot/camera_app/tests/test_diskspace.py	2015-01-24 22:26:48 +0000
+++ tests/autopilot/camera_app/tests/test_diskspace.py	2015-05-15 07:40:54 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2012 Canonical
+# Copyright 2012, 2015 Canonical
 #
 # 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
@@ -12,7 +12,6 @@
 
 from camera_app.tests import CameraAppTestCase
 
-import unittest
 import os.path
 import os
 from ctypes import CDLL, c_longlong as ll
@@ -21,13 +20,12 @@
 LOW_THRESHOLD = 200 * MEGABYTE
 CRITICAL_THRESHOLD = 50 * MEGABYTE
 
+
 class TestCameraDiskSpace(CameraAppTestCase):
     """Tests low disk space situations"""
 
     def diskSpaceAvailable(self):
         """Check the amount of free disk space"""
-
-
         stats = os.statvfs(os.path.expanduser(self.videoPath))
         return stats.f_bavail * stats.f_frsize
 
@@ -36,9 +34,11 @@
 
         # Take into account the currently existing filler file, if any, as we
         # will be overwriting it to the new size.
-        fillerSize = (self.diskSpaceAvailable() + self.currentFillerSize) - size
+        fillerSize = (
+            self.diskSpaceAvailable() + self.currentFillerSize) - size
         fd = open(self.diskFiller, "w")
-        ret = CDLL("libc.so.6").posix_fallocate64(fd.fileno(), ll(0), ll(fillerSize))
+        ret = CDLL("libc.so.6").posix_fallocate64(
+            fd.fileno(), ll(0), ll(fillerSize))
         self.assertThat(ret, Equals(0))
         self.currentFillerSize = fillerSize
 
@@ -53,11 +53,12 @@
         self.diskFiller = os.path.join(self.videoPath, "filler")
         self.currentFillerSize = 0
 
-        # remove the filler file before starting, in case a previous test crashed
+        # remove the filler file before starting, in case a previous test
+        # crashed
         os.remove(self.diskFiller) if os.path.exists(self.diskFiller) else None
 
-        # we can't start tests when the disk space is already below the threshold
-        # as they all expect a normal situation at the start
+        # we can't start tests when the disk space is already below the
+        # threshold as they all expect a normal situation at the start
         self.assertThat(self.diskSpaceAvailable(), GreaterThan(LOW_THRESHOLD))
 
         self.assertThat(
@@ -68,7 +69,8 @@
         os.remove(self.diskFiller) if os.path.exists(self.diskFiller) else None
 
     def test_critically_low_disk(self):
-        """Verify proper behavior when disk space becomes critically low and back"""
+        """Verify proper behavior when disk space becomes critically low and
+        back"""
 
         exposure_button = self.main_window.get_exposure_button()
         no_space_hint = self.main_window.get_no_space_hint()
@@ -77,22 +79,23 @@
         self.assertThat(no_space_hint.visible, Equals(False))
 
         self.setFreeSpaceTo(CRITICAL_THRESHOLD - MEGABYTE)
-        self.assertThat(self.diskSpaceAvailable(), LessThan(CRITICAL_THRESHOLD))
+        self.assertThat(
+            self.diskSpaceAvailable(), LessThan(CRITICAL_THRESHOLD))
 
         self.assertThat(exposure_button.enabled, Eventually(Equals(False)))
         self.assertThat(no_space_hint.visible, Eventually(Equals(True)))
 
         self.setFreeSpaceTo(CRITICAL_THRESHOLD + MEGABYTE)
-        self.assertThat(self.diskSpaceAvailable(), GreaterThan(CRITICAL_THRESHOLD))
+        self.assertThat(
+            self.diskSpaceAvailable(), GreaterThan(CRITICAL_THRESHOLD))
 
         self.assertThat(exposure_button.enabled, Equals(True))
         self.assertThat(no_space_hint.visible, Equals(False))
 
     def test_low_disk(self):
         """Verify proper behavior when disk space becomes low"""
-
-        exposure_button = self.main_window.get_exposure_button()
-        no_space_hint = self.main_window.get_no_space_hint()
+        self.main_window.get_exposure_button()
+        self.main_window.get_no_space_hint()
         dialog = self.main_window.get_low_space_dialog()
         self.assertThat(dialog, Equals(None))
 
@@ -109,7 +112,8 @@
         stop_watch = self.main_window.get_stop_watch()
         exposure_button = self.main_window.get_exposure_button()
 
-        # Click the record button to toggle photo/video mode then start recording
+        # Click the record button to toggle photo/video mode then start
+        # recording
         self.pointing_device.move_to_object(record_control)
         self.pointing_device.click()
         self.pointing_device.move_to_object(exposure_button)
@@ -121,5 +125,6 @@
 
         # Now reduce the space to critically low, then see if recording stops
         self.setFreeSpaceTo(CRITICAL_THRESHOLD - MEGABYTE)
-        self.assertThat(self.diskSpaceAvailable(), LessThan(CRITICAL_THRESHOLD))
+        self.assertThat(
+            self.diskSpaceAvailable(), LessThan(CRITICAL_THRESHOLD))
         self.assertThat(stop_watch.opacity, Eventually(Equals(0.0)))

=== modified file 'tests/autopilot/camera_app/tests/test_flash.py'
--- tests/autopilot/camera_app/tests/test_flash.py	2015-02-17 18:04:01 +0000
+++ tests/autopilot/camera_app/tests/test_flash.py	2015-05-15 07:40:54 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2012 Canonical
+# Copyright 2012, 2015 Canonical
 #
 # 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
@@ -7,13 +7,11 @@
 
 """Tests for the Camera App flash"""
 
-from testtools.matchers import Equals, NotEquals
+from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 
 from camera_app.tests import CameraAppTestCase
 
-import unittest
-
 
 class TestCameraFlash(CameraAppTestCase):
     """Tests the flash"""
@@ -104,7 +102,8 @@
         # 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)))
+        self.assertThat(
+            option_value_selector.visible, Eventually(Equals(True)))
 
         # set flash to "on"
         option = self.main_window.get_option_value_button("On")
@@ -115,9 +114,11 @@
         # closes the flash options menu and open the hdr options menu
         self.pointing_device.move_to_object(hdr_button)
         self.pointing_device.click()
-        self.assertThat(option_value_selector.visible, Eventually(Equals(False)))
+        self.assertThat(
+            option_value_selector.visible, Eventually(Equals(False)))
         self.pointing_device.click()
-        self.assertThat(option_value_selector.visible, Eventually(Equals(True)))
+        self.assertThat(
+            option_value_selector.visible, Eventually(Equals(True)))
 
         # set hdr to "on" and verify that flash is "off"
         option = self.main_window.get_option_value_button("On")
@@ -129,9 +130,11 @@
         # closes the hdr options menu and open the flash options menu
         self.pointing_device.move_to_object(flash_button)
         self.pointing_device.click()
-        self.assertThat(option_value_selector.visible, Eventually(Equals(False)))
+        self.assertThat(
+            option_value_selector.visible, Eventually(Equals(False)))
         self.pointing_device.click()
-        self.assertThat(option_value_selector.visible, Eventually(Equals(True)))
+        self.assertThat(
+            option_value_selector.visible, Eventually(Equals(True)))
 
         # set flash to "on" and verify that hdr is "off"
         option = self.main_window.get_option_value_button("On")

=== modified file 'tests/autopilot/camera_app/tests/test_focus.py'
--- tests/autopilot/camera_app/tests/test_focus.py	2014-06-30 07:57:09 +0000
+++ tests/autopilot/camera_app/tests/test_focus.py	2015-05-15 07:40:54 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2012 Canonical
+# Copyright 2012, 2015 Canonical
 #
 # 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
@@ -45,7 +45,7 @@
 
         # The focus ring sould be visible and centered to the mouse click
         # coords now
-        focus_ring_center = self.get_center(focus_ring)
+        # focus_ring_center = self.get_center(focus_ring)
         self.assertThat(focus_ring.opacity, Eventually(GreaterThan(0.5)))
 #        self.assertEquals(focus_ring_center, click_coords)
 
@@ -65,7 +65,7 @@
 
         # The focus ring sould be visible and centered to the mouse
         # click coords now
-        focus_ring_center = self.get_center(focus_ring)
+        # focus_ring_center = self.get_center(focus_ring)
         self.assertThat(focus_ring.opacity, Eventually(GreaterThan(0.5)))
 #        self.assertEquals(focus_ring_center, click_coords)
 

=== modified file 'tests/autopilot/camera_app/tests/test_gallery_view.py'
--- tests/autopilot/camera_app/tests/test_gallery_view.py	2015-03-10 16:33:24 +0000
+++ tests/autopilot/camera_app/tests/test_gallery_view.py	2015-05-15 07:40:54 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2014 Canonical
+# Copyright 2014, 2015 Canonical
 #
 # 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
@@ -7,15 +7,14 @@
 
 """Tests for the Camera App zoom"""
 
-from testtools.matchers import Equals, NotEquals, GreaterThan, LessThan
+from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 
 from camera_app.tests import CameraAppTestCase
 
-import unittest
-import os
 from time import sleep
 
+
 class TestCameraGalleryViewMixin(object):
     def move_from_slideshow_to_photogrid(self):
         gallery = self.main_window.get_gallery()
@@ -47,6 +46,7 @@
         sleep(1)
         self.pointing_device.release()
 
+
 class TestCameraGalleryView(CameraAppTestCase, TestCameraGalleryViewMixin):
     """Tests the camera gallery view without media already present"""
 
@@ -104,7 +104,9 @@
 
         self.assertThat(hint.visible, Eventually(Equals(False)))
 
-class TestCameraGalleryViewWithVideo(TestCameraGalleryViewMixin, CameraAppTestCase):
+
+class TestCameraGalleryViewWithVideo(
+        TestCameraGalleryViewMixin, CameraAppTestCase):
     """Tests the camera gallery view with video already present"""
 
     def setUp(self):
@@ -131,7 +133,9 @@
         spinner = gallery.wait_select_single("ActivityIndicator")
         self.assertThat(spinner.running, Eventually(Equals(False)))
 
-class TestCameraGalleryViewWithPhoto(TestCameraGalleryViewMixin, CameraAppTestCase):
+
+class TestCameraGalleryViewWithPhoto(
+        TestCameraGalleryViewMixin, CameraAppTestCase):
     """Tests the camera gallery view with photo already present"""
 
     def setUp(self):

=== modified file 'tests/autopilot/camera_app/tests/test_options.py'
--- tests/autopilot/camera_app/tests/test_options.py	2014-12-08 12:04:21 +0000
+++ tests/autopilot/camera_app/tests/test_options.py	2015-05-15 07:40:54 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2014 Canonical
+# Copyright 2014, 2015 Canonical
 #
 # 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
@@ -12,6 +12,7 @@
 
 from camera_app.tests import CameraAppTestCase
 
+
 class TestCameraOptions(CameraAppTestCase):
     """Tests the options overlay"""
 
@@ -43,7 +44,8 @@
 
     """Test toggling on/off grid lines option"""
     def test_toggle_grid_lines(self):
-        gridlines = self.app.wait_select_single("QQuickItem", objectName="gridlines")
+        gridlines = self.app.wait_select_single(
+            "QQuickItem", objectName="gridlines")
         self.set_grid_lines_value("On")
         self.assertEquals(gridlines.visible, True)
         self.set_grid_lines_value("Off")
@@ -59,7 +61,8 @@
         self.pointing_device.move_to_object(grid_lines_button)
         self.pointing_device.click()
         option_value_selector = self.main_window.get_option_value_selector()
-        self.assertThat(option_value_selector.visible, Eventually(Equals(True)))
+        self.assertThat(
+            option_value_selector.visible, Eventually(Equals(True)))
 
         # tap on chosen value
         option = self.main_window.get_option_value_button(value)

=== modified file 'tests/autopilot/camera_app/tests/test_photo_editor.py'
--- tests/autopilot/camera_app/tests/test_photo_editor.py	2015-03-11 09:25:36 +0000
+++ tests/autopilot/camera_app/tests/test_photo_editor.py	2015-05-15 07:40:54 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2014 Canonical
+# Copyright 2014, 2015 Canonical
 #
 # 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
@@ -7,16 +7,12 @@
 
 """Tests for the Camera photo editor"""
 
-from testtools.matchers import Equals, NotEquals, GreaterThan, LessThan
+from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 from autopilot.exceptions import StateNotFoundError
 
 from camera_app.tests import CameraAppTestCase
 
-import unittest
-import os
-from time import sleep
-
 
 class TestCameraPhotoEditorWithPhoto(CameraAppTestCase):
     """Tests photo editor when a photo is present"""
@@ -35,7 +31,7 @@
     """Tests editor opening and closing correctly for pictures"""
     def test_editor_appears(self):
 
-        viewfinder = self.main_window.get_viewfinder()
+        self.main_window.get_viewfinder()
         gallery = self.main_window.get_gallery()
 
         self.main_window.swipe_to_gallery(self)
@@ -48,8 +44,9 @@
         self.pointing_device.click()
 
         # If the editor button is not there when in the gallery view, then
-        # we are not on a system that has the UI extras package installed or has
-        # an older version than the one we need. Skip the test in this case.
+        # we are not on a system that has the UI extras package installed or
+        # has an older version than the one we need. Skip the test in this
+        # case.
         try:
             edit = gallery.wait_select_single(objectName="actionButtonEdit")
         except:
@@ -81,6 +78,7 @@
             disappeared = True
         self.assertThat(disappeared, Equals(True))
 
+
 class TestCameraPhotoEditorWithVideo(CameraAppTestCase):
     """Tests photo editor when a video is present"""
 
@@ -99,7 +97,7 @@
     def test_editor_not_on_videos(self):
         self.add_sample_video()
 
-        viewfinder = self.main_window.get_viewfinder()
+        self.main_window.get_viewfinder()
         gallery = self.main_window.get_gallery()
 
         self.main_window.swipe_to_gallery(self)
@@ -112,8 +110,9 @@
         self.pointing_device.click()
 
         # If the editor button is not there when in the gallery view, then
-        # we are not on a system that has the UI extras package installed or has
-        # an older version than the one we need. Skip the test in this case.
+        # we are not on a system that has the UI extras package installed or
+        # has an older version than the one we need. Skip the test in this
+        # case.
         try:
             edit = gallery.wait_select_single(objectName="actionButtonEdit")
         except:

=== modified file 'tests/autopilot/camera_app/tests/test_zoom.py'
--- tests/autopilot/camera_app/tests/test_zoom.py	2014-09-08 14:12:42 +0000
+++ tests/autopilot/camera_app/tests/test_zoom.py	2015-05-15 07:40:54 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2014 Canonical
+# Copyright 2014, 2015 Canonical
 #
 # 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
@@ -7,7 +7,7 @@
 
 """Tests for the Camera App zoom"""
 
-from testtools.matchers import Equals, NotEquals, GreaterThan, LessThan
+from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 from autopilot.gestures import pinch