Merge lp:~canonical-platform-qa/unity8/fix1306340-deprecate_emulators into lp:unity8

[Leo Arias]

Reorganized the python test helper modules.
Deprecated the unity8.shell.emulators namespace.

Like a year ago we deprecated the word emulators from autopilot test because it caused a lot of confusion. This change was long due. The unity8 packages are even harder, because they have helpers and tests in multiple levels. With this change, all the helpers in the unity8.component. A next useful change would be to join all the tests in unity8.tests.component.

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

This branch needs:
https://code.launchpad.net/~canonical-platform-qa/unity8/click_item_with_swipe
https://code.launchpad.net/~josharenson/unity8/qa_helpers/+merge/258435

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

Only ran the tests.

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

Yes.

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

No debian packaging changes.

 * If you changed the UI, has there been a design review?

No UI changes.

 * Did you have a look at the warnings when running tests? Can they be reduced?

No warnings introduced.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1532
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~canonical-platform-qa/unity8/fix1306340-deprecate_emulators/+merge/257812/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/5641/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2538
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/804
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/806
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/806
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2199
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2536
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2536/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20045

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1533
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~canonical-platform-qa/unity8/fix1306340-deprecate_emulators/+merge/257812/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/5642/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2541
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/805
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/807
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/807
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2202
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2539
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2539/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20049

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1533
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~canonical-platform-qa/unity8/fix1306340-deprecate_emulators/+merge/257812/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/5646/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2556
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/809
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/811
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/811
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2214
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2554
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2554/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20067

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1533
http://jenkins.qa.ubuntu.com/job/unity8-ci/5652/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2568
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/816
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/817
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/817
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2226
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2566
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2566/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20084

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1535
http://jenkins.qa.ubuntu.com/job/unity8-ci/5723/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/2/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/1
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/2/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/2
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20520

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1535
http://jenkins.qa.ubuntu.com/job/unity8-ci/5724/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/2
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/3
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20528

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

review: Needs Fixing (continuous-integration)

[lp:~canonical-platform-qa/unity8/fix1306340-deprecate_emulators]

1536. By Leo Arias on 2015-05-22

Merged with trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1536
http://jenkins.qa.ubuntu.com/job/unity8-ci/5764/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/42
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/43
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20723

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1536
http://jenkins.qa.ubuntu.com/job/unity8-ci/5770/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/49/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/33/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/48
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/39/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/49
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/49/artifact/work/output/*zip*/output.zip
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20749/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1536
http://jenkins.qa.ubuntu.com/job/unity8-ci/5771/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/50
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/34/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/49
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/50
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/50/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20757

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

review: Needs Fixing (continuous-integration)

[Brendan Donegan (brendan-donegan)]

Merging this leaves a file 'tests/autopilot/unity8/greeter/__init__.py.moved', which I assume is not right

review: Needs Fixing

[Sergio Cazzolato (sergio-j-cazzolato)]

review: Approve

[lp:~canonical-platform-qa/unity8/fix1306340-deprecate_emulators]

1537. By Leo Arias on 2015-05-27

Removed the file resulting from a wrong merge.

1538. By Leo Arias on 2015-05-27

Merged with trunk.

[Leo Arias (elopio)]

> Merging this leaves a file 'tests/autopilot/unity8/greeter/__init__.py.moved',
> which I assume is not right

Fixed. Thanks for catching that.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1538
http://jenkins.qa.ubuntu.com/job/unity8-ci/5784/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/63
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/47/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/63
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/63/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20821

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

review: Needs Fixing (continuous-integration)

[Brendan Donegan (brendan-donegan)]

Looks good from my POV

review: Approve

[Nicholas Skaggs (nskaggs)]

Who still needs to add approval here? How can we move this forward?

[Michael Zanetti (mzanetti)]

small inline comment

review: Needs Information

[Albert Astals Cid (aacid)]

Text conflict in debian/control
Text conflict in tests/autopilot/unity8/dash.py
Text conflict in tests/autopilot/unity8/process_helpers.py
Conflict: can't delete tests/autopilot/unity8/shell/emulators because it is not empty. Not deleting.
Conflict because tests/autopilot/unity8/shell/emulators is not versioned, but has versioned children. Versioned directory.
Contents conflict in tests/autopilot/unity8/shell/emulators/main_window.py
Text conflict in tests/autopilot/unity8/shell/tests/test_helpers.py
7 conflicts encountered.

review: Needs Fixing

[lp:~canonical-platform-qa/unity8/fix1306340-deprecate_emulators]

1539. By Richard Huddie on 2015-06-22

Merged with trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1539
http://jenkins.qa.ubuntu.com/job/unity8-ci/5849/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/146/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/130
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/96/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/146
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/146/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21366

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in tests/autopilot/unity8/process_helpers.py
1 conflicts encountered.

[lp:~canonical-platform-qa/unity8/fix1306340-deprecate_emulators]

1540. By Richard Huddie on 2015-06-23

Merged with trunk.

1541. By Richard Huddie on 2015-06-23

Update rotation tests to use new helpers.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1540
http://jenkins.qa.ubuntu.com/job/unity8-ci/5852/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/152/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/133
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/102/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/152
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/152/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21387

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1541
http://jenkins.qa.ubuntu.com/job/unity8-ci/5854/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/135
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/104
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/154
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/154/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21396

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1541
http://jenkins.qa.ubuntu.com/job/unity8-ci/5865/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/145
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/146
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/166
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/166/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21412

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

review: Needs Fixing (continuous-integration)

[lp:~canonical-platform-qa/unity8/fix1306340-deprecate_emulators]

1542. By Richard Huddie on 2015-06-24

Fix unlock unity in fake sensors test and remove duplicated test.

1543. By Richard Huddie on 2015-06-24

Fix flake8 errors, remove imports using emulator and rename emulator tests to helper tests.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1542
http://jenkins.qa.ubuntu.com/job/unity8-ci/5873/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/154
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/179
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/179/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21438

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1543
http://jenkins.qa.ubuntu.com/job/unity8-ci/5877/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/158
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/122
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/183
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/183/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21442

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

Yes! Thanks a lot.

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

Only tests changed. Makes the pass in Jenkins again.

 * Did CI run pass? If not, please explain why.

it did

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

yes, clean

review: Approve

=== modified file 'tests/autopilot/unity8/__init__.py'
--- tests/autopilot/unity8/__init__.py	2014-02-23 01:46:02 +0000
+++ tests/autopilot/unity8/__init__.py	2015-06-24 11:14:44 +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, 2014 Canonical
+# Copyright (C) 2012, 2013, 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 as published by
@@ -17,13 +17,17 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-"""unity autopilot tests and emulators - top level package."""
+"""unity autopilot tests and helpers - top level package."""
 import os
 import os.path
 import subprocess
 import sysconfig
 
 
+class UnityException(Exception):
+    """Exception raised when there is an error with the Unity test helpers."""
+
+
 def running_installed_tests():
     binary_path = get_binary_path()
     return binary_path.startswith('/usr')

=== modified file 'tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py'
--- tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2015-05-18 23:04:03 +0000
+++ tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2015-06-24 11:14:44 +0000
@@ -92,14 +92,16 @@
         process_helpers.lock_unity()
 
         # FIXME - this is because the device greeter uses a password.
-        # Need to be able to selectively enable mocks so that we can use the fake greeter.
+        # Need to be able to selectively enable mocks so that we can use the
+        # fake greeter.
         def unlock_thread_worker(greeter):
             greeter.wait_swiped_away()
             process_helpers.unlock_unity()
             greeter.created.wait_for(False)
 
         greeter = self.main_window.get_greeter()
-        unlock_thread = threading.Thread(target=unlock_thread_worker, args=(greeter,))
+        unlock_thread = threading.Thread(
+            target=unlock_thread_worker, args=(greeter,))
         unlock_thread.start()
         application_name = self.launch_fake_app()
         unlock_thread.join(10)

=== renamed file 'tests/autopilot/unity8/shell/emulators/dash.py' => 'tests/autopilot/unity8/dash.py'
--- tests/autopilot/unity8/shell/emulators/dash.py	2015-06-16 15:12:08 +0000
+++ tests/autopilot/unity8/dash.py	2015-06-24 11:14:44 +0000
@@ -23,7 +23,7 @@
 from autopilot import logging as autopilot_logging
 from autopilot.introspection import dbus
 
-from unity8.shell import emulators
+import unity8
 
 
 logger = logging.getLogger(__name__)
@@ -41,7 +41,7 @@
 
 
 class Dash(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
-    """An emulator that understands the Dash."""
+    """A helper that understands the Dash."""
 
     def __init__(self, *args):
         super().__init__(*args)
@@ -93,10 +93,10 @@
             for l in aux.get_children_by_type('QQuickLoader'):
                 if (l.scopeId == scope_id):
                     return l
-            raise emulators.UnityEmulatorException(
+            raise unity8.UnityException(
                 'No scope found with id {0}'.format(scope_id))
         except dbus.StateNotFoundError:
-            raise emulators.UnityEmulatorException(
+            raise unity8.UnityException(
                 'No scope found with id {0}'.format(scope_id))
 
     def _get_scope_from_loader(self, loader):
@@ -121,7 +121,7 @@
         elif scope_loader.globalRect.x > current_scope_loader.globalRect.x:
             return self._scroll_to_right_scope
         else:
-            raise emulators.UnityEmulatorException('The scope is already open')
+            raise unity8.UnityException('The scope is already open')
 
     @autopilot_logging.log_action(logger.info)
     def _scroll_to_left_scope(self):
@@ -190,7 +190,7 @@
 
 
 class GenericScopeView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
-    """Autopilot emulator for generic scopes."""
+    """Autopilot helper for generic scopes."""
 
     @autopilot_logging.log_action(logger.info)
     def open_preview(self, category, app_name, press_duration=0.10):
@@ -237,7 +237,7 @@
                 'DashCategoryBase',
                 objectName='dashCategory{}'.format(category))
         except dbus.StateNotFoundError:
-            raise emulators.UnityEmulatorException(
+            raise unity8.UnityException(
                 'No category found with name {}'.format(category))
 
     def get_applications(self, category):

=== modified file 'tests/autopilot/unity8/fixture_setup.py'
--- tests/autopilot/unity8/fixture_setup.py	2015-05-13 11:13:04 +0000
+++ tests/autopilot/unity8/fixture_setup.py	2015-06-24 11:14:44 +0000
@@ -31,21 +31,14 @@
 
 from unity8 import (
     get_binary_path,
+    get_mocks_library_path,
+    get_default_extra_mock_libraries,
+    get_data_dirs,
     sensors,
+    shell,
     process_helpers
 )
 
-from unity8.shell import emulators
-
-from unity8.shell.emulators import (
-    main_window as main_window_emulator
-)
-
-from unity8 import (
-    get_mocks_library_path,
-    get_default_extra_mock_libraries,
-    get_data_dirs
-)
 
 logger = logging.getLogger(__name__)
 
@@ -140,8 +133,7 @@
         args = [binary_arg] + env_args
         self.unity_proxy = process_helpers.restart_unity_with_testability(
             *args)
-        self.main_win = self.unity_proxy.select_single(
-            main_window_emulator.QQuickView)
+        self.main_win = self.unity_proxy.select_single(shell.QQuickView)
 
     def _create_sensors(self):
         # Wait for unity to start running.
@@ -150,7 +142,7 @@
 
         # Wait for the sensors fifo file to be created.
         fifo_path = '/tmp/sensor-fifo-{0}'.format(
-            process_helpers.get_unity_pid())
+            process_helpers._get_unity_pid())
         Eventually(Equals(True)).match(
             lambda: os.path.exists(fifo_path))
 
@@ -159,8 +151,6 @@
             fifo.write('create light 0 10 1\n')
             fifo.write('create proximity\n')
 
-logger = logging.getLogger(__name__)
-
 
 class RestartUnityWithTestability(fixtures.Fixture):
 

=== modified file 'tests/autopilot/unity8/greeter/__init__.py'
--- tests/autopilot/unity8/greeter/__init__.py	2015-05-08 00:33:55 +0000
+++ tests/autopilot/unity8/greeter/__init__.py	2015-06-24 11:14:44 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Unity Autopilot Test Suite
-# Copyright (C) 2015 Canonical
+# Copyright (C) 2012, 2013, 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 as published by
@@ -19,8 +19,10 @@
 
 import dbus
 
+import ubuntuuitoolkit
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
+from autopilot.utilities import sleep
 
 
 def hide_greeter_with_dbus():
@@ -50,3 +52,42 @@
         return dbus_proxy.Get('com.canonical.UnityGreeter', 'IsActive')
     except:
         return False
+
+
+class Greeter(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+    """A helper that understands the greeter screen."""
+
+    def wait_swiped_away(self):
+        # We have to be careful here, because coverPage can go away at any time
+        # if there isn't a lockscreen behind it (it hides completely, then
+        # the greeter disposes it).  But if there *is* a lockscreen, then we
+        # need a different check, by looking at its showProgress.  So make our
+        # own wait_for loop and check both possibilities.
+        for i in range(10):
+            if not self.required:
+                return
+            coverPage = self.select_single(objectName='coverPage')
+            if coverPage.showProgress == 0:
+                return
+            sleep(1)
+
+        raise AssertionError("Greeter cover page still up after 10s")
+
+    def swipe(self):
+        """Swipe the greeter screen away."""
+        self.waiting.wait_for(False)
+        coverPage = self.select_single(objectName='coverPage')
+        coverPage.showProgress.wait_for(1)
+
+        rect = self.globalRect
+        start_x = rect[0] + rect[2] - 3
+        start_y = int(rect[1] + rect[3] / 2)
+        stop_x = int(rect[0] + rect[2] * 0.2)
+        stop_y = start_y
+        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
+
+        self.wait_swiped_away()
+
+    def get_prompt(self):
+        return self.select_single(
+            ubuntuuitoolkit.TextField, objectName='passwordInput')

=== modified file 'tests/autopilot/unity8/greeter/tests/__init__.py'
--- tests/autopilot/unity8/greeter/tests/__init__.py	2015-04-20 16:05:51 +0000
+++ tests/autopilot/unity8/greeter/tests/__init__.py	2015-06-24 11:14:44 +0000
@@ -17,12 +17,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from unity8.shell.emulators import main_window as main_window_emulator
+from unity8 import shell
 from unity8.shell.tests import UnityTestCase
 
 
 class GreeterTestCase(UnityTestCase):
     def get_shell(self, unity_proxy):
         main_window = (
-            unity_proxy.select_single(main_window_emulator.QQuickView))
+            unity_proxy.select_single(shell.QQuickView))
         return main_window.select_single('Shell')

=== renamed file 'tests/autopilot/unity8/shell/emulators/launcher.py' => 'tests/autopilot/unity8/launcher.py'
--- tests/autopilot/unity8/shell/emulators/launcher.py	2015-04-28 15:20:13 +0000
+++ tests/autopilot/unity8/launcher.py	2015-06-24 11:14:44 +0000
@@ -22,7 +22,7 @@
 import autopilot.logging
 import ubuntuuitoolkit
 
-from unity8.shell import emulators
+import unity8
 
 
 logger = logging.getLogger(__name__)
@@ -30,7 +30,7 @@
 
 class Launcher(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
-    """An emulator that understands the Launcher."""
+    """A helper that understands the Launcher."""
 
     @autopilot.logging.log_action(logger.debug)
     def show(self):
@@ -57,7 +57,7 @@
                 'QQuickImage', objectName='dashItem')
             self.pointing_device.click_object(dash_icon)
         else:
-            raise emulators.UnityEmulatorException('The launcher is closed.')
+            raise unity8.UnityException('The launcher is closed.')
 
     @autopilot.logging.log_action(logger.debug)
     def click_application_launcher_icon(self, application_name):

=== modified file 'tests/autopilot/unity8/process_helpers.py'
--- tests/autopilot/unity8/process_helpers.py	2015-06-16 19:32:13 +0000
+++ tests/autopilot/unity8/process_helpers.py	2015-06-24 11:14:44 +0000
@@ -25,6 +25,7 @@
 
 from unity8 import greeter
 
+
 logger = logging.getLogger(__name__)
 
 
@@ -175,7 +176,7 @@
         raise CannotAccessUnity(str(error))
 
 
-def get_unity_pid():
+def _get_unity_pid():
     try:
         return get_job_pid('unity8')
     except JobError as error:

=== modified file 'tests/autopilot/unity8/sensors.py'
--- tests/autopilot/unity8/sensors.py	2015-05-08 17:57:41 +0000
+++ tests/autopilot/unity8/sensors.py	2015-06-24 11:14:44 +0000
@@ -25,7 +25,7 @@
 class FakePlatformSensors:
 
     def __init__(self, pid=None):
-        self.pid = pid or process_helpers.get_unity_pid()
+        self.pid = pid or process_helpers._get_unity_pid()
 
     def set_orientation(self, action):
         if action == 'top_up':

=== modified file 'tests/autopilot/unity8/shell/__init__.py'
--- tests/autopilot/unity8/shell/__init__.py	2015-04-24 16:10:02 +0000
+++ tests/autopilot/unity8/shell/__init__.py	2015-06-24 11:14:44 +0000
@@ -17,12 +17,21 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-"""unity shell autopilot tests and emulators - sub level package."""
+"""unity shell autopilot tests and helpers - sub level package."""
 
+import logging
 from functools import wraps
+
+import ubuntuuitoolkit
+from autopilot import logging as autopilot_logging
+from autopilot import input
 from gi.repository import Notify
 
-import logging
+from unity8 import (
+    greeter,
+    launcher as launcher_helpers
+)
+
 
 logger = logging.getLogger(__name__)
 
@@ -82,3 +91,173 @@
                       'NORMAL': Notify.Urgency.NORMAL,
                       'CRITICAL': Notify.Urgency.CRITICAL}
     return _urgency_enums.get(urgency.upper())
+
+
+class QQuickView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+    """An helper class that makes it easy to interact with the shell"""
+
+    def get_greeter(self):
+        return self.select_single(greeter.Greeter)
+
+    def get_login_loader(self):
+        return self.select_single("QQuickLoader", objectName="loginLoader")
+
+    def get_login_list(self):
+        return self.select_single("LoginList")
+
+    def get_bottombar(self):
+        return self.select_single("Bottombar")
+
+    def get_pinPadLoader(self):
+        return self.select_single(
+            "QQuickLoader",
+            objectName="pinPadLoader"
+        )
+
+    def get_lockscreen(self):
+        return self.select_single("Lockscreen")
+
+    def get_pinentryField(self):
+        return self.select_single(objectName="pinentryField")
+
+    def _get_indicator_panel_item(self, indicator_name):
+        return self.select_single(
+            'IndicatorItem',
+            objectName=indicator_name+'-panelItem'
+        )
+
+    def _get_indicator_page(self, indicator_name):
+        return self.select_single(
+            'IndicatorPage',
+            objectName=indicator_name+'-page'
+        )
+
+    @autopilot_logging.log_action(logger.info)
+    def open_indicator_page(self, indicator_name):
+        """Swipe to open the indicator, wait until it's open.
+
+        :returns: The indicator page.
+        """
+        widget = self._get_indicator_panel_item(indicator_name)
+        start_x, start_y = input.get_center_point(widget)
+        end_x = start_x
+        end_y = self.height
+        self.pointing_device.drag(start_x, start_y, end_x, end_y)
+        self.wait_select_single('IndicatorsMenu', fullyOpened=True)
+        return self._get_indicator_page(indicator_name)
+
+    @autopilot_logging.log_action(logger.info)
+    def close_indicator_page(self):
+        """Swipe to close the opened indicator, wait until it's closed."""
+        indicators_menu = self.wait_select_single('IndicatorsMenu')
+        end_x, end_y = input.get_center_point(indicators_menu)
+        start_x = end_x
+        start_y = self.height
+        self.pointing_device.drag(start_x, start_y, end_x, end_y)
+        indicators_menu.fullyClosed.wait_for(True)
+
+    @autopilot_logging.log_action(logger.info)
+    def show_dash_swiping(self):
+        """Show the dash swiping from the left."""
+        x, y, width, height = self._get_shell().globalRect
+        start_x = x
+        end_x = x + width
+        start_y = end_y = y + height // 2
+
+        self.pointing_device.drag(start_x, start_y, end_x, end_y)
+        self.get_current_focused_app_id().wait_for('unity8-dash')
+
+    def _get_shell(self):
+        return self.select_single('Shell')
+
+    def get_current_focused_app_id(self):
+        """Return the id of the focused application."""
+        return self._get_shell().focusedApplicationId
+
+    @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()
+        self.get_current_focused_app_id().wait_for('unity8-dash')
+        launcher.shown.wait_for(False)
+
+    @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_helpers.Launcher)
+
+    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)
+        launcher.shown.wait_for(False)
+
+    def enter_pin_code(self, code):
+        """Enter code 'code' into the single-pin lightdm pincode entry screen.
+
+        :param code: must be a string of numeric characters.
+        :raises: TypeError if code is not a string.
+        :raises: ValueError if code contains non-numeric characters.
+
+        """
+        if not isinstance(code, str):
+            raise TypeError(
+                "'code' parameter must be a string, not %r."
+                % type(code)
+            )
+        for num in code:
+            if not num.isdigit():
+                raise ValueError(
+                    "'code' parameter contains non-numeric characters."
+                )
+            self.pointing_device.click_object(
+                self._get_pinpad_button(int(num)))
+
+    def _get_pinpad_button(self, button_id):
+        return self.select_single(
+            'PinPadButton',
+            objectName='pinPadButton{}'.format(button_id)
+        )
+
+    def get_shell_orientation_angle(self):
+        return self._get_shell().orientationAngle
+
+    def get_shell_orientation(self):
+        return self._get_shell().orientation
+
+    def get_shell_primary_orientation(self):
+        return self._get_shell().primaryOrientation
+
+    def get_shell_native_orientation(self):
+        return self._get_shell().nativeOrientation
+
+    @autopilot_logging.log_action(logger.info)
+    def wait_for_notification(self):
+        """Wait for a notification dialog to appear.
+
+        :return: An object for the notification dialog data.
+        :raise StateNotFoundError: if the timeout expires when the
+        notification has not appeared.
+
+        """
+        notify_list = self.select_single('Notifications',
+                                         objectName='notificationList')
+        visible_notification = notify_list.wait_select_single('Notification',
+                                                              visible=True)
+        return {'summary': visible_notification.summary,
+                'body': visible_notification.body,
+                'iconSource': visible_notification.iconSource}

=== added file 'tests/autopilot/unity8/shell/create_interactive_notification.py'
--- tests/autopilot/unity8/shell/create_interactive_notification.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/unity8/shell/create_interactive_notification.py	2015-06-24 11:14:44 +0000
@@ -0,0 +1,101 @@
+#!/usr/bin/env python3
+
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Unity Autopilot Test Suite
+# Copyright (C) 2012, 2013, 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 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 argparse
+from gi.repository import GLib, Notify
+import signal
+
+
+def action_callback(notification, action_id, data):
+    print(action_id)
+
+
+def quit_callback(notification):
+    loop.quit()
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(
+        description='Create an interactive notification'
+    )
+
+    parser.add_argument(
+        '--summary',
+        help='summary text of the notification',
+        default='Summary'
+    )
+    parser.add_argument(
+        '--body',
+        help='body text of the notification',
+        default='Body'
+    )
+    parser.add_argument(
+        '--icon',
+        help='path to the icon to display',
+        default=None
+    )
+    parser.add_argument(
+        '--action',
+        help='id and label for the callback in the format: id,label',
+        action='append',
+        default=[]
+    )
+    parser.add_argument(
+        '--urgency',
+        help='LOW, NORMAL, CRITICAL',
+        choices=['LOW', 'NORMAL', 'CRITICAL'],
+        default='NORMAL'
+    )
+    parser.add_argument(
+        '--hints',
+        help='list of comma sep options',
+        action='append',
+        default=[]
+    )
+
+    args = parser.parse_args()
+
+    Notify.init('Interactive Notifications')
+
+    notification = Notify.Notification.new(args.summary, args.body, args.icon)
+
+    for hint in args.hints:
+        key, value = hint.split(',', 1)
+        notification.set_hint_string(key, value)
+
+    for action in args.action:
+        action_id, action_label = action.split(',', 1)
+        notification.add_action(
+            action_id,
+            action_label,
+            action_callback,
+            None
+        )
+
+    def signal_handler(signam, frame):
+        loop.quit()
+
+    signal.signal(signal.SIGINT, signal_handler)
+
+    loop = GLib.MainLoop.new(None, False)
+    notification.connect('closed', quit_callback)
+    notification.show()
+    loop.run()

=== removed directory 'tests/autopilot/unity8/shell/emulators'
=== added file 'tests/autopilot/unity8/shell/emulators.py'
--- tests/autopilot/unity8/shell/emulators.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/unity8/shell/emulators.py	2015-06-24 11:14:44 +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/>.
+#
+
+"""Emulators was the old name for the custom proxy objects."""
+
+import logging
+
+
+logger = logging.getLogger(__name__)
+
+
+logger.warning(
+    'The unity8.shell.emulators module is deprecated. Import the autopilot '
+    'helpers from the top-level unity8 module.')
+
+
+__all__ = [
+    'create_interactive_notification',
+    'dash',
+    'greeter',
+    'launcher',
+    'main_window',
+    'tutorial',
+    'UnityEmulatorException',
+]
+
+
+from unity8 import (
+    greeter,
+    dash,
+    launcher,
+    shell as main_window,
+    tutorial,
+    UnityException as UnityEmulatorException
+)
+from unity8.shell import create_interactive_notification

=== removed file 'tests/autopilot/unity8/shell/emulators/__init__.py'
--- tests/autopilot/unity8/shell/emulators/__init__.py	2015-04-28 15:20:13 +0000
+++ tests/autopilot/unity8/shell/emulators/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Unity Autopilot Test Suite
-# Copyright (C) 2012, 2013, 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 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/>.
-#
-
-
-class UnityEmulatorException(Exception):
-    """Exception raised when there is an error with the Unity emulators."""

=== removed file 'tests/autopilot/unity8/shell/emulators/create_interactive_notification.py'
--- tests/autopilot/unity8/shell/emulators/create_interactive_notification.py	2015-02-23 17:29:04 +0000
+++ tests/autopilot/unity8/shell/emulators/create_interactive_notification.py	1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-#!/usr/bin/env python3
-
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Unity Autopilot Test Suite
-# Copyright (C) 2012, 2013, 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 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 argparse
-from gi.repository import GLib, Notify
-import signal
-
-
-def action_callback(notification, action_id, data):
-    print(action_id)
-
-
-def quit_callback(notification):
-    loop.quit()
-
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(
-        description='Create an interactive notification'
-    )
-
-    parser.add_argument(
-        '--summary',
-        help='summary text of the notification',
-        default='Summary'
-    )
-    parser.add_argument(
-        '--body',
-        help='body text of the notification',
-        default='Body'
-    )
-    parser.add_argument(
-        '--icon',
-        help='path to the icon to display',
-        default=None
-    )
-    parser.add_argument(
-        '--action',
-        help='id and label for the callback in the format: id,label',
-        action='append',
-        default=[]
-    )
-    parser.add_argument(
-        '--urgency',
-        help='LOW, NORMAL, CRITICAL',
-        choices=['LOW', 'NORMAL', 'CRITICAL'],
-        default='NORMAL'
-    )
-    parser.add_argument(
-        '--hints',
-        help='list of comma sep options',
-        action='append',
-        default=[]
-    )
-
-    args = parser.parse_args()
-
-    Notify.init('Interactive Notifications')
-
-    notification = Notify.Notification.new(args.summary, args.body, args.icon)
-
-    for hint in args.hints:
-        key, value = hint.split(',', 1)
-        notification.set_hint_string(key, value)
-
-    for action in args.action:
-        action_id, action_label = action.split(',', 1)
-        notification.add_action(
-            action_id,
-            action_label,
-            action_callback,
-            None
-        )
-
-    def signal_handler(signam, frame):
-        loop.quit()
-
-    signal.signal(signal.SIGINT, signal_handler)
-
-    loop = GLib.MainLoop.new(None, False)
-    notification.connect('closed', quit_callback)
-    notification.show()
-    loop.run()

=== removed file 'tests/autopilot/unity8/shell/emulators/greeter.py'
--- tests/autopilot/unity8/shell/emulators/greeter.py	2015-05-12 00:00:50 +0000
+++ tests/autopilot/unity8/shell/emulators/greeter.py	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Unity Autopilot Test Suite
-# Copyright (C) 2012, 2013, 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 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 ubuntuuitoolkit
-from autopilot.utilities import sleep
-
-
-class Greeter(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
-    """An emulator that understands the greeter screen."""
-
-    def wait_swiped_away(self):
-        # We have to be careful here, because coverPage can go away at any time
-        # if there isn't a lockscreen behind it (it hides completely, then
-        # the greeter disposes it).  But if there *is* a lockscreen, then we
-        # need a different check, by looking at its showProgress.  So make our
-        # own wait_for loop and check both possibilities.
-        for i in range(10):
-            if not self.required:
-                return
-            coverPage = self.select_single(objectName='coverPage')
-            if coverPage.showProgress == 0:
-                return
-            sleep(1)
-
-        raise AssertionError("Greeter cover page still up after 10s")
-
-    def swipe(self):
-        """Swipe the greeter screen away."""
-        self.waiting.wait_for(False)
-        coverPage = self.select_single(objectName='coverPage')
-        coverPage.showProgress.wait_for(1)
-
-        rect = self.globalRect
-        start_x = rect[0] + rect[2] - 3
-        start_y = int(rect[1] + rect[3] / 2)
-        stop_x = int(rect[0] + rect[2] * 0.2)
-        stop_y = start_y
-        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
-
-        self.wait_swiped_away()
-
-    def get_prompt(self):
-        return self.select_single(
-            ubuntuuitoolkit.TextField, objectName='passwordInput')

=== removed file 'tests/autopilot/unity8/shell/emulators/main_window.py'
--- tests/autopilot/unity8/shell/emulators/main_window.py	2015-05-11 14:36:03 +0000
+++ tests/autopilot/unity8/shell/emulators/main_window.py	1970-01-01 00:00:00 +0000
@@ -1,199 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Unity Autopilot Test Suite
-# Copyright (C) 2012, 2013, 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 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 logging
-
-import ubuntuuitoolkit
-from autopilot import logging as autopilot_logging
-from autopilot import input
-
-from unity8.shell.emulators.greeter import Greeter
-from unity8.shell.emulators.launcher import Launcher
-
-logger = logging.getLogger(__name__)
-
-
-class QQuickView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
-    """An emulator class that makes it easy to interact with the shell"""
-
-    def get_greeter(self):
-        return self.select_single(Greeter)
-
-    def get_login_loader(self):
-        return self.select_single("QQuickLoader", objectName="loginLoader")
-
-    def get_login_list(self):
-        return self.select_single("LoginList")
-
-    def get_bottombar(self):
-        return self.select_single("Bottombar")
-
-    def get_pinPadLoader(self):
-        return self.select_single(
-            "QQuickLoader",
-            objectName="pinPadLoader"
-        )
-
-    def get_lockscreen(self):
-        return self.select_single("Lockscreen")
-
-    def get_pinentryField(self):
-        return self.select_single(objectName="pinentryField")
-
-    def _get_indicator_panel_item(self, indicator_name):
-        return self.select_single(
-            'IndicatorItem',
-            objectName=indicator_name+'-panelItem'
-        )
-
-    def _get_indicator_page(self, indicator_name):
-        return self.select_single(
-            'IndicatorPage',
-            objectName=indicator_name+'-page'
-        )
-
-    @autopilot_logging.log_action(logger.info)
-    def open_indicator_page(self, indicator_name):
-        """Swipe to open the indicator, wait until it's open.
-
-        :returns: The indicator page.
-        """
-        widget = self._get_indicator_panel_item(indicator_name)
-        start_x, start_y = input.get_center_point(widget)
-        end_x = start_x
-        end_y = self.height
-        self.pointing_device.drag(start_x, start_y, end_x, end_y)
-        self.wait_select_single('IndicatorsMenu', fullyOpened=True)
-        return self._get_indicator_page(indicator_name)
-
-    @autopilot_logging.log_action(logger.info)
-    def close_indicator_page(self):
-        """Swipe to close the opened indicator, wait until it's closed."""
-        indicators_menu = self.wait_select_single('IndicatorsMenu')
-        end_x, end_y = input.get_center_point(indicators_menu)
-        start_x = end_x
-        start_y = self.height
-        self.pointing_device.drag(start_x, start_y, end_x, end_y)
-        indicators_menu.fullyClosed.wait_for(True)
-
-    @autopilot_logging.log_action(logger.info)
-    def show_dash_swiping(self):
-        """Show the dash swiping from the left."""
-        x, y, width, height = self._get_shell().globalRect
-        start_x = x
-        end_x = x + width
-        start_y = end_y = y + height // 2
-
-        self.pointing_device.drag(start_x, start_y, end_x, end_y)
-        self.get_current_focused_app_id().wait_for('unity8-dash')
-
-    def _get_shell(self):
-        return self.select_single('Shell')
-
-    def get_current_focused_app_id(self):
-        """Return the id of the focused application."""
-        return self._get_shell().focusedApplicationId
-
-    @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()
-        self.get_current_focused_app_id().wait_for('unity8-dash')
-        launcher.shown.wait_for(False)
-
-    @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)
-
-    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)
-        launcher.shown.wait_for(False)
-
-    def enter_pin_code(self, code):
-        """Enter code 'code' into the single-pin lightdm pincode entry screen.
-
-        :param code: must be a string of numeric characters.
-        :raises: TypeError if code is not a string.
-        :raises: ValueError if code contains non-numeric characters.
-
-        """
-        if not isinstance(code, str):
-            raise TypeError(
-                "'code' parameter must be a string, not %r."
-                % type(code)
-            )
-        for num in code:
-            if not num.isdigit():
-                raise ValueError(
-                    "'code' parameter contains non-numeric characters."
-                )
-            self.pointing_device.click_object(
-                self._get_pinpad_button(int(num)))
-
-    def _get_pinpad_button(self, button_id):
-        return self.select_single(
-            'PinPadButton',
-            objectName='pinPadButton{}'.format(button_id)
-        )
-
-    def get_shell_orientation_angle(self):
-        return self._get_shell().orientationAngle
-
-    def get_shell_orientation(self):
-        return self._get_shell().orientation
-
-    def get_shell_primary_orientation(self):
-        return self._get_shell().primaryOrientation
-
-    def get_shell_native_orientation(self):
-        return self._get_shell().nativeOrientation
-
-    @autopilot_logging.log_action(logger.info)
-    def wait_for_notification(self):
-        """Wait for a notification dialog to appear.
-
-        :return: An object for the notification dialog data.
-        :raise StateNotFoundError: if the timeout expires when the
-        notification has not appeared.
-
-        """
-        notify_list = self.select_single('Notifications',
-                                         objectName='notificationList')
-        visible_notification = notify_list.wait_select_single('Notification',
-                                                              visible=True)
-        return {'summary': visible_notification.summary,
-                'body': visible_notification.body,
-                'iconSource': visible_notification.iconSource}

=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
--- tests/autopilot/unity8/shell/tests/__init__.py	2015-05-11 14:36:03 +0000
+++ tests/autopilot/unity8/shell/tests/__init__.py	2015-06-24 11:14:44 +0000
@@ -51,9 +51,9 @@
     fixture_setup,
     process_helpers
 )
-from unity8.shell.emulators import (
+from unity8 import (
     dash as dash_helpers,
-    main_window as main_window_emulator,
+    shell
 )
 
 
@@ -297,7 +297,7 @@
 
     @property
     def main_window(self):
-        return self._proxy.select_single(main_window_emulator.QQuickView)
+        return self._proxy.select_single(shell.QQuickView)
 
 
 class DashBaseTestCase(AutopilotTestCase):

=== renamed file 'tests/autopilot/unity8/shell/tests/test_emulators.py' => 'tests/autopilot/unity8/shell/tests/test_helpers.py'
--- tests/autopilot/unity8/shell/tests/test_emulators.py	2015-06-18 19:39:27 +0000
+++ tests/autopilot/unity8/shell/tests/test_helpers.py	2015-06-24 11:14:44 +0000
@@ -17,13 +17,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-"""Tests for the Dash autopilot emulators.
+"""Tests for the Dash autopilot custom proxy objects.
 
-The autopilot emulators are helpers for tests that check a user journey that
-involves the dash. The code for some of those tests will not be inside this
-branch, but in projects that depend on unity or that test the whole system
-integration. So, we need to test the helpers in order to make sure that we
-don't break them for those external projects.
+The autopilot custom proxy objects are helpers for tests that check a user
+journey that involves the dash. The code for some of those tests will not be
+inside this branch, but in projects that depend on unity or that test the
+whole system integration. So, we need to test the helpers in order to make
+sure that we don't break them for those external projects.
 
 """
 
@@ -31,8 +31,7 @@
 
 from unity8 import process_helpers
 from unity8.shell import fixture_setup, tests
-from unity8.shell.emulators import dash as dash_emulators
-from unity8.shell.emulators.dash import ListViewWithPageHeader
+from unity8 import dash as dash_helpers
 
 
 class MainWindowTestCase(tests.UnityTestCase):
@@ -45,7 +44,7 @@
         process_helpers.unlock_unity()
 
 
-class DashEmulatorTestCase(tests.DashBaseTestCase):
+class DashHelperTestCase(tests.DashBaseTestCase):
 
     def test_search(self):
         self.dash.enter_search_query('Test')
@@ -98,16 +97,16 @@
         scope_id = 'musicaggregator'
         scope = self.dash.open_scope(scope_id)
         self._assert_scope_is_opened(scope, scope_id)
-        self.assertIsInstance(scope, dash_emulators.GenericScopeView)
+        self.assertIsInstance(scope, dash_helpers.GenericScopeView)
 
     def test_open_applications_scope(self):
         scope_id = 'clickscope'
         scope = self.dash.open_scope(scope_id)
         self._assert_scope_is_opened(scope, scope_id)
-        self.assertIsInstance(scope, dash_emulators.GenericScopeView)
-
-
-class GenericScopeViewEmulatorTestCase(tests.DashBaseTestCase):
+        self.assertIsInstance(scope, dash_helpers.GenericScopeView)
+
+
+class GenericScopeViewHelperTestCase(tests.DashBaseTestCase):
 
     def setUp(self):
         # Set up the fake scopes before launching unity.
@@ -117,17 +116,17 @@
 
     def test_open_preview(self):
         preview = self.generic_scope.open_preview('0', 'Title.0.0')
-        self.assertIsInstance(preview, dash_emulators.Preview)
+        self.assertIsInstance(preview, dash_helpers.Preview)
         self.assertTrue(preview.isCurrent)
 
     def test_open_preview_of_non_visible_item(self):
         """Open an item that requires swiping to make it visible."""
         preview = self.generic_scope.open_preview('2', 'Title.2.0')
-        self.assertIsInstance(preview, dash_emulators.Preview)
+        self.assertIsInstance(preview, dash_helpers.Preview)
         self.assertTrue(preview.isCurrent)
 
 
-class DashAppsEmulatorTestCase(tests.DashBaseTestCase):
+class DashAppsHelperTestCase(tests.DashBaseTestCase):
 
     available_applications = [
         'Title.2.0', 'Title.2.1', 'Title.2.2',  'Title.2.3', 'Title.2.4',
@@ -145,7 +144,7 @@
         category_element = self.applications_scope._get_category_element(
             category)
         list_view = self.dash.get_scope('clickscope')\
-            .select_single(ListViewWithPageHeader)
+            .select_single(dash_helpers.ListViewWithPageHeader)
         expected_apps_count = self._get_number_of_application_slots(category)
         expected_applications = self.available_applications[
             :expected_apps_count]

=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
--- tests/autopilot/unity8/shell/tests/test_notifications.py	2015-05-08 12:43:34 +0000
+++ tests/autopilot/unity8/shell/tests/test_notifications.py	2015-06-24 11:14:44 +0000
@@ -362,7 +362,7 @@
         """Returns the path to the interactive notification
            creation script.
         """
-        file_path = "../../emulators/create_interactive_notification.py"
+        file_path = "../../create_interactive_notification.py"
 
         the_path = os.path.abspath(
             os.path.join(__file__, file_path))

=== modified file 'tests/autopilot/unity8/shell/tests/test_rotation.py'
--- tests/autopilot/unity8/shell/tests/test_rotation.py	2015-05-05 16:15:07 +0000
+++ tests/autopilot/unity8/shell/tests/test_rotation.py	2015-06-24 11:14:44 +0000
@@ -58,7 +58,7 @@
     def test_fake_sensor(self):
         unity_with_sensors = fixture_setup.LaunchUnityWithFakeSensors()
         self.useFixture(unity_with_sensors)
-        process_helpers.unlock_unity(unity_with_sensors.unity_proxy)
+        process_helpers.unlock_unity()
         fake_sensors = unity_with_sensors.fake_sensors
         o_proxy = unity_with_sensors.main_win.select_single('OrientedShell')
 
@@ -84,7 +84,7 @@
 
         unity_with_sensors = fixture_setup.LaunchUnityWithFakeSensors()
         self.useFixture(unity_with_sensors)
-        process_helpers.unlock_unity(unity_with_sensors.unity_proxy)
+        process_helpers.unlock_unity()
         fake_sensors = unity_with_sensors.fake_sensors
         o_proxy = unity_with_sensors.main_win.select_single('OrientedShell')
         self.shell_proxy = unity_with_sensors.main_win.select_single('Shell')

=== modified file 'tests/autopilot/unity8/shell/tests/test_tutorial.py'
--- tests/autopilot/unity8/shell/tests/test_tutorial.py	2015-04-20 16:04:34 +0000
+++ tests/autopilot/unity8/shell/tests/test_tutorial.py	2015-06-24 11:14:44 +0000
@@ -24,8 +24,8 @@
     fixture_setup,
     tests
 )
-# unused import to load the tutorial emulators custom proxy objects.
-from unity8.shell.emulators import tutorial as tutorial_emulator  # NOQA
+# unused import to load the tutorial helpers custom proxy objects.
+from unity8 import tutorial as tutorial_helpers  # NOQA
 
 
 class TutorialTestCase(tests.UnityTestCase):

=== renamed file 'tests/autopilot/unity8/shell/emulators/tutorial.py' => 'tests/autopilot/unity8/tutorial.py'