Merge lp:~elopio/unity8/test_open_app_from_launcher into lp:unity8

[Leo Arias]

[lp:~elopio/unity8/test_open_app_from_launcher]

993. By Leo Arias on 2014-07-09

Merged with prerequisite.

994. By Leo Arias on 2014-07-09

Moved the property to the delegate as suggested by michael.

995. By Leo Arias on 2014-07-09

Merged with prerequisite.

996. By Leo Arias on 2014-07-10

Merged with prerequisite.

Unmerged revisions

=== modified file '.bazaar/plugins/makecheck_unity_phablet.py'
--- .bazaar/plugins/makecheck_unity_phablet.py	2014-03-24 16:23:37 +0000
+++ .bazaar/plugins/makecheck_unity_phablet.py	2014-07-01 05:57:22 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# Copyright 2013 Canonical Ltd.
+# Copyright 2013, 2014 Canonical Ltd.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -13,11 +13,15 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import os, subprocess
-from bzrlib import branch, errors
-from bzrlib.urlutils import dirname, local_path_from_url
-
-def execute_makecheck(local_branch, master_branch, old_revision_number, old_revision_id, future_revision_number, future_revision_id, tree_delta, future_tree):
+import os
+import subprocess
+from bzrlib import branch
+from bzrlib.urlutils import local_path_from_url
+
+
+def execute_makecheck(
+        local_branch, master_branch, old_revision_number, old_revision_id,
+        future_revision_number, future_revision_id, tree_delta, future_tree):
     if not master_branch.basis_tree().has_filename("qml/Shell.qml"):
         return
 
@@ -27,7 +31,9 @@
     os.environ['CTEST_OUTPUT_ON_FAILURE'] = "1"
     if (subprocess.call("make -C builddir test", shell=True) != 0):
 
-        print("\n\n*** Warning ***\n\nBasic tests failed. This commit will not pass continuous integration.")
+        print("\n\n*** Warning ***\n\n"
+              "Basic tests failed. This commit will not pass continuous "
+              "integration.")
 
         branch = local_branch or master_branch
         revision = branch.repository.get_revision(future_revision_id)
@@ -36,8 +42,10 @@
         msg_file.close()
 
         print("\n\nSaved commit message to $SRC_DIR/message.txt.")
-        print("You can uncommit this revision, fix the tests and reuse your message running:\n\nbzr commit -F message.txt\n\n")
+        print("You can uncommit this revision, fix the tests and reuse your "
+              "message running:\n\nbzr commit -F message.txt\n\n")
     elif os.path.isfile("message.txt"):
         os.remove("message.txt")
 
-branch.Branch.hooks.install_named_hook('pre_commit', execute_makecheck, 'make check pre-commit')
+branch.Branch.hooks.install_named_hook(
+    'pre_commit', execute_makecheck, 'make check pre-commit')

=== modified file 'qml/Launcher/LauncherDelegate.qml'
--- qml/Launcher/LauncherDelegate.qml	2013-10-16 11:33:26 +0000
+++ qml/Launcher/LauncherDelegate.qml	2014-07-01 05:57:22 +0000
@@ -20,6 +20,7 @@
 Item {
     id: root
 
+    property string appId
     property string iconName
     property int count: -1
     property int progress: -1

=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2013-12-11 12:57:14 +0000
+++ qml/Launcher/LauncherPanel.qml	2014-07-01 05:57:22 +0000
@@ -149,6 +149,7 @@
                     delegate: FoldingLauncherDelegate {
                         id: launcherDelegate
                         objectName: "launcherDelegate" + index
+                        appId: model.appId
                         itemHeight: launcherListView.itemHeight
                         itemWidth: launcherListView.itemWidth
                         width: itemWidth

=== modified file 'tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py'
--- tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2014-06-11 15:36:51 +0000
+++ tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2014-07-01 05:57:22 +0000
@@ -115,3 +115,18 @@
         self.launch_upstart_application(application_name)
         self.assertThat(greeter.created, Eventually(Equals(False)))
         self.assert_current_focused_application(application_name)
+
+    def test_click_dash_icon_must_unfocus_application(self):
+        application_name = self.launch_fake_app()
+        self.assert_current_focused_application(application_name)
+
+        self.main_window.show_dash_from_launcher()
+
+        self.assert_current_focused_application('')
+
+    def test_click_app_icon_on_dash_must_focus_it(self):
+        application_name = self.launch_fake_app()
+        self.main_window.show_dash_from_launcher()
+
+        self.main_window.launch_application(application_name)
+        self.assert_current_focused_application(application_name)

=== modified file 'tests/autopilot/unity8/process_helpers.py'
--- tests/autopilot/unity8/process_helpers.py	2014-06-11 15:36:51 +0000
+++ tests/autopilot/unity8/process_helpers.py	2014-07-01 05:57:22 +0000
@@ -75,7 +75,7 @@
             main_window_emulator.QQuickView)
 
     greeter = main_window.get_greeter()
-    if greeter.created == False:
+    if greeter.created is False:
         raise RuntimeWarning("Greeter appears to be already unlocked.")
 
     # Because of potential input jerkiness under heavy load,
@@ -98,7 +98,8 @@
 
 def lock_unity(unity_proxy_obj=None):
     """Helper function that attempts to lock the unity greeter."""
-    import evdev, time
+    import evdev
+    import time
     uinput = evdev.UInput(name='unity8-autopilot-power-button',
                           devnode='/dev/autopilot-uinput')
     # One press and release to turn screen off (locking unity)
@@ -172,7 +173,7 @@
 
 def _get_unity_pid():
     status = _get_unity_status()
-    if not "start/" in status:
+    if "start/" not in status:
         raise CannotAccessUnity("Unity is not in the running state.")
     return int(status.split()[-1])
 

=== modified file 'tests/autopilot/unity8/shell/emulators/launcher.py'
--- tests/autopilot/unity8/shell/emulators/launcher.py	2013-11-01 13:59:50 +0000
+++ tests/autopilot/unity8/shell/emulators/launcher.py	2014-07-01 05:57:22 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Unity Autopilot Test Suite
-# Copyright (C) 2012-2013 Canonical
+# Copyright (C) 2012, 2013, 2014 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,22 +17,65 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from unity8.shell.emulators import UnityEmulatorBase
-from autopilot.input import Touch
-
-
-class Launcher(UnityEmulatorBase):
+import logging
+
+import autopilot.logging
+
+from unity8.shell import emulators
+
+
+logger = logging.getLogger(__name__)
+
+
+class Launcher(emulators.UnityEmulatorBase):
 
     """An emulator that understands the Launcher."""
 
+    @autopilot.logging.log_action(logger.debug)
     def show(self):
-        """Swipes open the launcher."""
-        touch = Touch.create()
+        """Show the launcher swiping it to the right."""
+        if not self.shown:
+            self._swipe_launcher('right')
+            self.shown.wait_for(True)
+        else:
+            logger.debug('The launcher is already opened.')
 
+    def _swipe_launcher(self, direction):
         view = self.get_root_instance().select_single('QQuickView')
-        start_x = view.x + 1
-        start_y = view.y + view.height / 2
-        stop_x = start_x + self.panelWidth + 1
-        stop_y = start_y
-        touch.drag(start_x, start_y, stop_x, stop_y)
-        self.shown.wait_for(True)
+        start_y = stop_y = view.y + view.height // 2
+
+        left = view.x + 1
+        right = left + self.panelWidth - 1
+
+        if direction == 'right':
+            start_x = left
+            stop_x = right
+        elif direction == 'left':
+            start_x = right
+            stop_x = left
+
+        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
+
+    @autopilot.logging.log_action(logger.debug)
+    def hide(self):
+        """Hide the launcher swiping it to the left."""
+        if self.shown:
+            self._swipe_launcher('left')
+            self.shown.wait_for(False)
+        else:
+            logger.debug('The launcher is already closed.')
+
+    @autopilot.logging.log_action(logger.debug)
+    def click_dash_icon(self):
+        if self.shown:
+            dash_icon = self.select_single(
+                'QQuickImage', objectName='dashItem')
+            self.pointing_device.click_object(dash_icon)
+        else:
+            raise emulators.UnityEmulatorException('The launcher is closed.')
+
+    @autopilot.logging.log_action(logger.debug)
+    def click_application_launcher_icon(self, application_name):
+        launcher_delegate = self.select_single(
+            'LauncherDelegate', appId=application_name)
+        self.pointing_device.click_object(launcher_delegate)

=== modified file 'tests/autopilot/unity8/shell/emulators/main_window.py'
--- tests/autopilot/unity8/shell/emulators/main_window.py	2014-05-20 18:47:15 +0000
+++ tests/autopilot/unity8/shell/emulators/main_window.py	2014-07-01 05:57:22 +0000
@@ -67,9 +67,6 @@
     def get_bottombar(self):
         return self.select_single("Bottombar")
 
-    def get_launcher(self):
-        return self.select_single(Launcher)
-
     def get_pinPadLoader(self):
         return self.select_single(
             "QQuickLoader",
@@ -139,3 +136,38 @@
 
     def _get_search_indicator(self):
         return self.select_single('SearchIndicator', objectName='search')
+
+    @autopilot_logging.log_action(logger.info)
+    def show_dash_from_launcher(self):
+        """Open the dash clicking the dash icon on the launcher."""
+        launcher = self.open_launcher()
+        launcher.click_dash_icon()
+        return self.get_dash()
+
+    @autopilot_logging.log_action(logger.info)
+    def open_launcher(self):
+        launcher = self._get_launcher()
+        launcher.show()
+        return launcher
+
+    def _get_launcher(self):
+        return self.select_single(Launcher)
+
+    @autopilot_logging.log_action(logger.info)
+    def close_launcher(self):
+        launcher = self._get_launcher()
+        launcher.hide()
+
+    def is_launcher_open(self):
+        return self._get_launcher().shown
+
+    @autopilot_logging.log_action(logger.info)
+    def launch_application(self, application_name):
+        """Launch an application.
+
+        :parameter application_name: The name of the application to launch.
+
+        """
+        launcher = self.open_launcher()
+        launcher.click_application_launcher_icon(application_name)
+        self.get_current_focused_app_id().wait_for(application_name)

=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
--- tests/autopilot/unity8/shell/tests/__init__.py	2014-06-11 15:36:51 +0000
+++ tests/autopilot/unity8/shell/tests/__init__.py	2014-07-01 05:57:22 +0000
@@ -142,12 +142,11 @@
         self._data_dirs_mock_enabled = True
         self._environment = {}
 
-        #### FIXME: This is a work around re: lp:1238417 ####
+        # FIXME: This is a work around re: lp:1238417
         if model() != "Desktop":
             from autopilot.input import _uinput
             _uinput._touch_device = _uinput.create_touch_device()
             self.addCleanup(_uinput._touch_device.close)
-        ####
 
         self.touch = Touch.create()
         self._setup_display_details()

=== modified file 'tests/autopilot/unity8/shell/tests/disabled_test_hud.py'
--- tests/autopilot/unity8/shell/tests/disabled_test_hud.py	2014-06-11 15:36:51 +0000
+++ tests/autopilot/unity8/shell/tests/disabled_test_hud.py	2014-07-01 05:57:22 +0000
@@ -20,12 +20,13 @@
 from __future__ import absolute_import
 
 from unity8.process_helpers import unlock_unity
-from unity8.shell import with_lightdm_mock, DragMixin
+from unity8.shell import DragMixin
 from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
 
 from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 
+
 class TestHud(UnityTestCase, DragMixin):
 
     """Tests the Shell HUD."""
@@ -33,10 +34,14 @@
     scenarios = _get_device_emulation_scenarios()
 
     def test_show_hud_button_appears(self):
-        """Swiping up while an app is active must show the 'show hud' button, following some behaviours.
+        """Swiping up while an app is active must show the 'show hud' button.
+
+        It should follow some behaviours.
            The button must disappear not opening the HUD when releasing the
-           mouse again somewhere on the screen except on the button itself following a timeout.
-           The button must disappear when touching somewhere on the screen except the button itself.
+           mouse again somewhere on the screen except on the button itself
+           following a timeout.
+           The button must disappear when touching somewhere on the screen
+           except the button itself.
 
         """
         unity_proxy = self.launch_unity()
@@ -55,29 +60,47 @@
 
         self.touch.press(swipe_coords.start_x, swipe_coords.start_y)
         self.addCleanup(self._maybe_release_finger)
-        self._drag(swipe_coords.start_x, swipe_coords.start_y, swipe_coords.start_x, swipe_coords.start_y - int(edge_drag_area.distanceThreshold) - 5)
+        self._drag(
+            swipe_coords.start_x,
+            swipe_coords.start_y,
+            swipe_coords.start_x,
+            swipe_coords.start_y - int(edge_drag_area.distanceThreshold) - 5)
         self.assertThat(hud_show_button.opacity, Eventually(Equals(0.5)))
-        self.assertThat(hud_show_button.bottomMargin, Eventually(Equals(initialBottomMargin)))
-        self._drag(swipe_coords.start_x, swipe_coords.start_y - int(edge_drag_area.distanceThreshold) - 5, swipe_coords.end_x, swipe_coords.start_y - int(edge_drag_area.distanceThreshold) - int(edge_drag_area.commitDistance) - 5)
+        self.assertThat(
+            hud_show_button.bottomMargin,
+            Eventually(Equals(initialBottomMargin)))
+        self._drag(
+            swipe_coords.start_x,
+            swipe_coords.start_y - int(edge_drag_area.distanceThreshold) - 5,
+            swipe_coords.end_x,
+            swipe_coords.start_y - int(edge_drag_area.distanceThreshold) -
+            int(edge_drag_area.commitDistance) - 5)
         self.assertThat(hud_show_button.opacity, Eventually(Equals(1.0)))
         self.assertThat(hud_show_button.bottomMargin, Eventually(Equals(0.0)))
-        self.touch.release();
+        self.touch.release()
         self.assertThat(hud.shown, Equals(False))
         self.assertThat(hud_show_button.opacity, Eventually(Equals(0.0)))
 
         self.touch.press(swipe_coords.start_x, swipe_coords.start_y)
-        self._drag(swipe_coords.start_x, swipe_coords.start_y, swipe_coords.start_x, swipe_coords.end_y - int(hud_show_button.height))
+        self._drag(
+            swipe_coords.start_x,
+            swipe_coords.start_y,
+            swipe_coords.start_x,
+            swipe_coords.end_y - int(hud_show_button.height))
         self.assertThat(hud.shown, Equals(False))
         self.assertThat(hud_show_button.opacity, Eventually(Equals(1.0)))
         self.touch.release()
         self.assertThat(hud_show_button.opacity, Eventually(Equals(1.0)))
-        self.touch.tap(swipe_coords.end_x, swipe_coords.end_y - int(hud_show_button.height))
+        self.touch.tap(
+            swipe_coords.end_x,
+            swipe_coords.end_y - int(hud_show_button.height))
         self.assertThat(hud.shown, Equals(False))
         self.assertThat(hud_show_button.opacity, Eventually(Equals(0.0)))
 
     def test_show_hud_appears(self):
         """Releasing the touch on the 'show hud' button must display the hud.
-           Test that the hud button stays on screen and tapping it opens the hud.
+           Test that the hud button stays on screen and tapping it opens the
+           hud.
 
         """
         unity_proxy = self.launch_unity()
@@ -94,7 +117,11 @@
 
         self.touch.press(swipe_coords.start_x, swipe_coords.start_y)
         self.addCleanup(self._maybe_release_finger)
-        self._drag(swipe_coords.start_x, swipe_coords.start_y, swipe_coords.start_x, swipe_coords.end_y)
+        self._drag(
+            swipe_coords.start_x,
+            swipe_coords.start_y,
+            swipe_coords.start_x,
+            swipe_coords.end_y)
         self.assertThat(hud.shown, Eventually(Equals(False)))
         self.assertThat(hud_show_button.opacity, Eventually(Equals(1.0)))
         self.touch.release()
@@ -105,7 +132,11 @@
         self.assertThat(hud.shown, Eventually(Equals(False)))
 
         self.touch.press(swipe_coords.start_x, swipe_coords.start_y)
-        self._drag(swipe_coords.start_x, swipe_coords.start_y, swipe_coords.start_x, swipe_coords.end_y - int(hud_show_button.height))
+        self._drag(
+            swipe_coords.start_x,
+            swipe_coords.start_y,
+            swipe_coords.start_x,
+            swipe_coords.end_y - int(hud_show_button.height))
         self.assertThat(hud.shown, Equals(False))
         self.assertThat(hud_show_button.opacity, Eventually(Equals(1.0)))
         self.touch.release()
@@ -153,12 +184,11 @@
         unity_proxy = self.launch_unity()
         unlock_unity(unity_proxy)
         hud = self.main_window.get_hud()
-        launcher = self.main_window.get_launcher()
 
         self._launch_test_app_from_app_screen()
 
         hud.show()
-        launcher.show()
+        self.main_window.open_launcher()
 
         self.assertThat(hud.shown, Eventually(Equals(False)))
 

=== modified file 'tests/autopilot/unity8/shell/tests/test_emulators.py'
--- tests/autopilot/unity8/shell/tests/test_emulators.py	2014-06-11 15:36:51 +0000
+++ tests/autopilot/unity8/shell/tests/test_emulators.py	2014-07-01 05:57:22 +0000
@@ -32,11 +32,12 @@
 except ImportError:
     import mock
 
-from testtools.matchers import Contains, HasLength
-
 from unity8 import process_helpers
 from unity8.shell import emulators, fixture_setup, tests
-from unity8.shell.emulators import dash as dash_emulators
+from unity8.shell.emulators import (
+    dash as dash_emulators,
+    launcher as launcher_emulator
+)
 
 
 class MainWindowTestCase(tests.UnityTestCase):
@@ -54,6 +55,24 @@
         self.assertEqual(text_field.text, 'Test')
         self.assertEqual(text_field.state, 'idle')
 
+    def test_open_launcher_must_return_launcher_custom_proxy_object(self):
+        launcher = self.main_window.open_launcher()
+        self.assertIsInstance(launcher, launcher_emulator.Launcher)
+
+    def test_open_launcher_must_open_it(self):
+        # Make sure that the launcher is closed.
+        self.main_window.close_launcher()
+        self.main_window.open_launcher()
+
+        self.assertTrue(self.main_window.is_launcher_open())
+
+    def test_close_launcher_must_close_it(self):
+        # Make sure that the launcher is open.
+        self.main_window.open_launcher()
+        self.main_window.close_launcher()
+
+        self.assertFalse(self.main_window.is_launcher_open())
+
 
 class DashBaseTestCase(tests.UnityTestCase):
 
@@ -200,3 +219,39 @@
             return filtergrid.collapsedRowCount * filtergrid.columns
         else:
             return filtergrid.uncollapsedRowCount * filtergrid.columns
+
+
+class LauncherTestCase(tests.UnityTestCase):
+
+    scenarios = tests._get_device_emulation_scenarios()
+
+    def setUp(self):
+        super(LauncherTestCase, self).setUp()
+        unity_proxy = self.launch_unity()
+        process_helpers.unlock_unity(unity_proxy)
+
+    def test_show_launcher_with_launcher_open_must_do_nothing(self):
+        launcher = self.main_window.open_launcher()
+        with mock.patch.object(launcher.pointing_device, 'drag') as mock_drag:
+            launcher.show()
+
+        self.assertFalse(mock_drag.called)
+
+    def test_hide_launcher_with_launcher_closed_must_do_nothing(self):
+        launcher = self.main_window.open_launcher()
+        launcher.hide()
+        with mock.patch.object(launcher.pointing_device, 'drag') as mock_drag:
+            launcher.hide()
+
+        self.assertFalse(mock_drag.called)
+
+    def test_click_dash_icon_with_launcher_closed_must_raise_exception(self):
+        launcher = self.main_window.open_launcher()
+        launcher.hide()
+
+        exception = self.assertRaises(
+            emulators.UnityEmulatorException,
+            launcher.click_dash_icon)
+
+        self.assertEqual(
+            'The launcher is closed.', str(exception))

=== modified file 'tests/autopilot/unity8/shell/tests/test_lock_screen.py'
--- tests/autopilot/unity8/shell/tests/test_lock_screen.py	2014-06-11 15:36:51 +0000
+++ tests/autopilot/unity8/shell/tests/test_lock_screen.py	2014-07-01 05:57:22 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Unity Autopilot Test Suite
-# Copyright (C) 2012-2013 Canonical
+# Copyright (C) 2012, 2013, 2014 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,9 +25,7 @@
 from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
 
 from autopilot.matchers import Eventually
-from autopilot.platform import model
 import sys
-from testtools import skipUnless
 from testtools.matchers import Equals
 import logging
 
@@ -133,7 +131,7 @@
         if not isinstance(code, basestring):
             raise TypeError(
                 "'code' parameter must be a string, not %r."
-                % type(passphrase)
+                % type(code)
             )
         for num in code:
             if not num.isdigit():
@@ -190,7 +188,8 @@
         current_text = prompt.text
         self.keyboard.type(character)
         try:
-            self.assertThat(prompt.text, Eventually(Equals(current_text + character)))
+            self.assertThat(
+                prompt.text, Eventually(Equals(current_text + character)))
         except AssertionError:
             if retries > 0:
                 self._type_character(character, prompt, retries-1)

=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
--- tests/autopilot/unity8/shell/tests/test_notifications.py	2014-06-11 15:36:51 +0000
+++ tests/autopilot/unity8/shell/tests/test_notifications.py	2014-07-01 05:57:22 +0000
@@ -211,8 +211,8 @@
         self.touch.tap_object(notification.select_single(objectName="button4"))
         self.assert_notification_action_id_was_called("action_decline_4")
 
-    def test_modal_sd_without_greeter (self):
-        """A snap-decision on a phone should block input to shell beneath it when there's no greeter."""
+    def test_modal_sd_without_greeter(self):
+        """Snap-decision should block input to shell without greeter."""
         unity_proxy = self.launch_unity()
         unlock_unity(unity_proxy)
 
@@ -238,24 +238,26 @@
             hints
         )
 
-        # verify that we cannot reveal the launcher (no longer interact with the shell)
+        # verify that we cannot reveal the launcher (no longer interact with
+        # the shell)
         time.sleep(1)
         self.main_window.show_dash_swiping()
-        launcher = self.main_window.get_launcher()
-        self.assertThat(launcher.shown, Eventually(Equals(False)))
+        self.assertThat(
+            self.main_window.is_launcher_open, Eventually(Equals(False)))
 
         # verify and interact with the triggered snap-decision notification
         notify_list = self._get_notifications_list()
         get_notification = lambda: notify_list.wait_select_single(
             'Notification', objectName='notification1')
         notification = get_notification()
-        self._assert_notification(notification, summary, body, True, False, 1.0)
+        self._assert_notification(
+            notification, summary, body, True, False, 1.0)
         self.touch.tap_object(notification.select_single(objectName="button0"))
         self.assert_notification_action_id_was_called("action_accept")
 
-    def test_modal_sd_with_greeter (self):
-        """A snap-decision on a phone should not block input to the greeter beneath it."""
-        unity_proxy = self.launch_unity()
+    def test_modal_sd_with_greeter(self):
+        """A snap-decision should not block input to the greeter beneath it."""
+        self.launch_unity()
 
         summary = "Incoming file"
         body = "Frank would like to send you the file: essay.pdf"
@@ -290,7 +292,8 @@
         get_notification = lambda: notify_list.wait_select_single(
             'Notification', objectName='notification1')
         notification = get_notification()
-        self._assert_notification(notification, summary, body, True, False, 1.0)
+        self._assert_notification(
+            notification, summary, body, True, False, 1.0)
         self.touch.tap_object(notification.select_single(objectName="button0"))
         self.assert_notification_action_id_was_called("action_accept")
 
@@ -663,7 +666,8 @@
         icon_path = self._get_icon_path('avatars/amanda.png')
         notification.update(summary, body, icon_path)
         notification.show()
-        self._assert_notification(get_notification(), summary, body, True, False, 1.0)
+        self._assert_notification(
+            get_notification(), summary, body, True, False, 1.0)
 
     def test_update_notification_layout_change(self):
         """Notification must allow updating its contents and layout while
@@ -710,7 +714,8 @@
         notification.show()
 
         self.assertThat(get_notification, Eventually(NotEquals(None)))
-        self._assert_notification(get_notification(), summary, body, False, False, 1.0)
+        self._assert_notification(
+            get_notification(), summary, body, False, False, 1.0)
 
     def test_append_hint(self):
         """Notification has to accumulate body-text using append-hint."""

=== modified file 'tests/autopilot/unity8/shell/tests/test_system_integration.py'
--- tests/autopilot/unity8/shell/tests/test_system_integration.py	2014-04-09 17:31:15 +0000
+++ tests/autopilot/unity8/shell/tests/test_system_integration.py	2014-07-01 05:57:22 +0000
@@ -23,19 +23,24 @@
 import unittest
 
 from autopilot import platform
-from unity8.shell.emulators import UnityEmulatorBase
 from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
 
-from testtools.matchers._basic import Equals
 
 class SystemIntegrationTests(UnityTestCase):
 
     scenarios = _get_device_emulation_scenarios()
 
-    @unittest.skipIf(platform.model() == "Desktop", "Test is broken on otto, see bug 1281634.")
+    @unittest.skipIf(
+        platform.model() == "Desktop",
+        "Test is broken on otto, see bug 1281634.")
     def test_networkmanager_integration(self):
         self.launch_unity()
 
         # invoke policykit to check permissions
-        pid = subprocess.check_output(["pidof", "-s", "unity8"], universal_newlines=True)
-        subprocess.check_call("pkcheck --action-id org.freedesktop.NetworkManager.enable-disable-network --process " + pid, shell=True)
+        pid = subprocess.check_output(
+            ["pidof", "-s", "unity8"], universal_newlines=True)
+        subprocess.check_call(
+            "pkcheck --action-id "
+            "org.freedesktop.NetworkManager.enable-disable-network "
+            "--process " + pid,
+            shell=True)

=== modified file 'tests/autopilot/unity8/shell/tests/test_upstart.py'
--- tests/autopilot/unity8/shell/tests/test_upstart.py	2014-05-01 14:25:18 +0000
+++ tests/autopilot/unity8/shell/tests/test_upstart.py	2014-07-01 05:57:22 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Unity Autopilot Test Suite
-# Copyright (C) 2013 Canonical
+# Copyright (C) 2013, 2014 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -42,19 +42,24 @@
 if sys.version_info < (3,):
     range = xrange
 
+
 class UpstartIntegrationTests(UnityTestCase):
 
     scenarios = _get_device_emulation_scenarios()
 
     def _get_status(self):
-        pid, status = os.waitpid(self.process.pid, os.WUNTRACED | os.WCONTINUED | os.WNOHANG)
-        logger.debug("Got status: {0}; stopped: {1}; continued: {2}"\
-                     .format(status, os.WIFSTOPPED(status), os.WIFCONTINUED(status)))
+        pid, status = os.waitpid(
+            self.process.pid, os.WUNTRACED | os.WCONTINUED | os.WNOHANG)
+        logger.debug(
+            "Got status: {0}; stopped: {1}; continued: {2}".format(
+                status, os.WIFSTOPPED(status), os.WIFCONTINUED(status)))
         return status
 
     def _launch_unity(self):
         self.patch_environment("QT_LOAD_TESTABILITY", "1")
-        self.process = subprocess.Popen([get_binary_path()] + self.unity_geometry_args)
+        self.process = subprocess.Popen(
+            [get_binary_path()] + self.unity_geometry_args)
+
         def ensure_stopped():
             self.process.terminate()
             for i in range(10):
@@ -76,10 +81,10 @@
         self.addCleanup(ensure_stopped)
 
     def _set_proxy(self):
-        super(UpstartIntegrationTests, self)._set_proxy(get_proxy_object_for_existing_process(
-            pid=self.process.pid,
-            emulator_base=UnityEmulatorBase,
-        ))
+        super(UpstartIntegrationTests, self)._set_proxy(
+            get_proxy_object_for_existing_process(
+                pid=self.process.pid,
+                emulator_base=UnityEmulatorBase,))
 
     def test_no_sigstop(self):
         self.patch_environment("UNITY_MIR_EMITS_SIGSTOP", "")
@@ -93,10 +98,14 @@
     def test_expect_sigstop(self):
         self.patch_environment("UNITY_MIR_EMITS_SIGSTOP", "1")
         self._launch_unity()
-        self.assertThat(lambda: os.WIFSTOPPED(self._get_status()), Eventually(Equals(True)), "Unity8 should raise SIGSTOP when ready")
+        self.assertThat(
+            lambda: os.WIFSTOPPED(self._get_status()),
+            Eventually(Equals(True)), "Unity8 should raise SIGSTOP when ready")
 
         self.process.send_signal(signal.SIGCONT)
-        self.assertThat(lambda: os.WIFCONTINUED(self._get_status()), Eventually(Equals(True)), "Unity8 should have resumed")
+        self.assertThat(
+            lambda: os.WIFCONTINUED(self._get_status()),
+            Eventually(Equals(True)), "Unity8 should have resumed")
 
         logger.debug("Unity started, waiting for it to be ready.")
         self._set_proxy()

=== modified file 'tests/whitespace/check_whitespace.py'
--- tests/whitespace/check_whitespace.py	2013-06-05 22:03:08 +0000
+++ tests/whitespace/check_whitespace.py	2014-07-01 05:57:22 +0000
@@ -1,7 +1,7 @@
 #! /usr/bin/env python3
 
 #
-# Copyright (C) 2013 Canonical Ltd
+# Copyright (C) 2013, 2014 Canonical Ltd
 #
 # 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
@@ -19,8 +19,8 @@
 #
 
 #
-# Little helper program to test that source files do not contain trailing whitespace
-# or tab indentation.
+# Little helper program to test that source files do not contain trailing
+# whitespace or tab indentation.
 #
 # Usage: check_whitespace.py directory [ignore_prefix]
 #
@@ -31,18 +31,20 @@
 # See the file_pat definition below for a list of files that are checked.
 #
 
+from __future__ import print_function
+
 import argparse
 import os
 import re
 import sys
 
+
 # Print msg on stderr, preceded by program name and followed by newline
-
 def error(msg):
     print(os.path.basename(sys.argv[0]) + ": " + msg, file=sys.stderr)
 
+
 # Function to raise errors encountered by os.walk
-
 def raise_error(e):
     raise e
 
@@ -52,6 +54,7 @@
 whitespace_pat = re.compile(r'.*[ \t]$')
 tab_indent_pat = re.compile(r'^ *\t')
 
+
 def scan_for_bad_whitespace(file_path):
     global tab_indent_pat, whitespace_pat
     errors = []
@@ -69,7 +72,9 @@
             plural = 's'
         else:
             plural = ''
-        print("%s: bad whitespace in line%s %s" % (file_path, plural, ", ".join((str(i) for i in errors))))
+        print(
+            "%s: bad whitespace in line%s %s" % (
+                file_path, plural, ", ".join((str(i) for i in errors))))
     elif errors:
         print("%s: bad whitespace in multiple lines" % file_path)
     if newlines_at_end:
@@ -78,15 +83,20 @@
 
 # Parse args
 
-parser = argparse.ArgumentParser(description = 'Test that source files do not contain trailing whitespace.')
-parser.add_argument('dir', nargs = 1, help = 'The directory to (recursively) search for source files')
-parser.add_argument('ignore_prefix', nargs = '?', default=None,
-                    help = 'Ignore source files with a path that starts with the given prefix.')
+parser = argparse.ArgumentParser(
+    description='Test that source files do not contain trailing whitespace.')
+parser.add_argument(
+    'dir', nargs=1,
+    help='The directory to (recursively) search for source files')
+parser.add_argument(
+    'ignore_prefix', nargs='?', default=None,
+    help='Ignore source files with a path that starts with the given prefix.')
 args = parser.parse_args()
 
 # Files we want to check for trailing whitespace.
 
-file_pat = r'(.*\.(c|cpp|h|hpp|hh|in|install|js|py|qml|sh)$)|(.*CMakeLists\.txt$)'
+file_pat = (
+    r'(.*\.(c|cpp|h|hpp|hh|in|install|js|py|qml|sh)$)|(.*CMakeLists\.txt$)')
 pat = re.compile(file_pat)
 
 # Find all the files with matching file extension in the specified
@@ -97,7 +107,7 @@
 
 found_whitespace = False
 try:
-    for root, dirs, files in os.walk(directory, onerror = raise_error):
+    for root, dirs, files in os.walk(directory, onerror=raise_error):
         for file in files:
             path = os.path.join(root, file)
             if not (ignore and path.startswith(ignore)) and pat.match(file):