Merge lp:~josharenson/unity8/qa_helpers into lp:unity8

[Josh Arenson]

Refactor greeter emulator to unlock the greeter via dbus

* Are there any related MPs required for this MP to build/function as expected? Please list.
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1760
http://jenkins.qa.ubuntu.com/job/unity8-ci/5681/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2648
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/846
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/846
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/846
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2289
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2646
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2646/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20233

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5681/rebuild

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

Thanks Josh.
A couple of things.

The idea is to use these helpers before autopilot comes to play, so it's better to keep them at the module level instead of getting them as methods in the greeter autopilot custom proxy object.
The namespace of helpers is currently a little mess, so I would put them in tests/autopilot/unity8/greeter/__init__.py instead of where you put them. I have a branch in progress to solve the mess:
https://code.launchpad.net/~canonical-platform-qa/unity8/fix1306340-deprecate_emulators/+merge/257812

Next, I think we can remove the other part of unlock calling wait_for_greeter. But I'm not quite sure about this.
Take a look at my diff: http://paste.ubuntu.com/11014223/
Be warned that I didn't have time to run it, so my assumptions might be wrong or I might have left a stupid mistake.

Last think, please make sure that the code you touch passes the static checks. Call:

python3 -m flake8 .

I'm leaving for lunch, but I'll have time later and tomorrow, in case you need me.

review: Needs Fixing

[Josh Arenson (josharenson)]

Added a way to lock the greeter via dbus too. Makes everything simpler and eliminates a bit of namespace pollution. The wait_for_greeter check is just run in reverse for the lock. The few manual test I ran seemed ok.

[Leo Arias (elopio)]

Cool! Even more than what I asked for.

You have these flake8 errors:

http://paste.ubuntu.com/11016895/

And you can now remove the unity_proxy_obj argument from:

67 def unlock_unity(unity_proxy_obj=None):
120 def lock_unity(unity_proxy_obj=None):

[Josh Arenson (josharenson)]

Fixed :-)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1762
http://jenkins.qa.ubuntu.com/job/unity8-ci/5688/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2683
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/853
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/853
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/854
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2320
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2681
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2681/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20296

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5688/rebuild

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

:)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1764
http://jenkins.qa.ubuntu.com/job/unity8-ci/5689/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2684
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/854
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/854
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/855
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2322
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2682
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2682/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20300

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5689/rebuild

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

oh crap. Removing the argument from unlock caused a lot of failures from the tests that were passing it.

review: Needs Fixing

[Josh Arenson (josharenson)]

> oh crap. Removing the argument from unlock caused a lot of failures from the
> tests that were passing it.

Humm so add an unused arg or refactor everything... I'll try the refactor first and see how ugly it gets.

[Josh Arenson (josharenson)]

Refactored.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1766
http://jenkins.qa.ubuntu.com/job/unity8-ci/5691/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2688
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/856
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/856
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/857
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2325
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2686
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2686/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20316

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5691/rebuild

review: Needs Fixing (continuous-integration)

[Josh Arenson (josharenson)]

> FAILED: Continuous integration, rev:1766
> http://jenkins.qa.ubuntu.com/job/unity8-ci/5691/
> Executed test runs:
> UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-
> touch/2688
> SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-
> vivid/856
> SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/856
> SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/857
> UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-
> vivid-mako/2325
> SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-
> vivid-armhf/2686
> deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-
> vivid-armhf/2686/artifact/work/output/*zip*/output.zip
> SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20316
>
> Click here to trigger a rebuild:
> http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5691/rebuild

The failed AP test runs just fine locally...

[Leo Arias (elopio)]

Thank you!

review: Approve

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
If it's good for Leo it's good for us

 * Did CI run pass?
Known broken AP test

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

[Albert Astals Cid (aacid)]

Text conflict in tests/autopilot/unity8/indicators/tests/__init__.py
Text conflict in tests/autopilot/unity8/process_helpers.py
2 conflicts encountered.

review: Needs Fixing

[lp:~josharenson/unity8/qa_helpers]

1767. By Josh Arenson on 2015-05-12

Resolved merge conflicts

[ Albert Astals Cid ]
* Make runtests fake a test error if make fails
* Make the test more stable
* Use dbus-test-runner instead of dbus-launch
* DirectionalDragArea: improvements & API grooming (LP: #1417920)
* Fix EdgeDragEvaluator when a drag can happen both ways
  (Direction.Horizontal)
[ Josh Arenson ]
* Remove panelHeight property as it is unused.
[ Leo Arias ]
* Initial clean up of the autopilot tests set up. Removed the touch
  device from the test case. Moved the restart of unity to a fixture.
  Removed the unused DragMixin. Updated the setUpClass to use
  process_helpers. Removed the workaround for bug #1238417, already
  fixed. Use the toolkit helper to set the testability environment
  variable. Fixed the indicators base class that was restarting unity
  twice. (LP: #1238417, #1447206)
* Use the base class from the toolkit in autopilot tests.
[ Michael Zanetti ]
* emit application-stop when we're going down (LP: #1326513)
[ Michał Sawicz ]
* UNITY_SCOPES_LIST is no more
[ handsome_feng<email address hidden> ]
* When click the favorite scope in Dash Manager , it just return to
  the corresponding scope page. (LP: #1447056)

[Josh Arenson (josharenson)]

Resolved and striped tags.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1767
http://jenkins.qa.ubuntu.com/job/unity8-ci/5708/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2720/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/874
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/873
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/874
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2347/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2718
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2718/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20383

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5708/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1767
http://jenkins.qa.ubuntu.com/job/unity8-ci/5709/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2723
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/875
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/874
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/875
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2721
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2721/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20388

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5709/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

review: Abstain

[Michael Zanetti (mzanetti)]

Needs a merge

review: Needs Fixing

[lp:~josharenson/unity8/qa_helpers]

1768. By Josh Arenson on 2015-06-16

* No-change rebuild against Qt 5.4.2.
[ Michał Sawicz ]
* Implement full-shell rotation (LP: #1210199)
[ CI Train Bot ]
* New rebuild forced.
* Resync trunk.
[ Daniel d'Andrada ]
* Implemented autopilot-test and fake-sensors for shell-rotation.
[ Mirco Müller ]
* Implemented autopilot-test and fake-sensors for shell-rotation.
[ CI Train Bot ]
* New rebuild forced.
* Resync trunk.
[ Renato Araujo Oliveira Filho ]
* Set the device led color to green. (LP: #1450894)
[ Albert Astals Cid ]
* Add overrides to override functions
* Implement "rating-edit" preview widget (LP: #1318144)
* Make the DashContent::test_mainNavigation test more stable (LP:
  #1450809)
* Use art height as implicitHeight when the header is overlayed and
  there's no summary
[ CI Train Bot ]
* New rebuild forced.
* Resync trunk.
[ Daniel d'Andrada ]
* Introducing FloatingFlickable
* Make Ubuntu.Gestures components install TouchRegistry by themselves
[ Michael Terry ]
* Fix a possible crash in our PAM threading code. (LP: #1425362) (LP:
  #1425362)
* Fix the lockscreen becoming unresponsive after testing an app on the
  device from QtCreator. (LP: #1435364)
[ Nick Dedekind ]
* Fixed desktop stage app focus.
* Fixed issue in laggy indicator autpilot tests (LP: #1446846)
[ Albert Astals Cid ]
* Workarounds for concierge mode.
[ CI Train Bot ]
* New rebuild forced.
* Resync trunk.

[Michael Zanetti (mzanetti)]

review: Abstain

=== added file 'qml/Greeter/ShimGreeter.qml'
--- qml/Greeter/ShimGreeter.qml	1970-01-01 00:00:00 +0000
+++ qml/Greeter/ShimGreeter.qml	2015-06-16 19:33:06 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C)  2015 Canonical, Ltd.
+ *
+ * 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
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+
+/*
+ * This is a shim greeter that is only used to provide a shell,
+ * running without a greeter, the requisite information
+ *
+ */
+
+/* FIXME: this shuld be fine as a QtObject, but bug lp:1447391
+ * dictates wrapping as an item instead
+ */
+Item {
+    id: shimGreeter
+
+    readonly property bool active: false
+    readonly property bool hasLockedApp: lockedApp !== ""
+    readonly property bool locked: false
+    readonly property bool shown: false
+    readonly property bool waiting: false
+
+    property string lockedApp: ""
+
+    // Since ShimGreeter is never active, these can just return
+    property var forceShow: (function() { return; })
+    property var notifyAboutToFocusApp: (function(appId) { return; })
+    property var notifyAppFocused: (function(appId) { return; })
+    property var notifyShowingDashFromDrag: (function(appId) { return false; })
+
+}

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2015-06-12 16:07:43 +0000
+++ qml/Shell.qml	2015-06-16 19:33:06 +0000
@@ -111,6 +111,8 @@
     // This is _only_ used to expose the property to autopilot tests
     readonly property string testShellMode: shellMode
 
+    readonly property alias greeter: greeterLoader.item
+
     function activateApplication(appId) {
         if (ApplicationManager.findApplication(appId)) {
             ApplicationManager.requestFocusApplication(appId);
@@ -262,7 +264,9 @@
                                            ? "phone"
                                            : shell.usageScenario
             source: {
-                if (applicationsDisplayLoader.usageScenario === "phone") {
+                if(shellMode === "greeter") {
+                    return "Stages/ShimStage.qml"
+                } else if (applicationsDisplayLoader.usageScenario === "phone") {
                     return "Stages/PhoneStage.qml";
                 } else if (applicationsDisplayLoader.usageScenario === "tablet") {
                     return "Stages/TabletStage.qml";
@@ -414,50 +418,59 @@
         }
     }
 
-    Greeter {
-        id: greeter
-        objectName: "greeter"
-
-        hides: [launcher, panel.indicators]
-        tabletMode: shell.usageScenario !== "phone"
-        launcherOffset: launcher.progress
-        forcedUnlock: tutorial.running
-        background: shell.background
-
+    Loader {
+        id: greeterLoader
         anchors.fill: parent
         anchors.topMargin: panel.panelHeight
-
-        // avoid overlapping with Launcher's edge drag area
-        // FIXME: Fix TouchRegistry & friends and remove this workaround
-        //        Issue involves launcher's DDA getting disabled on a long
-        //        left-edge drag
-        dragHandleLeftMargin: launcher.available ? launcher.dragAreaWidth + 1 : 0
-
-        onSessionStarted: {
-            launcher.hide();
-        }
-
-        onTease: {
-            if (!tutorial.running) {
-                launcher.tease();
-            }
-        }
-
-        onEmergencyCall: startLockedApp("dialer-app")
-
-        Timer {
-            // See powerConnection for why this is useful
-            id: showGreeterDelayed
-            interval: 1
-            onTriggered: {
-                greeter.forceShow();
-            }
-        }
-
-        Binding {
-            target: ApplicationManager
-            property: "suspended"
-            value: greeter.shown
+        sourceComponent: shellMode != "shell" ? integratedGreeter :
+            Qt.createComponent(Qt.resolvedUrl("Greeter/ShimGreeter.qml"));
+        onLoaded: {
+                item.objectName = "greeter"
+        }
+    }
+
+    Component {
+        id: integratedGreeter
+        Greeter {
+
+            hides: [launcher, panel.indicators]
+            tabletMode: shell.sideStageEnabled
+            launcherOffset: launcher.progress
+            forcedUnlock: tutorial.running
+            background: shell.background
+
+            // avoid overlapping with Launcher's edge drag area
+            // FIXME: Fix TouchRegistry & friends and remove this workaround
+            //        Issue involves launcher's DDA getting disabled on a long
+            //        left-edge drag
+            dragHandleLeftMargin: launcher.available ? launcher.dragAreaWidth + 1 : 0
+
+            onSessionStarted: {
+                launcher.hide();
+            }
+
+            onTease: {
+                if (!tutorial.running) {
+                    launcher.tease();
+                }
+            }
+
+            onEmergencyCall: startLockedApp("dialer-app")
+
+            Binding {
+                target: ApplicationManager
+                property: "suspended"
+                value: greeter.shown
+            }
+        }
+    }
+
+    Timer {
+        // See powerConnection for why this is useful
+        id: showGreeterDelayed
+        interval: 1
+        onTriggered: {
+            greeter.forceShow();
         }
     }
 

=== added file 'qml/Stages/ShimStage.qml'
--- qml/Stages/ShimStage.qml	1970-01-01 00:00:00 +0000
+++ qml/Stages/ShimStage.qml	2015-06-16 19:33:06 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * 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
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 0.1
+
+Rectangle {
+    id: shimStage
+
+    anchors.fill: parent
+    color: UbuntuColors.lightAubergine
+
+    Text {
+        id: greeterModeText
+
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.top: parent.top
+        anchors.topMargin: units.gu(10)
+        font.bold: true
+        horizontalAlignment: Text.AlignHCenter
+        text: "Shell is in \"greeter\" mode"
+    }
+
+    Text {
+        anchors.centerIn: parent
+        color: UbuntuColors.orange
+        font.pointSize: units.gu(8)
+        horizontalAlignment: Text.AlignHCenter
+        text: "Shim \nStage"
+    }
+}

=== modified file 'tests/autopilot/unity8/application_lifecycle/tests/__init__.py'
--- tests/autopilot/unity8/application_lifecycle/tests/__init__.py	2015-02-23 17:29:04 +0000
+++ tests/autopilot/unity8/application_lifecycle/tests/__init__.py	2015-06-16 19:33:06 +0000
@@ -31,8 +31,8 @@
         super().setUp()
         self._qml_mock_enabled = False
         self._data_dirs_mock_enabled = False
-        unity_proxy = self.launch_unity()
-        process_helpers.unlock_unity(unity_proxy)
+        self.launch_unity()
+        process_helpers.unlock_unity()
 
     def create_test_application(self):
         desktop_file_dict = fixture_setup.DEFAULT_DESKTOP_FILE_DICT

=== modified file 'tests/autopilot/unity8/greeter/__init__.py'
--- tests/autopilot/unity8/greeter/__init__.py	2015-03-23 23:40:27 +0000
+++ tests/autopilot/unity8/greeter/__init__.py	2015-06-16 19:33:06 +0000
@@ -0,0 +1,52 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Unity Autopilot Test Suite
+# Copyright (C) 2015 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import dbus
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+
+
+def hide_greeter_with_dbus():
+    dbus_proxy = _get_greeter_dbus_proxy()
+    if _is_greeter_active():
+        dbus_proxy.HideGreeter()
+
+
+def show_greeter_with_dbus():
+    dbus_proxy = _get_greeter_dbus_proxy()
+    if not _is_greeter_active():
+        dbus_proxy.ShowGreeter()
+
+
+def wait_for_greeter():
+    Eventually(Equals(True), timeout=300).match(_is_greeter_active)
+
+
+def _get_greeter_dbus_proxy():
+    bus = dbus.SessionBus()
+    return bus.get_object('com.canonical.UnityGreeter', '/')
+
+
+def _is_greeter_active():
+    try:
+        dbus_proxy = _get_greeter_dbus_proxy()
+        return dbus_proxy.Get('com.canonical.UnityGreeter', 'IsActive')
+    except:
+        return False

=== modified file 'tests/autopilot/unity8/indicators/tests/__init__.py'
--- tests/autopilot/unity8/indicators/tests/__init__.py	2015-05-11 14:36:03 +0000
+++ tests/autopilot/unity8/indicators/tests/__init__.py	2015-06-16 19:33:06 +0000
@@ -31,7 +31,7 @@
     def setUp(self):
         super().setUp()
         self.unity_proxy = self.launch_unity()
-        process_helpers.unlock_unity(self.unity_proxy)
+        process_helpers.unlock_unity()
 
 
 class DeviceIndicatorTestCase(IndicatorTestCase):

=== modified file 'tests/autopilot/unity8/process_helpers.py'
--- tests/autopilot/unity8/process_helpers.py	2015-05-11 14:36:03 +0000
+++ tests/autopilot/unity8/process_helpers.py	2015-06-16 19:33:06 +0000
@@ -19,14 +19,11 @@
 
 import logging
 import subprocess
-import dbus
 
 import ubuntuuitoolkit
-from autopilot.exceptions import ProcessSearchError
 from autopilot.introspection import get_proxy_object_for_existing_process
 
-from unity8.shell import emulators
-from unity8.shell.emulators import main_window as main_window_emulator
+from unity8 import greeter
 
 logger = logging.getLogger(__name__)
 
@@ -39,104 +36,20 @@
     pass
 
 
-def unlock_unity(unity_proxy_obj=None):
+def unlock_unity():
     """Helper function that attempts to unlock the unity greeter.
 
-    If unity_proxy_object is None create a proxy object by querying for the
-    running unity process.
-    Otherwise re-use the passed proxy object.
-
-    :raises RuntimeError: if the greeter attempts and fails to be unlocked.
-
-    :raises RuntimeWarning: when the greeter cannot be found because it is
-      already unlocked.
-    :raises CannotAccessUnity: if unity is not introspectable or cannot be
-      found on dbus.
-    :raises CannotAccessUnity: if unity's upstart status is not "start" or the
-      upstart job cannot be found at all.
-
     """
-    if unity_proxy_obj is None:
-        try:
-            pid = get_unity_pid()
-            unity = _get_unity_proxy_object(pid)
-            main_window = unity.select_single(main_window_emulator.QQuickView)
-        except ProcessSearchError as e:
-            raise CannotAccessUnity(
-                "Cannot introspect unity, make sure that it has been started "
-                "with testability. Perhaps use the function "
-                "'restart_unity_with_testability' this module provides."
-                "(%s)"
-                % str(e)
-            )
-    else:
-        main_window = unity_proxy_obj.select_single(
-            main_window_emulator.QQuickView)
-
-    greeter = main_window.get_greeter()
-    if greeter.created is False:
-        raise RuntimeWarning("Greeter appears to be already unlocked.")
-
-    bus = dbus.SessionBus()
-    dbus_proxy = bus.get_object("com.canonical.UnityGreeter", "/")
-    try:
-        dbus_proxy.HideGreeter()
-    except dbus.DBusException:
-        logger.info("Failed to unlock greeter")
-        raise
-    else:
-        greeter.created.wait_for(False)
-        logger.info("Greeter unlocked, continuing.")
-
-
-def lock_unity(unity_proxy_obj=None):
+    greeter.wait_for_greeter()
+    greeter.hide_greeter_with_dbus()
+
+
+def lock_unity():
     """Helper function that attempts to lock unity greeter.
 
-    If unity_proxy_object is None create a proxy object by querying for the
-    running unity process.
-    Otherwise re-use the passed proxy object.
-
-    :raises RuntimeError: if the greeter attempts and fails to be locked.
-
-    :raises RuntimeWarning: when the greeter is found because it is
-      already locked.
-    :raises CannotAccessUnity: if unity is not introspectable or cannot be
-      found on dbus.
-    :raises CannotAccessUnity: if unity's upstart status is not "start" or the
-      upstart job cannot be found at all.
-
     """
-    if unity_proxy_obj is None:
-        try:
-            pid = get_unity_pid()
-            unity = _get_unity_proxy_object(pid)
-            main_window = unity.select_single(main_window_emulator.QQuickView)
-        except ProcessSearchError as e:
-            raise CannotAccessUnity(
-                "Cannot introspect unity, make sure that it has been started "
-                "with testability. Perhaps use the function "
-                "'restart_unity_with_testability' this module provides."
-                "(%s)"
-                % str(e)
-            )
-    else:
-        main_window = unity_proxy_obj.select_single(
-            main_window_emulator.QQuickView)
-
-    greeter = main_window.get_greeter()
-    if greeter.created is True:
-        raise RuntimeWarning("Greeter appears to be already locked.")
-
-    bus = dbus.SessionBus()
-    dbus_proxy = bus.get_object("com.canonical.UnityGreeter", "/")
-    try:
-        dbus_proxy.ShowGreeter()
-    except dbus.DBusException:
-        logger.info("Failed to lock greeter")
-        raise
-    else:
-        greeter.created.wait_for(True)
-        logger.info("Greeter locked, continuing.")
+    greeter.show_greeter_with_dbus()
+    greeter.wait_for_greeter()
 
 
 def restart_unity_with_testability(*args):

=== modified file 'tests/autopilot/unity8/shell/tests/test_emulators.py'
--- tests/autopilot/unity8/shell/tests/test_emulators.py	2015-04-17 21:58:16 +0000
+++ tests/autopilot/unity8/shell/tests/test_emulators.py	2015-06-16 19:33:06 +0000
@@ -41,8 +41,8 @@
 
     def setUp(self):
         super().setUp()
-        unity_proxy = self.launch_unity()
-        process_helpers.unlock_unity(unity_proxy)
+        self.launch_unity()
+        process_helpers.unlock_unity()
 
 
 class DashEmulatorTestCase(tests.DashBaseTestCase):

=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
--- tests/autopilot/unity8/shell/tests/test_notifications.py	2015-04-17 21:58:16 +0000
+++ tests/autopilot/unity8/shell/tests/test_notifications.py	2015-06-16 19:33:06 +0000
@@ -119,8 +119,8 @@
 
     def test_interactive(self):
         """Interactive notification must react upon click on itself."""
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         notify_list = self._get_notifications_list()
 
@@ -156,8 +156,8 @@
         """Snap-decision with three actions should use
            one-over two button layout.
         """
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         summary = "Theatre at Ferria Stadium"
         body = "at Ferria Stadium in Bilbao, Spain\n07578545317"
@@ -197,8 +197,8 @@
         """Snap-decision should block input to shell
            without greeter/lockscreen.
         """
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         summary = "Incoming file"
         body = "Frank would like to send you the file: essay.pdf"
@@ -421,8 +421,8 @@
 
     def test_icon_summary_body(self):
         """Notification must display the expected summary and body text."""
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         notify_list = self._get_notifications_list()
 
@@ -458,8 +458,8 @@
     def test_icon_summary(self):
         """Notification must display the expected summary and secondary
         icon."""
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         notify_list = self._get_notifications_list()
 
@@ -491,8 +491,8 @@
     def test_urgency_order(self):
         """Notifications must be displayed in order according to their
         urgency."""
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         notify_list = self._get_notifications_list()
 
@@ -578,8 +578,8 @@
 
     def test_summary_and_body(self):
         """Notification must display the expected summary- and body-text."""
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         notify_list = self._get_notifications_list()
 
@@ -603,8 +603,8 @@
 
     def test_summary_only(self):
         """Notification must display only the expected summary-text."""
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         notify_list = self._get_notifications_list()
 
@@ -621,8 +621,8 @@
     def test_update_notification_same_layout(self):
         """Notification must allow updating its contents while being
         displayed."""
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         notify_list = self._get_notifications_list()
 
@@ -660,8 +660,8 @@
     def test_update_notification_layout_change(self):
         """Notification must allow updating its contents and layout while
         being displayed."""
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         notify_list = self._get_notifications_list()
 
@@ -709,8 +709,8 @@
         """ use the create notification script to get a notification dialog.
         Check that the arguments passed to the script match the fields. """
 
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         summary = 'Helper summary'
         body = 'Helper body'

=== modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
--- tests/qmltests/Tutorial/tst_Tutorial.qml	2015-05-18 23:04:12 +0000
+++ tests/qmltests/Tutorial/tst_Tutorial.qml	2015-06-16 19:33:06 +0000
@@ -73,6 +73,7 @@
             sourceComponent: Component {
                 Shell {
                     property string indicatorProfile: "phone"
+                    property string shellMode: "full-greeter" /* default */
 
                     Component.onDestruction: {
                         shellLoader.itemDestroyed = true;

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2015-06-12 16:07:43 +0000
+++ tests/qmltests/tst_Shell.qml	2015-06-16 19:33:06 +0000
@@ -81,6 +81,8 @@
             property bool itemDestroyed: false
             sourceComponent: Component {
                 Shell {
+                    property string shellMode: "full-greeter" /* default */
+
                     usageScenario: "phone"
                     orientation: Qt.PortraitOrientation
                     primaryOrientation: Qt.PortraitOrientation

=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
--- tests/qmltests/tst_ShellWithPin.qml	2015-05-11 14:36:03 +0000
+++ tests/qmltests/tst_ShellWithPin.qml	2015-06-16 19:33:06 +0000
@@ -69,6 +69,8 @@
             property bool itemDestroyed: false
             sourceComponent: Component {
                 Shell {
+                    property string shellMode: "full-greeter" /* default */
+
                     Component.onDestruction: {
                         shellLoader.itemDestroyed = true
                     }