Merge lp:~canonical-platform-qa/ubuntu-system-tests/clean-install into lp:ubuntu-system-tests

[Richard Huddie]

Ensure ubuntu-system-tests installs and runs on a clean host with minimal dependencies.

This MP fixes the dependecies used by ubuntu-system-tests so it will install and run on a clean host system and also minimises the dependencies required to do so.

Changes include:
- Add missing dependencies to allow running tests (autopkgtest, phablet-tools etc.)
- Add missing dependencies required to build ubuntu-system-tests package from source
- Add missing dependencies required to list tests on host
- Remove autopilot dependencies from host and build packages - These should only be required on the test device itself
- Fix chromedriver dependency to use correct package, this fixes webapps tests (although other error with here test.)
- Add autopilot list command to the test rules so that it will run automatically to check there are no broken imports
- Add perftests folder to the ubuntu-system-tests-suite package (was missing)
- Add a try_import helper which will return a dummy object in the case of ImportError exception. This allows top-level imports to be done without requiring the packages to be installed. Which allows ubuntu-ui-toolkit-autopilot and unity8-autopilot to be removed as host dependencies which saves huge amount of install space.
- Use try_import helper for selenium imports as this is required to installed from ppa.
- Move all custom proxy objects out of the main import path of the tests, which also removes them from autopilot registry. They are now only imported by helpers when they are required.
- Remove redundant cleanup_process parameter for get_proxy_object_for_existing_app.
- Add mocking to ssh commands to reduce dependencies for selftests.
- Other minor fixes found when running tests.

I have tested this by installing onto a clean host system, running ubuntu-system-tests setup and run commands, and building debian packages.

You should also be able to list all tests without having any autopilot project installed (unity8-autopilot, ubuntu-ui-toolkit-autopilot etc.) You'll need autopilot itself installed though of course.

To test installation yourself you'll need to add following ppa to both your host and device:

sudo add-apt-repository ppa:rhuddie/ust

Adding this ppa is only required until this branch lands in trunk.

You should then be able to use ubuntu-system-tests command as normal with no autopilot/selenium packages installed on host.

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:454
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/ubuntu-system-tests/clean-install/+merge/299546/+edit-commit-message

https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/293/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/461
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/461/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/461
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/461/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/398/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/293/rebuild

review: Needs Fixing (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:454
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/294/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/462
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/462/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/462
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/462/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/399/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/294/rebuild

review: Approve (continuous-integration)

[Sergio Cazzolato (sergio-j-cazzolato)]

The tests are passing and the whole change works. I see that the code is getting more complex with this change, perhaps we could research if there is an alternative to list the tests and avoid removing all these imports. What do you think?

review: Needs Information

[Richard Huddie (rhuddie)]

> The tests are passing and the whole change works. I see that the code is
> getting more complex with this change, perhaps we could research if there is
> an alternative to list the tests and avoid removing all these imports. What do
> you think?

One thing to remember is that we are planning to remove at least some of the external dependencies, starting with unity8. So where there are some helpers that are wrappers around unity8, these would be replaced with the full implementation within ubuntu-system-tests itself. So this mp is making a start at localising those changes.

But that won't be the case for all of the imports, i.e. ubuntuuitoolkit and selenium. The only other way I can think of for that would be to do the imports in a try block and catch the ImportError exception, but that could lead to the case where a genuine import error on the device gets hidden. Have you any other thoughts?

[Richard Huddie (rhuddie)]

> The tests are passing and the whole change works. I see that the code is
> getting more complex with this change, perhaps we could research if there is
> an alternative to list the tests and avoid removing all these imports. What do
> you think?

I was thinking about mocking the imports using method we discussed previously. This will not work for the case of running the self-tests on the host, as that would require at least some the real imports to be present.

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:455
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/307/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/485
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/485/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/485
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/485/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/416/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/307/rebuild

review: Approve (continuous-integration)

[Santiago Baldassin (sbaldassin)]

Hi Richard, I still need to go through the entire mp but I rather not move the imports. Local imports, as a rule, should be used only if it's extremely necessary because for example the module that you are importing do a lot of processing causing performance issues so you actually want to import the module only if it's going to be used.
Another problem of moving the imports is that they could hide circular dependencies

review: Needs Fixing

[Richard Huddie (rhuddie)]

I'm going to see if there's another approach that could work here regarding the imports.

Just to give an idea of the current changes in install size, the trunk branch requires 560MB to install the suite and 452MB to install build-deps.

This branch currently requires 200MB to install suite and 70MB to install build-deps, which is a big reduction.

ubuntu-ui-toolkit-autopilot is 261MB and unity8-autopilot adds another 121MB to that size. So that is why I'm keen to remove them.

[Richard Huddie (rhuddie)]

I've just made an update which adds a try_import() helper to import the modules in question. Please take a look to see if you're happy with this approach: http://bazaar.launchpad.net/~canonical-platform-qa/ubuntu-system-tests/clean-install/revision/456

If so I'll update the rest of the branch to use this helper. Thanks.

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:456
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/313/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/673
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/673/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/673
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/673/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/425/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/313/rebuild

review: Approve (continuous-integration)

[Sergio Cazzolato (sergio-j-cazzolato)]

> I've just made an update which adds a try_import() helper to import the
> modules in question. Please take a look to see if you're happy with this
> approach: http://bazaar.launchpad.net/~canonical-platform-qa/ubuntu-system-
> tests/clean-install/revision/456
>
> If so I'll update the rest of the branch to use this helper. Thanks.

I prefer this change to hide all the external imports.

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:457
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/315/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/724
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/724/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/724
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/724/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/427/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/315/rebuild

review: Approve (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:467
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/316/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/1148
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/1148/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/1148
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/1148/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/429/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/316/rebuild

review: Approve (continuous-integration)

[lp:~canonical-platform-qa/ubuntu-system-tests/clean-install]

468. By Richard Huddie on 2016-07-15

here imports.

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:468
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/317/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/1155
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/1155/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/1155
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/1155/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/430/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/317/rebuild

review: Approve (continuous-integration)

[lp:~canonical-platform-qa/ubuntu-system-tests/clean-install]

469. By Richard Huddie on 2016-07-15

Merge from trunk.

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:469
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/319/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/1185
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/1185/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/1185
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/1185/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/432/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/ubuntu-system-tests-ci/319/rebuild

review: Approve (continuous-integration)

[Richard Huddie (rhuddie)]

I've updated this branch now as mentioned above to use the try_import helper. I've run through several tests and all seems to be working fine. Let me know what you think.

[Sergio Cazzolato (sergio-j-cazzolato)]

I agree with this implementation, tests passing in my device.

I was thinking that based on this implementation we could make a solution to install the dependencies for a subset of tests. For that we should use the try_import module to load and track all the modules needed, so, when we need to run a test class, we load the class and we can track all the imports needed in the try_import helper and retrieve a list of dependencies. We should have a map to know the package to install based on a dependency. We can discuss it on Monday.

Approving. I would like to wait until Santiago takes a look to the change before top approving it.

Good job richard

review: Approve

[Richard Huddie (rhuddie)]

Thanks for review Sergio.

I like the idea of discovering the dependencies for tests. I am also working on the next branch which provides the ability for dynamic dependencies, so you only use the dependencies you need for a specific group of tests: https://code.launchpad.net/~canonical-platform-qa/ubuntu-system-tests/dynamic-dependencies/+merge/299943

This has a json file which does the mapping between test cases and dependencies. Currently this is quite crude and it only distinguishes between the webapp tests that use chromedriver and all the other tests. So as the next piece of work we could try and refine the list a bit more using above approach.

[Santiago Baldassin (sbaldassin)]

Looks good to me

review: Approve

=== modified file 'debian/control'
--- debian/control	2016-05-10 16:47:27 +0000
+++ debian/control	2016-07-15 14:58:58 +0000
@@ -4,13 +4,24 @@
 Maintainer: Canonical Platform QA Team <[e-mail]>
 Build-Depends: debhelper (>= 9),
                dh-python,
-               openssh-server,
+               gir1.2-click-0.4,
+               lsb-release,
                python3-all-dev (>= 3.4),
+               python3-autopilot,
+               python3-debian,
+               python3-evdev,
                python3-fixtures,
                python3-flake8,
+               python3-gi,
+               python3-paramiko,
+               python3-pexpect,
+               python3-requests,
+               python3-retrying,
                python3-setuptools,
+               python3-subunit,
                python3-testscenarios,
-               unity8-autopilot
+               python3-warlock,
+               system-image-common,
 Standards-Version: 3.9.5
 Homepage: http://launchpad.net/ubuntu-system-tests
 X-Python3-Version: >= 3.3
@@ -33,8 +44,12 @@
 Architecture: all
 Depends: ${misc:Depends},
          ${python3:Depends},
+         autopkgtest,
+         openssh-server,
+         phablet-tools,
          subunit,
          ubuntu-system-tests-common,
+         virtualenv,
 Description: Host test runner
  This package contains scripts for running ubuntu-system-tests on a target
  device from a host machine.
@@ -52,6 +67,9 @@
 Architecture: all
 Depends: ${misc:Depends},
          ${python3:Depends},
+         libhybris-utils,
+         ofono,
+         openssh-client,
          python3-dbus,
          python3-debian,
          python3-gi,
@@ -61,6 +79,7 @@
          python3-retrying,
          python3-testtools,
          python3-warlock,
+         system-image-common,
 Description: Ubuntu-system-tests common scripts
  This package contains common scripts used by the ubuntu-system-tests host,
  helpers and suite packages.
@@ -71,6 +90,6 @@
          ${python3:Depends},
          python3-autopilot,
          ubuntu-system-tests-common,
-         unity8-autopilot,
+         ubuntu-system-tests-helpers,
 Description: Ubuntu-system-tests test suite and test data
  This package contains test suites and test data for ubuntu-system-tests.

=== modified file 'debian/rules'
--- debian/rules	2016-05-03 15:59:52 +0000
+++ debian/rules	2016-07-15 14:58:58 +0000
@@ -10,3 +10,7 @@
 override_dh_auto_build:
 	python3 -m flake8.run --max-complexity 6 .
 	dh_auto_build
+
+override_dh_auto_test:
+	dh_auto_test
+	! autopilot3 list ubuntu_system_tests | grep "ImportError:"

=== modified file 'debian/tests/control'
--- debian/tests/control	2016-06-17 11:04:19 +0000
+++ debian/tests/control	2016-07-15 14:58:58 +0000
@@ -5,6 +5,7 @@
          address-book-app-autopilot (>=0.2+15.04.20150226-0ubuntu1),  # TMPINSTALL
          camera-app,
          camera-app-autopilot,
+         chromium-chromedriver,  # TMPINSTALL
          dialer-app,
          dialer-app-autopilot,  # TMPINSTALL
          exiftool,
@@ -14,7 +15,6 @@
          mediaplayer-app-autopilot,  # TMPINSTALL
          messaging-app,
          messaging-app-autopilot,  # TMPINSTALL
-         oxideqt-chromedriver,  # TMPINSTALL
          python3-autopilot,
          python3-dbus,
          python3-debian,

=== modified file 'debian/ubuntu-system-tests-suite.install'
--- debian/ubuntu-system-tests-suite.install	2016-05-11 13:49:53 +0000
+++ debian/ubuntu-system-tests-suite.install	2016-07-15 14:58:58 +0000
@@ -1,3 +1,4 @@
+usr/lib/python3*/*/ubuntu_system_tests/perftests/
 usr/lib/python3*/*/ubuntu_system_tests/systemtests/
 usr/lib/python3*/*/ubuntu_system_tests/tests/
 ubuntu_system_tests/external_tests/ /usr/lib/python3/dist-packages/ubuntu_system_tests/

=== modified file 'ubuntu_system_tests/helpers/__init__.py'
--- ubuntu_system_tests/helpers/__init__.py	2016-06-02 12:50:05 +0000
+++ ubuntu_system_tests/helpers/__init__.py	2016-07-15 14:58:58 +0000
@@ -20,6 +20,7 @@
 
 from ubuntu_system_tests.helpers.utils import (
     AttrDict,
+    try_import,
     wait_until,
     wait_until_stable,
 )
@@ -27,6 +28,7 @@
 
 __all__ = [
     'AttrDict',
+    'try_import',
     'wait_until',
     'wait_until_stable',
 ]

=== modified file 'ubuntu_system_tests/helpers/addressbook/__init__.py'
--- ubuntu_system_tests/helpers/addressbook/__init__.py	2016-06-09 19:00:23 +0000
+++ ubuntu_system_tests/helpers/addressbook/__init__.py	2016-07-15 14:58:58 +0000
@@ -22,8 +22,10 @@
     AddressBook,
     Contact
 )
+from ubuntu_system_tests.helpers.addressbook.utils import get_test_contact
 
 __all__ = [
     'AddressBook',
-    'Contact'
+    'Contact',
+    'get_test_contact',
 ]

=== added file 'ubuntu_system_tests/helpers/addressbook/utils.py'
--- ubuntu_system_tests/helpers/addressbook/utils.py	1970-01-01 00:00:00 +0000
+++ ubuntu_system_tests/helpers/addressbook/utils.py	2016-07-15 14:58:58 +0000
@@ -0,0 +1,38 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Ubuntu System Tests
+# Copyright (C) 2016 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/>.
+#
+
+from ubuntu_system_tests.helpers import try_import
+
+addr_data = try_import('address_book_app.address_book.data')
+
+
+def get_test_contact(first_name, last_name, phone_number):
+    """
+    Return Contact object with specified details.
+
+    :param first_name: First name of contact.
+    :param last_name: Last name of contact.
+    :param phone_number: Phone number of contact.
+    :return: Contact object with specified details.
+    """
+    mobile_number = addr_data.Phone(type_='Mobile', number=phone_number)
+    return addr_data.Contact(
+        first_name=first_name, last_name=last_name,
+        phones=[mobile_number])

=== modified file 'ubuntu_system_tests/helpers/autopilot/utils.py'
--- ubuntu_system_tests/helpers/autopilot/utils.py	2016-06-09 19:56:51 +0000
+++ ubuntu_system_tests/helpers/autopilot/utils.py	2016-07-15 14:58:58 +0000
@@ -20,14 +20,18 @@
 
 from contextlib import contextmanager
 
-import ubuntuuitoolkit
 from autopilot import introspection
 from autopilot.exceptions import StateNotFoundError
 
-from ubuntu_system_tests.helpers import processes
+from ubuntu_system_tests.helpers import (
+    processes,
+    try_import,
+)
 from ubuntu_system_tests.helpers.timeout import timeout
 from ubuntu_system_tests.helpers import wait_until
 
+ubuntuuitoolkit = try_import('ubuntuuitoolkit')
+
 
 @contextmanager
 def override_proxy_timeout(proxy, timeout_seconds):
@@ -232,9 +236,7 @@
     )
 
 
-def get_proxy_object_for_existing_app(
-        process_name, cleanup_process=None,
-        base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+def get_proxy_object_for_existing_app(process_name, raw_proxy=False):
     """
     Return proxy object from existing application process.
 
@@ -243,15 +245,16 @@
     cleanup target using ensure_application_closed().
 
     :param pname: Name of required application process.
-    :param cleanup_process: Name of process to clean up.
-    :param base: custom emulator base for proxy object
+    :param raw_proxy: Whether to return a raw proxy object, or use default
+                      base class for proxy objects from ubuntuuitoolkit.
     :return: Proxy object for the desired application.
 
     """
-    if not cleanup_process:
-        cleanup_process = process_name
+    if raw_proxy:
+        base = None
+    else:
+        base = ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase
     proxy = get_proxy_object_for_existing_process(process_name, base)
-
     return proxy
 
 

=== modified file 'ubuntu_system_tests/helpers/brightness/__init__.py'
--- ubuntu_system_tests/helpers/brightness/__init__.py	2016-06-01 13:47:43 +0000
+++ ubuntu_system_tests/helpers/brightness/__init__.py	2016-07-15 14:58:58 +0000
@@ -17,7 +17,3 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-from ubuntu_system_tests.helpers.brightness._cpo import BrightnessPageBase
-
-__all__ = ['BrightnessPageBase']

=== modified file 'ubuntu_system_tests/helpers/camera/app.py'
--- ubuntu_system_tests/helpers/camera/app.py	2016-06-30 17:37:03 +0000
+++ ubuntu_system_tests/helpers/camera/app.py	2016-07-15 14:58:58 +0000
@@ -23,7 +23,6 @@
 import warlock
 
 from ubuntu_system_tests.helpers import autopilot
-from ubuntu_system_tests.helpers import click
 from ubuntu_system_tests.helpers import file_system as fs
 from ubuntu_system_tests.helpers import processes
 from ubuntu_system_tests.helpers.scopes.apps import (
@@ -99,10 +98,7 @@
 
     """
     from ubuntu_system_tests.helpers.camera._cpo import MainWindow
-    proxy = autopilot.get_proxy_object_for_existing_app(
-        APP,
-        cleanup_process=click.get_click_app_identifier(APP_CLICK)
-    )
+    proxy = autopilot.get_proxy_object_for_existing_app(APP)
     return MainWindow(proxy)
 
 

=== modified file 'ubuntu_system_tests/helpers/dekko/app.py'
--- ubuntu_system_tests/helpers/dekko/app.py	2016-06-01 13:58:27 +0000
+++ ubuntu_system_tests/helpers/dekko/app.py	2016-07-15 14:58:58 +0000
@@ -15,7 +15,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from ubuntu_system_tests.helpers import autopilot
-from ubuntu_system_tests.helpers import click
 from ubuntu_system_tests.helpers import processes
 from ubuntu_system_tests.helpers.scopes.apps import (
     launch_application_from_apps_scope)
@@ -42,5 +41,4 @@
 def get_dekko_proxy():
     """Return the proxy object of the calculator app."""
     from ubuntu_system_tests.helpers.dekko import _cpo  # NOQA
-    return autopilot.get_proxy_object_for_existing_app(
-        APP, cleanup_process=click.get_click_app_identifier(APP_CLICK_ID))
+    return autopilot.get_proxy_object_for_existing_app(APP)

=== modified file 'ubuntu_system_tests/helpers/dialer_app/fixture_setup.py'
--- ubuntu_system_tests/helpers/dialer_app/fixture_setup.py	2015-08-25 11:24:23 +0000
+++ ubuntu_system_tests/helpers/dialer_app/fixture_setup.py	2016-07-15 14:58:58 +0000
@@ -20,11 +20,12 @@
 
 import fixtures
 
-from dialer_app.fixture_setup import UseEmptyHistory
-
+from ubuntu_system_tests.helpers import try_import
 from ubuntu_system_tests.helpers.system_settings import (
     get_default_sim_for_calls, set_default_sim_for_calls)
 
+UseEmptyHistory = try_import('dialer_app.fixture_setup').UseEmptyHistory
+
 
 class DialerTestEnvironment(fixtures.Fixture):
     """Fixture used to prepare the phone environment"""

=== modified file 'ubuntu_system_tests/helpers/gallery/app.py'
--- ubuntu_system_tests/helpers/gallery/app.py	2016-06-01 14:18:12 +0000
+++ ubuntu_system_tests/helpers/gallery/app.py	2016-07-15 14:58:58 +0000
@@ -19,7 +19,6 @@
 #
 
 from ubuntu_system_tests.helpers import autopilot
-from ubuntu_system_tests.helpers import click
 from ubuntu_system_tests.helpers import processes
 from ubuntu_system_tests.helpers.scopes.apps import (
     launch_application_from_apps_scope
@@ -61,8 +60,7 @@
 
     """
     from ubuntu_system_tests.helpers.gallery._cpo import GalleryApplication
-    proxy = autopilot.get_proxy_object_for_existing_app(
-        APP, cleanup_process=click.get_click_app_identifier(APP_CLICK))
+    proxy = autopilot.get_proxy_object_for_existing_app(APP)
     return proxy.select_single(GalleryApplication)
 
 

=== added file 'ubuntu_system_tests/helpers/indicators/_cpo.py'
--- ubuntu_system_tests/helpers/indicators/_cpo.py	1970-01-01 00:00:00 +0000
+++ ubuntu_system_tests/helpers/indicators/_cpo.py	2016-07-15 14:58:58 +0000
@@ -0,0 +1,36 @@
+
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+# Ubuntu System Tests
+# Copyright (C) 2016 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/>.
+
+from unity8 import indicators
+
+from ubuntu_system_tests.helpers.ubuntuuitoolkit._qquicklistview import (
+    QQuickListView,
+)
+
+
+class IndicatorPage(indicators.IndicatorPage):
+    """Extend IndicatorPage from Unity8."""
+
+    def _get_listview(self):
+        """Return the list view object from the indicator."""
+        return self.select_single(QQuickListView, objectName='mainMenu')
+
+    def press_label(self, text):
+        """Press the label in the list view of the indicator."""
+        self._get_listview().press_label(text)

=== modified file 'ubuntu_system_tests/helpers/indicators/battery.py'
--- ubuntu_system_tests/helpers/indicators/battery.py	2016-06-08 08:07:44 +0000
+++ ubuntu_system_tests/helpers/indicators/battery.py	2016-07-15 14:58:58 +0000
@@ -16,11 +16,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from ubuntu_system_tests.helpers.brightness import BrightnessPageBase
-from ubuntu_system_tests.helpers.indicators.utils import(
-    IndicatorPage,
-    INDICATOR_PAGE_PATH
-)
+from ubuntu_system_tests.helpers.brightness._cpo import BrightnessPageBase
+from ubuntu_system_tests.helpers.indicators.utils import INDICATOR_PAGE_PATH
+from ubuntu_system_tests.helpers.indicators._cpo import IndicatorPage
 from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
 from ubuntu_system_tests.helpers import unity8
 

=== modified file 'ubuntu_system_tests/helpers/indicators/bluetooth.py'
--- ubuntu_system_tests/helpers/indicators/bluetooth.py	2016-06-01 15:05:13 +0000
+++ ubuntu_system_tests/helpers/indicators/bluetooth.py	2016-07-15 14:58:58 +0000
@@ -16,10 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from ubuntu_system_tests.helpers.indicators.utils import(
-    IndicatorPage,
-    INDICATOR_PAGE_PATH
-)
+from ubuntu_system_tests.helpers.indicators.utils import INDICATOR_PAGE_PATH
+from ubuntu_system_tests.helpers.indicators._cpo import IndicatorPage
 from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
 from ubuntu_system_tests.helpers import unity8
 

=== modified file 'ubuntu_system_tests/helpers/indicators/datetime.py'
--- ubuntu_system_tests/helpers/indicators/datetime.py	2016-06-01 15:05:13 +0000
+++ ubuntu_system_tests/helpers/indicators/datetime.py	2016-07-15 14:58:58 +0000
@@ -16,10 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from ubuntu_system_tests.helpers.indicators.utils import(
-    IndicatorPage,
-    INDICATOR_PAGE_PATH
-)
+from ubuntu_system_tests.helpers.indicators.utils import INDICATOR_PAGE_PATH
+from ubuntu_system_tests.helpers.indicators._cpo import IndicatorPage
 from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
 from ubuntu_system_tests.helpers import unity8
 

=== modified file 'ubuntu_system_tests/helpers/indicators/message.py'
--- ubuntu_system_tests/helpers/indicators/message.py	2016-06-01 15:04:34 +0000
+++ ubuntu_system_tests/helpers/indicators/message.py	2016-07-15 14:58:58 +0000
@@ -23,10 +23,8 @@
 import ubuntuuitoolkit as uuitk
 
 from ubuntu_system_tests.helpers import ofono, unity8
-from ubuntu_system_tests.helpers.indicators.utils import(
-    IndicatorPage,
-    INDICATOR_PAGE_PATH
-)
+from ubuntu_system_tests.helpers.indicators.utils import INDICATOR_PAGE_PATH
+from ubuntu_system_tests.helpers.indicators._cpo import IndicatorPage
 from ubuntu_system_tests.helpers.autopilot import(
     validate_dbus_object,
     wait_select_many,

=== modified file 'ubuntu_system_tests/helpers/indicators/network/_cpo.py'
--- ubuntu_system_tests/helpers/indicators/network/_cpo.py	2016-06-01 15:05:13 +0000
+++ ubuntu_system_tests/helpers/indicators/network/_cpo.py	2016-07-15 14:58:58 +0000
@@ -19,10 +19,8 @@
 
 import ubuntuuitoolkit as uuitk
 
-from ubuntu_system_tests.helpers.indicators.utils import(
-    IndicatorPage,
-    INDICATOR_PAGE_PATH
-)
+from ubuntu_system_tests.helpers.indicators.utils import INDICATOR_PAGE_PATH
+from ubuntu_system_tests.helpers.indicators._cpo import IndicatorPage
 from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
 from ubuntu_system_tests.helpers import unity8
 from ubuntu_system_tests.helpers.ubuntuuitoolkit.switchmenu import SwitchMenu

=== modified file 'ubuntu_system_tests/helpers/indicators/sound.py'
--- ubuntu_system_tests/helpers/indicators/sound.py	2016-06-01 15:05:13 +0000
+++ ubuntu_system_tests/helpers/indicators/sound.py	2016-07-15 14:58:58 +0000
@@ -18,10 +18,8 @@
 
 import ubuntuuitoolkit as uuitk
 
-from ubuntu_system_tests.helpers.indicators.utils import(
-    IndicatorPage,
-    INDICATOR_PAGE_PATH
-)
+from ubuntu_system_tests.helpers.indicators.utils import INDICATOR_PAGE_PATH
+from ubuntu_system_tests.helpers.indicators._cpo import IndicatorPage
 from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
 from ubuntu_system_tests.helpers import unity8
 from ubuntu_system_tests.helpers.ubuntuuitoolkit.switchmenu import SwitchMenu

=== modified file 'ubuntu_system_tests/helpers/indicators/utils.py'
--- ubuntu_system_tests/helpers/indicators/utils.py	2016-06-09 19:06:08 +0000
+++ ubuntu_system_tests/helpers/indicators/utils.py	2016-07-15 14:58:58 +0000
@@ -19,10 +19,7 @@
 
 import logging
 
-from unity8 import indicators
-
 from ubuntu_system_tests.helpers import context
-from ubuntu_system_tests.helpers.ubuntuuitoolkit._qquicklistview import QQuickListView  # NOQA
 
 INDICATOR_PAGE_PATH = b'IndicatorPage'
 
@@ -43,18 +40,6 @@
 logger = logging.getLogger(__name__)
 
 
-class IndicatorPage(indicators.IndicatorPage):
-    """Extend IndicatorPage from Unity8."""
-
-    def _get_listview(self):
-        """Return the list view object from the indicator."""
-        return self.select_single(QQuickListView, objectName='mainMenu')
-
-    def press_label(self, text):
-        """Press the label in the list view of the indicator."""
-        self._get_listview().press_label(text)
-
-
 class Indicator:
 
     def __init__(self, main_window, name, page):

=== modified file 'ubuntu_system_tests/helpers/mediascanner.py'
--- ubuntu_system_tests/helpers/mediascanner.py	2016-04-13 15:02:39 +0000
+++ ubuntu_system_tests/helpers/mediascanner.py	2016-07-15 14:58:58 +0000
@@ -21,9 +21,12 @@
 import dbus
 import logging
 
-from unity8 import process_helpers
-
 from ubuntu_system_tests.helpers.dbus_observer import DBusObserver
+from ubuntu_system_tests.helpers.processes import (
+    is_job_running,
+    start_job,
+    stop_job,
+)
 from ubuntu_system_tests.helpers.threads import StoppingThread
 
 MEDIA_SCANNER = 'mediascanner-2.0'
@@ -38,14 +41,14 @@
 
 def stop_media_scanner():
     """ Stop the media scanner process """
-    if process_helpers.is_job_running(MEDIA_SCANNER):
-        process_helpers.stop_job(MEDIA_SCANNER)
+    if is_job_running(MEDIA_SCANNER):
+        stop_job(MEDIA_SCANNER)
 
 
 def start_media_scanner():
     """ Start the media scanner process """
-    if not process_helpers.is_job_running(MEDIA_SCANNER):
-        process_helpers.start_job(MEDIA_SCANNER)
+    if not is_job_running(MEDIA_SCANNER):
+        start_job(MEDIA_SCANNER)
 
 
 class MediaScannerObserver(DBusObserver):

=== modified file 'ubuntu_system_tests/helpers/messaging/app.py'
--- ubuntu_system_tests/helpers/messaging/app.py	2016-06-02 08:19:07 +0000
+++ ubuntu_system_tests/helpers/messaging/app.py	2016-07-15 14:58:58 +0000
@@ -19,7 +19,6 @@
 
 from collections import namedtuple
 from math import ceil
-import ubuntuuitoolkit
 
 from ubuntu_system_tests.helpers import autopilot
 from ubuntu_system_tests.helpers import processes
@@ -104,17 +103,16 @@
     return processes.is_process_running(APP)
 
 
-def get_messaging_app_proxy(
-        base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+def get_messaging_app_proxy(raw_proxy=False):
     """
     Return messaging app proxy object from existing process.
 
     :return: Proxy object for messaging application.
 
     """
-    if not base:
-        return autopilot.get_proxy_object_for_existing_app(APP,
-                                                           base=base)
+    if raw_proxy:
+        return autopilot.get_proxy_object_for_existing_app(
+            APP, raw_proxy=raw_proxy)
 
     from ubuntu_system_tests.helpers.messaging._cpo import MainView
     proxy = autopilot.get_proxy_object_for_existing_app(APP)

=== modified file 'ubuntu_system_tests/helpers/messaging/fixture_setup.py'
--- ubuntu_system_tests/helpers/messaging/fixture_setup.py	2015-12-14 09:58:30 +0000
+++ ubuntu_system_tests/helpers/messaging/fixture_setup.py	2016-07-15 14:58:58 +0000
@@ -24,10 +24,13 @@
 import shutil
 import subprocess
 
-from messaging_app import fixture_setup
+from ubuntu_system_tests.helpers import (
+    file_system as fs,
+    system_settings,
+    try_import,
+)
 
-from ubuntu_system_tests.helpers import file_system as fs
-from ubuntu_system_tests.helpers import system_settings
+fixture_setup = try_import('messaging_app.fixture_setup')
 
 MESSAGING_APP_CONF = 'com.ubuntu.messaging-app/MessagingApp.conf'
 

=== modified file 'ubuntu_system_tests/helpers/processes.py'
--- ubuntu_system_tests/helpers/processes.py	2016-06-08 19:11:00 +0000
+++ ubuntu_system_tests/helpers/processes.py	2016-07-15 14:58:58 +0000
@@ -25,13 +25,36 @@
 
 import psutil
 
-from unity8.process_helpers import get_job_status
+from ubuntu_system_tests.helpers import (
+    try_import,
+    wait_until,
+)
 
-from ubuntu_system_tests.helpers import wait_until
+process_helpers = try_import('unity8.process_helpers')
 
 logger = logging.getLogger(__name__)
 
 
+def get_job_pid(name):
+    return process_helpers.get_job_pid(name)
+
+
+def get_job_status(name):
+    return process_helpers.get_job_status(name)
+
+
+def is_job_running(name):
+    return process_helpers.is_job_running(name)
+
+
+def start_job(name, *args):
+    return process_helpers.start_job(name, *args)
+
+
+def stop_job(name):
+    return process_helpers.stop_job(name)
+
+
 def is_process_running(pname):
     try:
         return bool(get_process_ids(pname))

=== modified file 'ubuntu_system_tests/helpers/scopes/music/_cpo.py'
--- ubuntu_system_tests/helpers/scopes/music/_cpo.py	2016-06-21 14:49:38 +0000
+++ ubuntu_system_tests/helpers/scopes/music/_cpo.py	2016-07-15 14:58:58 +0000
@@ -144,7 +144,7 @@
 
     def is_category_displayed(self, category):
         """ Indicates if a category section is being displayed """
-        is_element(self._get_category, category)
+        is_element(self._get_category_section, category)
 
     def select_category(self, header):
         """

=== modified file 'ubuntu_system_tests/helpers/sensors.py'
--- ubuntu_system_tests/helpers/sensors.py	2016-04-25 19:02:31 +0000
+++ ubuntu_system_tests/helpers/sensors.py	2016-07-15 14:58:58 +0000
@@ -21,12 +21,15 @@
 import os
 import subprocess
 
-from unity8.sensors import FakePlatformSensors as Unity8Sensors
-
-from ubuntu_system_tests.helpers import context
+from ubuntu_system_tests.helpers import (
+    context,
+    try_import,
+)
 from ubuntu_system_tests.helpers.power import write_to_powerd_fifo
 from ubuntu_system_tests.helpers.testbed import run_command_with_sudo as sudo
 
+Unity8Sensors = try_import('unity8.sensors').FakePlatformSensors
+
 DELAY_MS = 10
 ACCEL_SENSOR_RESOLUTION = 0.1
 ACCEL_SENSOR_MAX = 1000
@@ -120,7 +123,7 @@
 
 
 def set_orientation(orientation):
-    """Set accelerometer sensor orientation to specified value.
+    """Set orientation sensor to specified value.
     :param orientation: Orientation to set.
     """
     Unity8Sensors(context.shared.get('unity_pid')).set_orientation(orientation)

=== modified file 'ubuntu_system_tests/helpers/system_settings/__init__.py'
--- ubuntu_system_tests/helpers/system_settings/__init__.py	2016-06-02 10:38:49 +0000
+++ ubuntu_system_tests/helpers/system_settings/__init__.py	2016-07-15 14:58:58 +0000
@@ -30,6 +30,7 @@
     get_rotation_lock,
     get_silent_mode,
     get_system_settings_proxy,
+    is_reporting_enabled,
     is_system_settings_running,
     launch_system_settings,
     set_default_modem_for_calls,
@@ -56,6 +57,7 @@
     'get_rotation_lock',
     'get_silent_mode',
     'get_system_settings_proxy',
+    'is_reporting_enabled',
     'is_system_settings_running',
     'launch_system_settings',
     'set_default_modem_for_calls',

=== modified file 'ubuntu_system_tests/helpers/system_settings/_cpo.py'
--- ubuntu_system_tests/helpers/system_settings/_cpo.py	2016-06-01 16:14:35 +0000
+++ ubuntu_system_tests/helpers/system_settings/_cpo.py	2016-07-15 14:58:58 +0000
@@ -29,7 +29,7 @@
 from ubuntu_system_tests.helpers.autopilot import (
     validate_dbus_object, is_element)
 from ubuntu_system_tests.helpers.autopilot.list import order_by_y_coord
-from ubuntu_system_tests.helpers.brightness import BrightnessPageBase
+from ubuntu_system_tests.helpers.brightness._cpo import BrightnessPageBase
 
 logger = logging.getLogger(__name__)
 

=== modified file 'ubuntu_system_tests/helpers/system_settings/app.py'
--- ubuntu_system_tests/helpers/system_settings/app.py	2016-06-02 10:38:49 +0000
+++ ubuntu_system_tests/helpers/system_settings/app.py	2016-07-15 14:58:58 +0000
@@ -18,7 +18,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+import configparser
 import dbus
+import os
 from subprocess import (
     CalledProcessError,
     check_call,
@@ -64,8 +66,7 @@
 
     """
     from ubuntu_system_tests.helpers.system_settings import _cpo  # NOQA
-    proxy = autopilot.get_proxy_object_for_existing_app(
-        APP, cleanup_process=APP_WIN_ID)
+    proxy = autopilot.get_proxy_object_for_existing_app(APP)
     return proxy.main_view
 
 
@@ -191,3 +192,14 @@
 def set_silent_mode(state):
     """Set boolean value for silent mode setting."""
     _get_sound_interface().SetState('silent-mode', state, [])
+
+
+def is_reporting_enabled():
+    """ Detect if the reporting is enabled """
+    file = os.path.join('/', 'etc', 'writable', 'whoopsie')
+    if not os.path.isfile(file):
+        return True
+
+    config = configparser.ConfigParser()
+    config.read(file)
+    return 'report_metrics' not in config.options('General')

=== modified file 'ubuntu_system_tests/helpers/ubuntu_keyboard/__init__.py'
--- ubuntu_system_tests/helpers/ubuntu_keyboard/__init__.py	2016-06-02 10:49:38 +0000
+++ ubuntu_system_tests/helpers/ubuntu_keyboard/__init__.py	2016-07-15 14:58:58 +0000
@@ -20,6 +20,7 @@
 
 from ubuntu_system_tests.helpers.ubuntu_keyboard.utils import (
     APP,
+    get_keyboard,
     get_ubuntu_keyboard_proxy,
     is_keyboard_shifted,
 )
@@ -27,6 +28,7 @@
 
 __all__ = [
     'APP',
+    'get_keyboard',
     'get_ubuntu_keyboard_proxy',
     'is_keyboard_shifted',
 ]

=== modified file 'ubuntu_system_tests/helpers/ubuntu_keyboard/utils.py'
--- ubuntu_system_tests/helpers/ubuntu_keyboard/utils.py	2016-06-02 10:49:38 +0000
+++ ubuntu_system_tests/helpers/ubuntu_keyboard/utils.py	2016-07-15 14:58:58 +0000
@@ -18,8 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from ubuntu_keyboard.emulators.keyboard import Keyboard
-
 from ubuntu_system_tests.helpers import autopilot
 
 APP = 'maliit-server'
@@ -31,5 +29,9 @@
 
 
 def is_keyboard_shifted():
-    keyboard = Keyboard()
-    return keyboard.active_keypad_state == 'SHIFTED'
+    return get_keyboard().active_keypad_state == 'SHIFTED'
+
+
+def get_keyboard():
+    from ubuntu_keyboard.emulators.keyboard import Keyboard
+    return Keyboard()

=== modified file 'ubuntu_system_tests/helpers/unity8/__init__.py'
--- ubuntu_system_tests/helpers/unity8/__init__.py	2016-06-02 11:07:46 +0000
+++ ubuntu_system_tests/helpers/unity8/__init__.py	2016-07-15 14:58:58 +0000
@@ -19,28 +19,34 @@
 #
 
 from ubuntu_system_tests.helpers.unity8.utils import (
+    APP_WIN_NAME,
     close_all_apps,
     close_app,
     ensure_unity_running_and_greeter_hidden,
     ensure_unity_stopped,
     get_dash,
+    get_unity_pid,
     launch_application_from_launcher,
+    lock_unity,
     PROC_NAME,
     UNITY8_PATH_ROOT,
     UNITY8_DASH_PATH_ROOT,
-    APP_WIN_NAME,
+    unlock_unity,
 )
 
 
 __all__ = [
+    'APP_WIN_NAME',
     'close_all_apps',
     'close_app',
     'ensure_unity_running_and_greeter_hidden',
     'ensure_unity_stopped',
     'get_dash',
+    'get_unity_pid',
     'launch_application_from_launcher',
+    'lock_unity',
     'PROC_NAME',
     'UNITY8_PATH_ROOT',
     'UNITY8_DASH_PATH_ROOT',
-    'APP_WIN_NAME',
+    'unlock_unity',
 ]

=== modified file 'ubuntu_system_tests/helpers/unity8/settings_wizard.py'
--- ubuntu_system_tests/helpers/unity8/settings_wizard.py	2016-02-03 10:40:06 +0000
+++ ubuntu_system_tests/helpers/unity8/settings_wizard.py	2016-07-15 14:58:58 +0000
@@ -16,9 +16,7 @@
 # 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 configparser
 import logging
-import os
 import re
 
 import autopilot
@@ -27,6 +25,9 @@
 
 from ubuntu_system_tests.helpers.autopilot import (
     override_proxy_timeout, validate_dbus_object)
+from ubuntu_system_tests.helpers.system_settings import (
+    is_reporting_enabled,
+)
 from ubuntu_system_tests.helpers.unity8 import UNITY8_PATH_ROOT
 
 logger = logging.getLogger(__name__)
@@ -36,17 +37,6 @@
     return current_page.get_root_instance().select_single(Wizard)
 
 
-def reporting_page_included():
-    """ Detect if the reporting was set by default """
-    file = os.path.join('/', 'etc', 'writable', 'whoopsie')
-    if not os.path.isfile(file):
-        return True
-
-    config = configparser.ConfigParser()
-    config.read(file)
-    return 'report_metrics' not in config.options('General')
-
-
 class Wizard(UbuntuUIToolkitCustomProxyObjectBase):
     """High-level helper to navigate through the pages of the wizard"""
 
@@ -489,7 +479,7 @@
     @autopilot.logging.log_action(logger.info)
     def continue_(self):
         self.pointing_device.click_object(self._get_continue_button())
-        if reporting_page_included():
+        if is_reporting_enabled():
             return get_wizard(self).get_reporting_page()
         else:
             return get_wizard(self).get_finished_page()

=== modified file 'ubuntu_system_tests/helpers/unity8/shell.py'
--- ubuntu_system_tests/helpers/unity8/shell.py	2016-06-13 10:43:31 +0000
+++ ubuntu_system_tests/helpers/unity8/shell.py	2016-07-15 14:58:58 +0000
@@ -25,11 +25,8 @@
     logging as autopilot_logging
 )
 import ubuntuuitoolkit
-from unity8.shell.emulators import main_window
 
 from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
-from ubuntu_system_tests.helpers.indicators.message import NotificationsIndicatorPage, NotificationsIndicatorItem  # NOQA
-from ubuntu_system_tests.helpers.notifications.utils import Notifications
 from ubuntu_system_tests.helpers.unity8 import (
     greeter as greeter_helpers, UNITY8_PATH_ROOT)
 
@@ -48,6 +45,7 @@
 
     @property
     def main_window(self):
+        from ubuntu_system_tests.helpers.unity8.shell_view import ShellView
         return self.select_single(ShellView)
 
     @autopilot_logging.log_action(logger.debug)
@@ -82,88 +80,3 @@
         except exceptions.StateNotFoundError:
             # This is fine, it's already loaded
             pass
-
-
-class ShellView(main_window.ShellView):
-    """Class to extend Unity8 main window ShellView."""
-
-    @classmethod
-    def validate_dbus_object(cls, path, state):
-        return validate_dbus_object(
-            path, state, UNITY8_PATH_ROOT, b'ShellView', title='Unity8')
-
-    def get_notifications_list(self):
-        """Return a list of notifications currently being displayed."""
-        return self.select_single(
-            Notifications, objectName='notificationList')
-
-    def get_notifications_panel(self):
-        """Return 'Notifications' panel object."""
-        return self._get_indicator_panel_item('indicator-messages')
-
-    def clear_notifications(self):
-        """
-        Clear all existing notifications from 'Notifications' indicator.
-
-        """
-        if self.is_new_notification_displayed():
-            self.open_indicator_page('indicator-messages').clear_all()
-            self.close_indicator_page()
-
-    def open_notifications_indicator(self):
-        """Swipe down to display the notifications indicator."""
-        return self.open_indicator_page('indicator-messages')
-
-    def is_new_notification_displayed(self):
-        """Return True if new notification message icon is displayed."""
-        return self.get_notifications_panel().is_new_message_displayed()
-
-    def get_passphrase_unlock_screen(self):
-        """Wait for input method to be in shown state and return lockscreen."""
-        from ubuntu_system_tests.helpers.unity8 import lock_screen
-        input_method = self.wait_select_single(
-            'InputMethod', objectName='inputMethod', visible=True)
-        input_method.state.wait_for('shown')
-        return self.select_single(lock_screen.PassphraseLockscreen)
-
-    def get_missed_call_snap_decision(self):
-        """Return missed call snap decision menu."""
-        from ubuntu_system_tests.helpers.snap_decision import missed_call
-        return self.select_single(
-            missed_call.SnapDecisionMenu, objectName='snapDecision',
-            visible=True)
-
-    def get_phone_stage(self):
-        from ubuntu_system_tests.helpers.unity8 import phone_stage
-        return self.select_single(phone_stage.PhoneStage, objectName='stage')
-
-    def swipe_to_show_app_switcher(self):
-        """Swipe from right edge to reveal task switcher."""
-        stage = self.get_phone_stage()
-        stage.swipe_to_top()
-        return stage
-
-    def get_current_focused_app(self):
-        """Return Id for current focused app."""
-        return self.select_single('Shell').focusedApplicationId
-
-    def _is_indicator_panel_opened(self):
-        indicator_page = self.wait_select_single('IndicatorsMenu')
-        return indicator_page.fullyOpened
-
-    def close_indicator_page(self):
-        """
-        Override the method to only try to close the indicator panel if its
-        not already.
-        """
-        if self._is_indicator_panel_opened():
-            super().close_indicator_page()
-
-    def is_indicator_item_hidden(self, indicator_name):
-        """
-        Return bool representing if the requested indicator item is hidden or
-        not.
-        """
-        item = self.select_single('IndicatorItem',
-                                  objectName=indicator_name + '-panelItem')
-        return item.hidden

=== added file 'ubuntu_system_tests/helpers/unity8/shell_view.py'
--- ubuntu_system_tests/helpers/unity8/shell_view.py	1970-01-01 00:00:00 +0000
+++ ubuntu_system_tests/helpers/unity8/shell_view.py	2016-07-15 14:58:58 +0000
@@ -0,0 +1,116 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Ubuntu System Tests
+# Copyright (C) 2015, 2016 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/>.
+#
+
+from unity8.shell.emulators import main_window
+
+from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
+from ubuntu_system_tests.helpers.indicators.message import NotificationsIndicatorItem  # NOQA
+from ubuntu_system_tests.helpers.notifications.utils import Notifications
+from ubuntu_system_tests.helpers.unity8 import UNITY8_PATH_ROOT
+
+
+class ShellView(main_window.ShellView):
+    """Class to extend Unity8 main window ShellView."""
+
+    @classmethod
+    def validate_dbus_object(cls, path, state):
+        return validate_dbus_object(
+            path, state, UNITY8_PATH_ROOT, b'ShellView', title='Unity8')
+
+    def get_notifications_list(self):
+        """Return a list of notifications currently being displayed."""
+        return self.select_single(
+            Notifications, objectName='notificationList')
+
+    def get_notifications_panel(self):
+        """Return 'Notifications' panel object."""
+        return self._get_indicator_panel_item('indicator-messages')
+
+    def clear_notifications(self):
+        """
+        Clear all existing notifications from 'Notifications' indicator.
+
+        """
+        if self.is_new_notification_displayed():
+            self.open_indicator_page('indicator-messages').clear_all()
+            self.close_indicator_page()
+
+    def open_notifications_indicator(self):
+        """Swipe down to display the notifications indicator."""
+        return self.open_indicator_page('indicator-messages')
+
+    def is_new_notification_displayed(self):
+        """Return True if new notification message icon is displayed."""
+        return self.get_notifications_panel().is_new_message_displayed()
+
+    def get_passphrase_unlock_screen(self):
+        """Wait for input method to be in shown state and return lockscreen."""
+        from ubuntu_system_tests.helpers.unity8 import lock_screen
+        input_method = self.wait_select_single(
+            'InputMethod', objectName='inputMethod', visible=True)
+        input_method.state.wait_for('shown')
+        return self.select_single(lock_screen.PassphraseLockscreen)
+
+    def get_missed_call_snap_decision(self):
+        """Return missed call snap decision menu."""
+        from ubuntu_system_tests.helpers.snap_decision import missed_call
+        return self.select_single(
+            missed_call.SnapDecisionMenu, objectName='snapDecision',
+            visible=True)
+
+    def get_phone_stage(self):
+        from ubuntu_system_tests.helpers.unity8 import phone_stage
+        return self.select_single(phone_stage.PhoneStage, objectName='stage')
+
+    def swipe_to_show_app_switcher(self):
+        """Swipe from right edge to reveal task switcher."""
+        stage = self.get_phone_stage()
+        stage.swipe_to_top()
+        return stage
+
+    def get_settings_wizard(self):
+        """Return settings wizard custom proxy object."""
+        from ubuntu_system_tests.helpers.unity8.settings_wizard import Wizard
+        return self.select_single(Wizard)
+
+    def get_current_focused_app(self):
+        """Return Id for current focused app."""
+        return self.select_single('Shell').focusedApplicationId
+
+    def _is_indicator_panel_opened(self):
+        indicator_page = self.wait_select_single('IndicatorsMenu')
+        return indicator_page.fullyOpened
+
+    def close_indicator_page(self):
+        """
+        Override the method to only try to close the indicator panel if its
+        not already.
+        """
+        if self._is_indicator_panel_opened():
+            super().close_indicator_page()
+
+    def is_indicator_item_hidden(self, indicator_name):
+        """
+        Return bool representing if the requested indicator item is hidden or
+        not.
+        """
+        item = self.select_single('IndicatorItem',
+                                  objectName=indicator_name + '-panelItem')
+        return item.hidden

=== modified file 'ubuntu_system_tests/helpers/unity8/utils.py'
--- ubuntu_system_tests/helpers/unity8/utils.py	2016-06-02 11:07:46 +0000
+++ ubuntu_system_tests/helpers/unity8/utils.py	2016-07-15 14:58:58 +0000
@@ -18,17 +18,22 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from ubuntuuitoolkit import UbuntuUIToolkitCustomProxyObjectBase
-from unity8 import process_helpers
-
-from autopilot import introspection
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
 
-from ubuntu_system_tests.helpers import context
-from ubuntu_system_tests.helpers import timer
+from ubuntu_system_tests.helpers import (
+    context,
+    processes,
+    timer,
+    try_import,
+)
+from ubuntu_system_tests.helpers.autopilot import (
+    get_proxy_object_for_existing_app,
+)
 from ubuntu_system_tests.helpers.unity8 import greeter
 
+process_helpers = try_import('unity8.process_helpers')
+
 PROC_NAME = 'unity8'
 UNITY8_PATH_ROOT = b'unity8'
 UNITY8_DASH_PATH_ROOT = b'unity8-dash'
@@ -37,30 +42,38 @@
 
 def ensure_unity_stopped():
     if _is_unity8_running():
-        process_helpers.stop_job('unity8')
+        processes.stop_job('unity8')
     Eventually(Equals(False), timeout=300).match(_is_unity8_running)
 
 
 def ensure_unity_running_and_greeter_hidden():
     if not _is_unity8_running():
-        process_helpers.start_job('unity8')
+        processes.start_job('unity8')
         greeter.wait_for_greeter()
 
     greeter.hide_greeter_with_dbus()
 
 
+def get_unity_pid():
+    return process_helpers._get_unity_pid()
+
+
+def lock_unity():
+    process_helpers.lock_unity()
+
+
+def unlock_unity():
+    process_helpers.unlock_unity()
+
+
 def _is_unity8_running():
-    return process_helpers.is_job_running('unity8')
+    return processes.is_job_running('unity8')
 
 
 def get_dash():
     """Return the Unity8 Dash autopilot custom proxy object."""
     from ubuntu_system_tests.helpers.unity8.dash import Dash
-    pid = process_helpers.get_job_pid('unity8-dash')
-    dash_proxy = introspection.get_proxy_object_for_existing_process(
-        pid=pid,
-        emulator_base=UbuntuUIToolkitCustomProxyObjectBase,
-    )
+    dash_proxy = get_proxy_object_for_existing_app('unity8-dash')
     return dash_proxy.select_single(Dash)
 
 

=== modified file 'ubuntu_system_tests/helpers/utils.py'
--- ubuntu_system_tests/helpers/utils.py	2016-06-02 12:50:05 +0000
+++ ubuntu_system_tests/helpers/utils.py	2016-07-15 14:58:58 +0000
@@ -18,9 +18,43 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+import logging
 import time
 
 from collections import deque
+from importlib import import_module
+from inspect import stack
+
+logger = logging.getLogger(__name__)
+
+
+def try_import(name, package=None):
+    """
+    Import named module from package and return it or DummyObject if not found.
+
+    This method is used in cases where an import is made but should not raise
+    an ImportError if the module is not found. The main usage for this is
+    where an autopilot package is not installed on the host, but it is still
+    required to list all availble tests on the host. In this case the test
+    module must import successfully, but won't actually be executed so it is
+    not neccessary to have the dependency installed.
+
+    If a DummyObject is returned this allows any attributes or methods to be
+    imported from the DummyObject without error.
+
+    :param name: Absolute or relative name of module to import.
+    :param package: If name is relative, package must specify the name of the
+                    package to import from.
+    :return: Imported module or DummyObject if it doesn't exist.
+
+    """
+    try:
+        return import_module(name, package)
+    except ImportError as e:
+        logger.warn(e.msg)
+        logger.warn('DummyObject created for module: {m} at: {i}'.format(
+            m=name, i=_get_caller_info()))
+        return DummyObject()
 
 
 def wait_until(predicate, *args, timeout=10, period=1, stop_event=None,
@@ -105,9 +139,49 @@
         return bool(result)
 
 
+def _get_caller_info(stack_level=2):
+    """Return info string about the caller of the calling function.
+
+    :param stack_level: Number of level up the call stack to check.
+    :return: String info showing file path and line number.
+    """
+    caller = stack()[stack_level]
+    return '{path}:{line}'.format(path=caller[1], line=caller[2])
+
+
 class AttrDict(dict):
     """ Class used to access to the dict keys as parameters """
 
     def __init__(self, *args, **kwargs):
         super(AttrDict, self).__init__(*args, **kwargs)
         self.__dict__ = self
+
+
+class DummyObject:
+    """
+    Class used to create objects with dummy attributes and methods.
+
+    This is used when an object is required to return a dummy attribute value
+    or method result rather than raise a AttributeError or TypeError
+    exception.
+
+    This class can be used to create objects that support nested attributes
+    and methods.
+
+    """
+
+    def __init__(self, *args, **kwargs):
+        pass
+
+    def __getattribute__(self, name):
+        """Return a refernce to self for every attribute value to support
+        nested attributes."""
+        logger.warn('Accessing DummyObject attribute: {n} from: {f}'.format(
+            n=name, f=_get_caller_info()))
+        return self
+
+    def __call__(self, *args, **kwargs):
+        """Return a reference to self for every function call to support
+        nested function calls."""
+        logger.warn('DummyObject call from: {}'.format(_get_caller_info()))
+        return self

=== modified file 'ubuntu_system_tests/helpers/webapp/ebay.py'
--- ubuntu_system_tests/helpers/webapp/ebay.py	2016-05-06 22:37:58 +0000
+++ ubuntu_system_tests/helpers/webapp/ebay.py	2016-07-15 14:58:58 +0000
@@ -18,11 +18,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from selenium.webdriver.support.ui import WebDriverWait
-
-from ubuntu_system_tests.helpers import webapp
+from ubuntu_system_tests.helpers import (
+    try_import,
+    webapp,
+)
 from ubuntu_system_tests.helpers.webapp import BasePage
 
+WebDriverWait = try_import('selenium.webdriver.support.ui').WebDriverWait
+
 WEBAPP_NAME = 'eBay'
 WEBAPP_PACKAGE = 'com.ubuntu.developer.webapps.webapp-ebay'
 WEBAPP_WIN_ID = 'com.ubuntu.developer.webapps.webapp-ebay_webapp-ebay'

=== modified file 'ubuntu_system_tests/helpers/webapp/here.py'
--- ubuntu_system_tests/helpers/webapp/here.py	2016-05-06 22:37:58 +0000
+++ ubuntu_system_tests/helpers/webapp/here.py	2016-07-15 14:58:58 +0000
@@ -20,14 +20,17 @@
 
 import re
 
-from selenium.common.exceptions import TimeoutException
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.ui import WebDriverWait
-
-from ubuntu_system_tests.helpers import webapp
+from ubuntu_system_tests.helpers import (
+    try_import,
+    webapp,
+)
 from ubuntu_system_tests.helpers.webapp import BasePage
 
+TimeoutException = try_import('selenium.common.exceptions').TimeoutException
+By = try_import('selenium.webdriver.common.by').By
+EC = try_import('selenium.webdriver.support.expected_conditions')
+WebDriverWait = try_import('selenium.webdriver.support.ui').WebDriverWait
+
 WEBAPP_NAME = 'HERE Maps'
 WEBAPP_PACKAGE = 'com.nokia.heremaps'
 WEBAPP_WIN_ID = 'com.nokia.heremaps_here'

=== modified file 'ubuntu_system_tests/helpers/webapp/utils.py'
--- ubuntu_system_tests/helpers/webapp/utils.py	2016-06-09 19:56:51 +0000
+++ ubuntu_system_tests/helpers/webapp/utils.py	2016-07-15 14:58:58 +0000
@@ -24,17 +24,20 @@
 import os
 import time
 
-from selenium import webdriver
-from selenium.webdriver.chrome.options import Options
-from selenium.webdriver.common.touch_actions import TouchActions
-
-from ubuntu_system_tests.helpers import autopilot
-from ubuntu_system_tests.helpers import processes
+from ubuntu_system_tests.helpers import (
+    autopilot,
+    processes,
+    try_import,
+)
 from ubuntu_system_tests.helpers.scopes.apps import (
     launch_application_from_apps_scope
 )
 from ubuntu_system_tests.helpers import wait_until
 
+webdriver = try_import('selenium.webdriver')
+Options = webdriver.chrome.options.Options
+TouchActions = webdriver.common.touch_actions.TouchActions
+
 DEFAULT_WEBVIEW_INSPECTOR_IP = '127.0.0.1'
 DEFAULT_WEBVIEW_INSPECTOR_PORT = 9221
 
@@ -138,7 +141,7 @@
     :returns: a string containing the chromedriver executable path
     """
     base_deps_dir = ''
-    default_path = 'usr/lib/*/oxide-qt/chromedriver'
+    default_path = 'usr/lib/chromium-browser/chromedriver'
     adt_artifacts = os.path.dirname(os.getenv('ADT_ARTIFACTS', default=''))
 
     # This check is to avoid using a dependencies dir which has not been

=== modified file 'ubuntu_system_tests/helpers/webbrowser/fixture_setup.py'
--- ubuntu_system_tests/helpers/webbrowser/fixture_setup.py	2016-03-28 17:58:25 +0000
+++ ubuntu_system_tests/helpers/webbrowser/fixture_setup.py	2016-07-15 14:58:58 +0000
@@ -24,9 +24,11 @@
 import time
 
 import fixtures
-from ubuntuuitoolkit import fixture_setup as ubuntuuitoolkit_fixtures
 
-from ubuntu_system_tests.helpers import sqlite
+from ubuntu_system_tests.helpers import (
+    sqlite,
+    try_import,
+)
 from ubuntu_system_tests.helpers.backup_restore_fixture import (
     BackupRestoreFixture)
 from ubuntu_system_tests.helpers.download_manager import (
@@ -37,6 +39,8 @@
 from ubuntu_system_tests.helpers.media import BackupRestoreLocalMediaFixture
 from ubuntu_system_tests.helpers.webbrowser import APP
 
+ubuntuuitoolkit_fixtures = try_import('ubuntuuitoolkit.fixture_setup')
+
 
 class WebbrowserTestEnvironment(fixtures.Fixture):
     """Fixture to prepare webbrowser test environment."""

=== modified file 'ubuntu_system_tests/selftests/test_commands.py'
--- ubuntu_system_tests/selftests/test_commands.py	2016-07-04 09:20:08 +0000
+++ ubuntu_system_tests/selftests/test_commands.py	2016-07-15 14:58:58 +0000
@@ -66,7 +66,16 @@
 
         self.assertNotIn('-s', command)
 
-    def test_adt_run_must_be_called_with_short_timeout(self):
+
[e-mail]('ubuntu_system_tests.common.ssh.get_ssh_config_commands')
+class BuildAdtRunCommandTestCase(selftests.ConfigBaseTestCase):
+
+    def setUp(self):
+        super().setUp()
+        self.config_stack = config.UbuntuSystemTestsConfig()
+
+    def test_adt_run_must_be_called_with_short_timeout(
+            self, mock_ssh_config_commands):
         self.set_config_values()
 
         command = commands.build_adt_run_test_command(
@@ -75,20 +84,26 @@
 
         run_arguments, _ = command.split('---')
         self.assertIn('--timeout-short=600', run_arguments)
+        mock_ssh_config_commands.assert_called_once_with()
 
-    def test_adt_run_command_no_rw_file_mount(self):
+    def test_adt_run_command_no_rw_file_mount(
+            self, mock_ssh_config_commands):
         self.set_config_values()
         run_cmd = ' '.join(commands.build_adt_run_test_command(
             self.config_stack, config.KEY_DEFAULT))
         self.assertNotIn('mount -o remount,rw /', run_cmd)
+        mock_ssh_config_commands.assert_called_once_with()
 
-    def test_adt_run_command_ro_file_mount(self):
+    def test_adt_run_command_ro_file_mount(
+            self, mock_ssh_config_commands):
         self.set_config_values()
         run_cmd = ' '.join(commands.build_adt_run_test_command(
             self.config_stack, config.KEY_DEFAULT))
         self.assertIn('mount -o remount,ro /', run_cmd)
+        mock_ssh_config_commands.assert_called_once_with()
 
-    def test_adt_run_with_serial(self):
+    def test_adt_run_with_serial(
+            self, mock_ssh_config_commands):
         serial = 'test_serial'
         self.set_config_values(device_serial=serial)
 
@@ -98,8 +113,10 @@
 
         _, adb_arguments = command.split('ssh -s adb --')
         self.assertIn('-s test_serial', adb_arguments)
+        mock_ssh_config_commands.assert_called_once_with()
 
-    def test_adt_run_without_serial(self):
+    def test_adt_run_without_serial(
+            self, mock_ssh_config_commands):
         self.set_config_values(device_serial='')
 
         command = commands.build_adt_run_test_command(
@@ -108,8 +125,10 @@
 
         _, adb_arguments = command.split('ssh -s adb --')
         self.assertNotIn('-s test_serial', adb_arguments)
+        mock_ssh_config_commands.assert_called_once_with()
 
-    def test_adt_run_command_with_network_ready_creates_no_network(self):
+    def test_adt_run_command_with_network_ready_creates_no_network(
+            self, mock_ssh_config_commands):
         self.set_config_values()
 
         command = commands.build_adt_run_test_command(
@@ -117,8 +136,10 @@
 
         self.assertFalse(check_any_item_in_list_startswith_value(
             command, 'nmcli device wifi connect'))
+        mock_ssh_config_commands.assert_called_once_with()
 
-    def test_adt_run_command_with_default_parameters_creates_network(self):
+    def test_adt_run_command_with_default_parameters_creates_network(
+            self, mock_ssh_config_commands):
         self.set_config_values()
 
         command = commands.build_adt_run_test_command(
@@ -126,19 +147,24 @@
 
         self.assertTrue(check_any_item_in_list_startswith_value(
             command, 'nmcli device wifi connect'))
+        mock_ssh_config_commands.assert_called_once_with()
 
-    def test_enabling_verbose_option(self):
+    def test_enabling_verbose_option(
+            self, mock_ssh_config_commands):
         self.set_config_values()
         command = commands.build_adt_run_test_command(
             self.config_stack, config.KEY_DEFAULT, verbose=True)
         self.assertTrue(check_any_item_in_list_contains_value(command, '-ddd'))
+        mock_ssh_config_commands.assert_called_once_with()
 
-    def test_verbose_disabled_by_default(self):
+    def test_verbose_disabled_by_default(
+            self, mock_ssh_config_commands):
         self.set_config_values()
         command = commands.build_adt_run_test_command(
             self.config_stack, config.KEY_DEFAULT)
         self.assertFalse(
             check_any_item_in_list_contains_value(command, '-ddd'))
+        mock_ssh_config_commands.assert_called_once_with()
 
 
 class SetupCommandTestCase(selftests.ConfigBaseTestCase):

=== modified file 'ubuntu_system_tests/selftests/test_tests_to_run.py'
--- ubuntu_system_tests/selftests/test_tests_to_run.py	2016-06-06 09:53:20 +0000
+++ ubuntu_system_tests/selftests/test_tests_to_run.py	2016-07-15 14:58:58 +0000
@@ -133,7 +133,7 @@
     'ubuntu_system_tests.helpers.unity8.utils.greeter',
     new_callable=FakeGreeterHelpers)
 @mock.patch(
-    'ubuntu_system_tests.helpers.unity8.utils.process_helpers',
+    'ubuntu_system_tests.helpers.unity8.utils.processes',
     new_callable=FakeProcessHelpers)
 class EnsureUnityInRequiredStateTestCase(unittest.TestCase):
 

=== modified file 'ubuntu_system_tests/tests/base.py'
--- ubuntu_system_tests/tests/base.py	2016-07-13 09:57:44 +0000
+++ ubuntu_system_tests/tests/base.py	2016-07-15 14:58:58 +0000
@@ -32,46 +32,58 @@
     logging as autopilot_logging,
     testcase
 )
-from autopilot._fixtures import OSKAlwaysEnabled
 from autopilot.introspection import _object_registry as object_registry
-from ubuntuuitoolkit import fixture_setup
-from unity8 import process_helpers
 
-from ubuntu_system_tests.helpers import autopilot
-from ubuntu_system_tests.helpers import context
-from ubuntu_system_tests.helpers import images
-from ubuntu_system_tests.helpers import mir
+from ubuntu_system_tests.helpers import (
+    autopilot,
+    context,
+    images,
+    mir,
+    try_import,
+)
 from ubuntu_system_tests.helpers.location.fixture_setup import (
     SetLocationAccessRequests)
 from ubuntu_system_tests.helpers.notifications import sim_pin_observer
 from ubuntu_system_tests.helpers import ofono
-from ubuntu_system_tests.helpers.processes import wait_for_job_spawned
+from ubuntu_system_tests.helpers.processes import (
+    start_job,
+    wait_for_job_spawned,
+)
 from ubuntu_system_tests.helpers import screen
 from ubuntu_system_tests.helpers.timeout import timeout
-from ubuntu_system_tests.helpers import unity8
-from ubuntu_system_tests.helpers.unity8 import get_dash
-from ubuntu_system_tests.helpers.unity8 import sensors
-from ubuntu_system_tests.helpers.unity8.shell import Unity8  # NOQA
+from ubuntu_system_tests.helpers.unity8 import (
+    ensure_unity_running_and_greeter_hidden,
+    ensure_unity_stopped,
+    get_dash,
+    get_unity_pid,
+    PROC_NAME,
+    sensors,
+)
 from ubuntu_system_tests.helpers import wait_until
-from ubuntu_system_tests.helpers import webapp
+from ubuntu_system_tests.helpers.webapp import (
+    DEFAULT_WEBVIEW_INSPECTOR_IP,
+    DEFAULT_WEBVIEW_INSPECTOR_PORT,
+)
 
 # Any test name ending with this will leave device locked
 TEST_ID_DEVICE_LOCKED = 'device_locked'
 
 logger = logging.getLogger(__name__)
 
+fixture_setup = try_import('ubuntuuitoolkit.fixture_setup')
+
 
 class BaseUbuntuSystemTestCase(testcase.AutopilotTestCase):
 
     @classmethod
     def setUpClass(cls):
-        unity8.ensure_unity_stopped()
+        ensure_unity_stopped()
         super().setUpClass()
 
     @classmethod
     def tearDownClass(cls):
         super().tearDownClass()
-        unity8.ensure_unity_running_and_greeter_hidden()
+        ensure_unity_running_and_greeter_hidden()
 
     def setUp(self, allow_scopes_location=True):
         super().setUp()
@@ -87,6 +99,7 @@
         context.shared.retry_time = 10000
 
     def _get_unity8_proxy_object(self):
+        from ubuntu_system_tests.helpers.unity8.shell import Unity8  # NOQA
         return autopilot.get_job_proxy_object('unity8')
 
     @autopilot_logging.log_action(logger.info)
@@ -114,8 +127,6 @@
         self._remove_autopilot_keyboard()
         self._reset_keyboard()
         self._enable_osk_for_uitk()
-        # Workaround for bug lp:1474444
-        self.useFixture(OSKAlwaysEnabled())
         # Disable setting touch visualization due to bug:
         # https://bugs.launchpad.net/bugs/1602600
         # This should be re-enabled once an alternative method is provided.
@@ -155,11 +166,11 @@
         args = ['QT_LOAD_TESTABILITY=1']
         if no_wait:
             args.append('--no-wait')
-        process_helpers.start_job(unity8.PROC_NAME, *args)
+        start_job(PROC_NAME, *args)
         if no_wait:
             # just wait for job to be spawned rather than fully running
-            wait_for_job_spawned(unity8.PROC_NAME)
-        context.shared.unity_pid = process_helpers._get_unity_pid()
+            wait_for_job_spawned(PROC_NAME)
+        context.shared.unity_pid = get_unity_pid()
 
     def _enable_osk_for_uitk(self):
         """Enable use of the OSK with uitk helpers."""
@@ -231,7 +242,7 @@
         :returns: The proxy object for the Unity8 shell
 
         """
-        unity8.ensure_unity_stopped()
+        ensure_unity_stopped()
         unity_proxy = self.launch_unity(fake_sensors=fake_sensors)
         if self.device_unlock_required():
             unity_proxy.unlock()
@@ -281,6 +292,5 @@
         """
         self.useFixture(fixture_setup.InitctlEnvironmentVariable(
             global_=True,
-            UBUNTU_WEBVIEW_DEVTOOLS_HOST=webapp.DEFAULT_WEBVIEW_INSPECTOR_IP,
-            UBUNTU_WEBVIEW_DEVTOOLS_PORT=str(
-                webapp.DEFAULT_WEBVIEW_INSPECTOR_PORT)))
+            UBUNTU_WEBVIEW_DEVTOOLS_HOST=DEFAULT_WEBVIEW_INSPECTOR_IP,
+            UBUNTU_WEBVIEW_DEVTOOLS_PORT=str(DEFAULT_WEBVIEW_INSPECTOR_PORT)))

=== modified file 'ubuntu_system_tests/tests/test_add_contact.py'
--- ubuntu_system_tests/tests/test_add_contact.py	2016-06-30 13:45:35 +0000
+++ ubuntu_system_tests/tests/test_add_contact.py	2016-07-15 14:58:58 +0000
@@ -20,9 +20,10 @@
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
 
-from address_book_app.address_book.data import Phone, Contact
-
-from ubuntu_system_tests.helpers.addressbook import AddressBook
+from ubuntu_system_tests.helpers.addressbook import (
+    AddressBook,
+    get_test_contact,
+)
 from ubuntu_system_tests.tests import base
 from ubuntu_system_tests.helpers.addressbook import (
     fixture_setup as addressbook_fixtures)
@@ -47,18 +48,11 @@
         unity_proxy.unlock()
         self.useFixture(addressbook_fixtures.AddressBookTestEnvironment())
 
-    @staticmethod
-    def get_test_contact():
-        mobile_number = Phone(type_='Mobile', number=TYPED_MOBILE)
-        return Contact(
-            first_name=FIRST_NAME, last_name=LAST_NAME,
-            phones=[mobile_number])
-
     def test_add_contact_with_name_and_number(self):
         self.addressbook_app.launch_from_scope(return_proxy=False)
         address_book = self.addressbook_app.proxy_object.main_window
 
-        test_contact = self.get_test_contact()
+        test_contact = get_test_contact(FIRST_NAME, LAST_NAME, TYPED_MOBILE)
         test_contact_name = (
             test_contact.first_name + ' ' + test_contact.last_name)
 

=== modified file 'ubuntu_system_tests/tests/test_calls.py'
--- ubuntu_system_tests/tests/test_calls.py	2016-07-15 09:44:25 +0000
+++ ubuntu_system_tests/tests/test_calls.py	2016-07-15 14:58:58 +0000
@@ -45,7 +45,9 @@
 )
 from ubuntu_system_tests.helpers.autopilot import input
 from ubuntu_system_tests.helpers.data import load_test_metadata
-from ubuntu_system_tests.helpers.dialer_app import fixture_setup as dialer_fixture_setup  # NOQA
+from ubuntu_system_tests.helpers.dialer_app import (
+    fixture_setup as dialer_fixture_setup
+)
 from ubuntu_system_tests.helpers import indicators
 from ubuntu_system_tests.helpers.indicators import(
     network as network_indicator

=== modified file 'ubuntu_system_tests/tests/test_messaging_sms.py'
--- ubuntu_system_tests/tests/test_messaging_sms.py	2016-03-02 12:20:50 +0000
+++ ubuntu_system_tests/tests/test_messaging_sms.py	2016-07-15 14:58:58 +0000
@@ -37,7 +37,6 @@
     fixture_setup as network_fixture
 )
 from ubuntu_system_tests.helpers import ofono
-from ubuntu_system_tests.helpers.indicators.message import NotificationsIndicatorPage, NotificationsIndicatorItem  # NOQA
 from ubuntu_system_tests.helpers.system_settings import SIM_1, SIM_ASK
 from ubuntu_system_tests.helpers.uid import b64_uuid
 from ubuntu_system_tests.helpers import webbrowser

=== modified file 'ubuntu_system_tests/tests/test_settings_wizard.py'
--- ubuntu_system_tests/tests/test_settings_wizard.py	2016-05-06 16:39:14 +0000
+++ ubuntu_system_tests/tests/test_settings_wizard.py	2016-07-15 14:58:58 +0000
@@ -22,9 +22,10 @@
     is_agps_supported, is_wifi_supported
 )
 from ubuntu_system_tests.helpers import testbed
+from ubuntu_system_tests.helpers.system_settings import (
+    is_reporting_enabled,
+)
 from ubuntu_system_tests.helpers.unity8.fixture_setup import SettingsWizard
-from ubuntu_system_tests.helpers.unity8 import settings_wizard
-from ubuntu_system_tests.helpers.unity8.settings_wizard import Wizard
 
 from ubuntu_system_tests.tests import base
 
@@ -65,7 +66,7 @@
 
     def _get_settings_wizard(self):
         """Wait for the settings wizard to appear and return Wizard object"""
-        return self.unity.wait_select_single(Wizard)
+        return self.unity.main_window.get_settings_wizard()
 
     def _test_language_page(self):
         """Get the language page, check default language and continue"""
@@ -181,7 +182,7 @@
             self.config[KEY_WIFI_SSID],
             self.config[KEY_WIFI_PASSWORD])
 
-        if settings_wizard.reporting_page_included():
+        if is_reporting_enabled():
             # Validate the reporting page when  it is part of the wizard
             reporting_page = self._test_location_support(
                 location_supported, next_page)

=== modified file 'ubuntu_system_tests/tests/test_tutorial.py'
--- ubuntu_system_tests/tests/test_tutorial.py	2015-05-21 18:15:40 +0000
+++ ubuntu_system_tests/tests/test_tutorial.py	2016-07-15 14:58:58 +0000
@@ -21,13 +21,11 @@
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
 
-from unity8.shell import fixture_setup
-
-# unused import to load the tutorial custom proxy objects.
-from unity8.shell.emulators import tutorial  # NOQA
-
+from ubuntu_system_tests.helpers import try_import
 from ubuntu_system_tests.tests import base
 
+fixture_setup = try_import('unity8.shell.fixture_setup')
+
 
 class TutorialTestCase(base.BaseUbuntuSystemTestCase):
 
@@ -36,6 +34,9 @@
         self.useFixture(fixture_setup.Tutorial(True))
 
     def test_complete_tutorial(self):
+        # TODO: This test needs to be re-written for the new tutorial.
+        # unused import to load the tutorial custom proxy objects.
+        from unity8.shell.emulators import tutorial  # NOQA
         unity = self.launch_unity()
 
         greeter = unity.main_window.get_greeter()

=== modified file 'ubuntu_system_tests/tests/test_ubuntu_keyboard.py'
--- ubuntu_system_tests/tests/test_ubuntu_keyboard.py	2016-02-12 15:42:55 +0000
+++ ubuntu_system_tests/tests/test_ubuntu_keyboard.py	2016-07-15 14:58:58 +0000
@@ -20,8 +20,6 @@
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
 
-from ubuntu_keyboard.emulators.keyboard import Keyboard as UbuntuKeyboard
-
 from ubuntu_system_tests.tests import base
 from ubuntu_system_tests.helpers.messaging import(
     fixture_setup as messaging_fixture
@@ -48,6 +46,7 @@
         self.unity_proxy = self.restart_unity()
         self.useFixture(messaging_fixture.SetDefaultSIM())
         self.messaging_app = messaging_helpers.launch_messaging_app()
+        self.osk = osk_helpers.get_keyboard()
 
     def _focus_message_input_field_to_invoke_keyboard(self):
         # Due to some reason, using the proxy object with uitk emulator base,
@@ -55,7 +54,7 @@
         # settings are reset during the test. Getting the proxy object without
         # custom emulator base, solves the issue. --om26er 16-12-2015
         messaging_app_raw_proxy = messaging_helpers.get_messaging_app_proxy(
-            base=None)
+            raw_proxy=True)
         return messaging_helpers.focus_message_input_field(
             messaging_app_raw_proxy, self.messaging_app.pointing_device)
 
@@ -81,12 +80,11 @@
         self.assertThat(lambda: osk_helpers.is_keyboard_shifted(),
                         Eventually(Equals(True)))
 
-        keyboard = UbuntuKeyboard()
-        keyboard.type('Hello my friend. ')
+        self.osk.type('Hello my friend. ')
         self.assertThat(lambda: osk_helpers.is_keyboard_shifted(),
                         Eventually(Equals(True)))
 
-        keyboard.type('\b')
+        self.osk.type('\b')
         self.assertThat(lambda: osk_helpers.is_keyboard_shifted(),
                         Eventually(Equals(False)))
 
@@ -117,20 +115,19 @@
         6. Press a space and type 'i' and ensure that the word 'I' is shown
            capitalized as bold
         """
-        osk = UbuntuKeyboard()
-        osk.type(INITIAL_TEXT)
+        self.osk.type(INITIAL_TEXT)
         proxy = osk_helpers.get_ubuntu_keyboard_proxy()
         word_ribbon_list = proxy.keyboard.word_ribbon_list
 
         suggestions_list = word_ribbon_list.get_suggested_words()
         self._assert_words_in_ribbon(suggestions_list, EXPECTED_WORDS)
 
-        osk.type(' ')
+        self.osk.type(' ')
         self.assertThat(self.input_field.text, Eventually(Equals(SENTENCE_1)))
         self.assertThat(lambda: word_ribbon_list.is_suggestions_list_empty(),
                         Eventually(Equals(True)))
 
-        osk.type(UNIQUE_WORD_1)
+        self.osk.type(UNIQUE_WORD_1)
         self.assertThat(lambda: word_ribbon_list.is_text_bold(UNIQUE_WORD_1),
                         Eventually(Equals(True)))
         word_ribbon_list.tap_suggested_word(text=UNIQUE_WORD_1)
@@ -138,10 +135,10 @@
         self.assertThat(self.input_field.text,
                         Eventually(Equals(expected_text)))
 
-        osk.type(UNIQUE_WORD_2)
+        self.osk.type(UNIQUE_WORD_2)
         self.assertThat(lambda: word_ribbon_list.is_text_bold(UNIQUE_WORD_2),
                         Eventually(Equals(True)))
 
-        osk.type(' i')
+        self.osk.type(' i')
         self.assertThat(lambda: word_ribbon_list.is_text_bold('I'),
                         Eventually(Equals(True)))

=== modified file 'ubuntu_system_tests/tests/test_with_dialer.py'
--- ubuntu_system_tests/tests/test_with_dialer.py	2016-02-03 22:25:18 +0000
+++ ubuntu_system_tests/tests/test_with_dialer.py	2016-07-15 14:58:58 +0000
@@ -20,9 +20,11 @@
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
 
-from unity8 import process_helpers as unity_helpers
-
 from ubuntu_system_tests.helpers import dialer_app
+from ubuntu_system_tests.helpers.unity8 import (
+    lock_unity,
+    unlock_unity,
+)
 from ubuntu_system_tests.tests import base
 
 
@@ -44,8 +46,8 @@
         self.assertThat(self.dialer_app.contacts_page.active,
                         Eventually(Equals(True)))
 
-        unity_helpers.lock_unity()
-        unity_helpers.unlock_unity()
+        lock_unity()
+        unlock_unity()
 
         self.assertThat(self.dialer_app.contacts_page.active,
                         Eventually(Equals(True)))

=== modified file 'ubuntu_system_tests/tests/test_with_webbrowser.py'
--- ubuntu_system_tests/tests/test_with_webbrowser.py	2016-05-26 10:40:07 +0000
+++ ubuntu_system_tests/tests/test_with_webbrowser.py	2016-07-15 14:58:58 +0000
@@ -26,8 +26,6 @@
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
 
-from ubuntu_keyboard.emulators import keyboard
-
 from ubuntu_system_tests.helpers import autopilot
 from ubuntu_system_tests.helpers.data import load_test_metadata
 from ubuntu_system_tests.helpers import file_system as fs
@@ -390,10 +388,6 @@
         self.browser.copy_url_text()
 
         messaging_app = messaging.launch_messaging_app_from_launcher()
-        # Apparently the OSK stays visible if the app was switched while
-        # the keyboard was on screen. Reported: LP: 1505630
-        keyboard.Keyboard().dismiss()
-
         text_entry = messaging_app.paste_text_in_message_field()
         self.assertThat(
             text_entry.text,

=== modified file 'ubuntu_system_tests/tests/webapps/base.py'
--- ubuntu_system_tests/tests/webapps/base.py	2016-06-02 13:30:35 +0000
+++ ubuntu_system_tests/tests/webapps/base.py	2016-07-15 14:58:58 +0000
@@ -18,10 +18,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from ubuntu_system_tests.tests import base
-
-
-class BaseWebAppTestCase(base.BaseUbuntuSystemTestCase):
+from ubuntu_system_tests.tests.base import BaseUbuntuSystemTestCase
+
+
+class BaseWebAppTestCase(BaseUbuntuSystemTestCase):
     """ Base class to be used for all the WebApp tests """
 
     def setUp(self):