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

[Omer Akram]

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

426. By Omer Akram on 2016-07-29

Introduce patched_select()

427. By Omer Akram on 2016-08-01

remove PID helpers, use from autopilot

428. By Omer Akram on 2016-08-02

Fix alarm test

429. By Omer Akram on 2016-08-02

Fix indicator sound tests

430. By Omer Akram on 2016-08-02

Don't restart unity twice, fix network indicator tests to work without SIM

431. By Omer Akram on 2016-08-03

Minor changes

Unmerged revisions

431. By Omer Akram on 2016-08-03

Minor changes

430. By Omer Akram on 2016-08-02

Don't restart unity twice, fix network indicator tests to work without SIM

429. By Omer Akram on 2016-08-02

Fix indicator sound tests

428. By Omer Akram on 2016-08-02

Fix alarm test

427. By Omer Akram on 2016-08-01

remove PID helpers, use from autopilot

426. By Omer Akram on 2016-07-29

Introduce patched_select()

425. By Omer Akram on 2016-07-28

Port to use new autopilot APIs

=== modified file 'debian/tests/dependencies.json'
--- debian/tests/dependencies.json	2016-07-18 16:39:49 +0000
+++ debian/tests/dependencies.json	2016-08-03 05:45:48 +0000
@@ -89,7 +89,6 @@
                 "gallery-app-autopilot",
                 "mediaplayer-app-autopilot",
                 "messaging-app-autopilot",
-                "python3-autopilot",
                 "python3-dbus",
                 "python3-debian",
                 "python3-gi",

=== modified file 'ubuntu_system_tests/helpers/addressbook/_cpo.py'
--- ubuntu_system_tests/helpers/addressbook/_cpo.py	2016-05-06 22:37:58 +0000
+++ ubuntu_system_tests/helpers/addressbook/_cpo.py	2016-08-03 05:45:48 +0000
@@ -23,8 +23,7 @@
 from autopilot.exceptions import StateNotFoundError
 from ubuntuuitoolkit import UbuntuUIToolkitCustomProxyObjectBase
 
-from ubuntu_system_tests.helpers.autopilot import (
-    validate_dbus_object, wait_select_many)
+from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
 
 APP_PATH_ROOT = b'AddressBookApp'
 
@@ -83,10 +82,9 @@
 
     def _get_sorted_contact_delegates(self):
         """Over-ride base helper to use wait_select_many."""
-        contact_delegates = wait_select_many(
-            self, type_name='ContactDelegate', visible=True)
-        return sorted(
-            contact_delegates, key=lambda delegate: delegate.globalRect.y)
+        return self.wait_select_many(
+            'ContactDelegate', ap_result_sort_keys=['globalRect.y'],
+            visible=True)
 
 
 class ABContactViewPage(address_book_app.pages.ABContactViewPage):

=== modified file 'ubuntu_system_tests/helpers/autopilot/__init__.py'
--- ubuntu_system_tests/helpers/autopilot/__init__.py	2016-06-01 15:22:43 +0000
+++ ubuntu_system_tests/helpers/autopilot/__init__.py	2016-08-03 05:45:48 +0000
@@ -26,13 +26,8 @@
     get_proxy_object_for_existing_app,
     get_proxy_object_for_existing_process,
     get_proxy_object_for_existing_qmlscene_process,
-    is_element,
-    override_proxy_timeout,
-    patched_select_single,
-    patched_wait_select_single,
+    patched_select,
     validate_dbus_object,
-    wait_select_many,
-    wait_select_single,
 )
 
 
@@ -44,11 +39,6 @@
     'get_proxy_object_for_existing_app',
     'get_proxy_object_for_existing_process',
     'get_proxy_object_for_existing_qmlscene_process',
-    'is_element',
-    'override_proxy_timeout',
-    'patched_select_single',
-    'patched_wait_select_single',
+    'patched_select',
     'validate_dbus_object',
-    'wait_select_many',
-    'wait_select_single',
 ]

=== removed file 'ubuntu_system_tests/helpers/autopilot/input.py'
--- ubuntu_system_tests/helpers/autopilot/input.py	2016-04-18 15:09:45 +0000
+++ ubuntu_system_tests/helpers/autopilot/input.py	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-# -*- 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/>.
-#
-
-import evdev
-
-from autopilot.input._uinput import _get_devnode_path
-
-from ubuntu_system_tests.helpers import wait_until
-
-INPUT_DEVICE_NAME = 'autopilot-power-button'
-
-input_device = None
-
-
-def press_power_button():
-    """Simulate a power key press event."""
-    global input_device
-    input_device = evdev.UInput(name=INPUT_DEVICE_NAME,
-                                devnode=_get_devnode_path())
-    # wait until the input device is ready
-    if not wait_until(_get_input_device, period=0.5):
-        raise(RuntimeError('Could not find UInput device.'))
-    # Send a press and release event
-    input_device.write(evdev.ecodes.EV_KEY, evdev.ecodes.KEY_POWER, 1)
-    input_device.write(evdev.ecodes.EV_KEY, evdev.ecodes.KEY_POWER, 0)
-    input_device.syn()
-    input_device.close()
-    input_device = None
-
-
-def _get_input_device():
-    """Find the autopilot input device if it is available and save instace
-    in the input_device global variable.
-    :return: True if input device found, False otherwise."""
-    global input_device
-    device = input_device._find_device()
-    if device:
-        input_device.device = device
-    return device

=== modified file 'ubuntu_system_tests/helpers/autopilot/list.py'
--- ubuntu_system_tests/helpers/autopilot/list.py	2016-03-15 17:46:31 +0000
+++ ubuntu_system_tests/helpers/autopilot/list.py	2016-08-03 05:45:48 +0000
@@ -18,65 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from autopilot.display import is_point_on_any_screen
-from autopilot.exceptions import StateNotFoundError
-
-from ubuntu_system_tests.helpers.autopilot.object import (
-    _get_y_and_x, _get_x_and_y)
-
-
-def order_by_x_coord(object_list, include_off_screen=False):
-    """
-    Return an ordered list of objects ordered by x co-ordinate first
-    and then y co-ordinate second if x co-ordinates match.
-
-    :param object_list: List of objects containing globalRect property.
-    :param include_off_screen: Whether to include objects that are not within
-                               the bounds of any screen.
-    :return: List of sorted objects.
-
-    """
-    return _order_by_key(object_list, _get_x_and_y, include_off_screen)
-
-
-def _order_by_key(object_list, sort_key, include_off_screen):
-    """
-    Return an ordered list of objects ordered by key.
-
-    :param object_list: List of objects containing globalRect property.
-    :param sort_key: Sorting key to use.
-    :param include_off_screen: Whether to include objects that are not within
-                               the bounds of any screen.
-    :return: List of sorted objects.
-
-    """
-    objects = []
-    for obj in object_list:
-        try:
-            # If obj is no longer valid this can cause excpetion
-            point = obj.globalRect.x, obj.globalRect.y
-            if include_off_screen:
-                objects.append(obj)
-            elif is_point_on_any_screen(point):
-                objects.append(obj)
-        except StateNotFoundError:
-            pass
-    return sorted(objects, key=sort_key)
-
-
-def order_by_y_coord(object_list, include_off_screen=False):
-    """
-    Return an ordered list of objects ordered by y co-ordinate first
-    and then x co-ordinate second if y co-ordinates match.
-
-    :param object_list: List of objects containing globalRect property.
-    :param include_off_screen: Whether to include objects that are not within
-                               the bounds of any screen.
-    :return: List of sorted objects.
-
-    """
-    return _order_by_key(object_list, _get_y_and_x, include_off_screen)
-
 
 def list_contains_data(list, data):
     """Return True if any item in list contains specified data."""

=== removed file 'ubuntu_system_tests/helpers/autopilot/object.py'
--- ubuntu_system_tests/helpers/autopilot/object.py	2016-06-01 13:03:21 +0000
+++ ubuntu_system_tests/helpers/autopilot/object.py	1970-01-01 00:00:00 +0000
@@ -1,139 +0,0 @@
-# -*- 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  received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-import sys
-import time
-
-from autopilot.exceptions import StateNotFoundError
-
-from ubuntu_system_tests.helpers import wait_until
-
-CO_ORD_MAX = (sys.maxsize, sys.maxsize)
-
-
-def _get_y_and_x(item):
-    """
-    Return y and x co-ordinates for specified object.
-
-    :param item: Item to check
-    :return: (y, x) co-ordinates
-    """
-    try:
-        # If item is no longer valid this can cause exception
-        co_ords = item.globalRect.y, item.globalRect.x
-    except StateNotFoundError:
-        # Trying to sort an object that no longer exists
-        # return a dummy key value so this item is sorted last
-        co_ords = CO_ORD_MAX
-    return co_ords
-
-
-def _get_x_and_y(item):
-    """
-    Return x and y co-ordinates for specified object.
-
-    :param item: Item to check
-    :return: (x, y) co-ordinates
-    """
-    try:
-        # If item is no longer valid this can cause exception
-        co_ords = item.globalRect.x, item.globalRect.y
-    except StateNotFoundError:
-        # Trying to sort an object that no longer exists
-        # return a dummy key value so this item is sorted last
-        co_ords = CO_ORD_MAX
-    return co_ords
-
-
-def get_object_path(item):
-    """Return the object path of a specified item."""
-    return item._path.decode('utf-8')
-
-
-def wait_until_is_not_moving(elem, move_time=0.5, timeout=10):
-    """ Wait until the autopilot element is not moving based on its globalRect
-    coordinates
-    :param elem: autopilot element to check
-    :param move_time: time in seconds between the coordinates are retrieved
-    :param timeout: total time to wait until the element is not moving
-    :return: True when the element is not moving before the timeout is reached,
-    otherwise return False
-    """
-    return wait_until(is_not_moving, elem, move_time, timeout=timeout,
-                      period=0)
-
-
-def is_not_moving(elem, move_time=0.5):
-    """ Indicate if the element has not changed its position after a period
-    based on its globalRect coordinates
-    :param elem: autopilot element to check
-    :param move_time: time between the coordinates are retrieved
-    :return: True when the x and y coordinates are equal, False otherwise
-    """
-    x1, y1, h1, w1 = elem.globalRect
-    time.sleep(move_time)
-    x2, y2, h2, w2 = elem.globalRect
-
-    return x1 == x2 and y1 == y2
-
-
-def _get_parent_by_type(item, required_type, **kwargs):
-    """Return a parent item of the required type.
-    :param item: The child item to start searching from.
-    :param required_type: String name of parent object type required.
-    :param kwargs: This is used for logging purposes only.
-    :return: Parent object matching required type.
-    :raises: StateNotFoundError if no matching object type can be found.
-    """
-    parent = item.get_parent()
-    path = get_object_path(parent).split('/')
-    try:
-        index = path.index(required_type)
-    except ValueError:
-        raise StateNotFoundError(
-            '{}, and properties: {}'.format(required_type, kwargs))
-    for count in range(1, len(path) - index):
-        parent = parent.get_parent()
-    return parent
-
-
-def validate_properties(item, **kwargs):
-    """Return True if item properties match specified keyword properties."""
-    props = item.get_properties()
-    for key in kwargs.keys():
-        if props[key] != kwargs[key]:
-            return False
-    return True
-
-
-def get_parent(item, required_type, **kwargs):
-    """Return a parent object of specified type and properties.
-    :param item: The child item to start searching from.
-    :param required_type: String name of parent object type required.
-    :param kwargs: Any properties to match on the parent object.
-    :return: Parent object matching required type and properties.
-    :raises: StateNotFoundError if no matching object can be found.
-    """
-    parent = item
-    while True:
-        parent = _get_parent_by_type(parent, required_type, **kwargs)
-        if validate_properties(parent, **kwargs):
-            return parent
-        parent = parent.get_parent()

=== modified file 'ubuntu_system_tests/helpers/autopilot/utils.py'
--- ubuntu_system_tests/helpers/autopilot/utils.py	2016-07-15 10:40:16 +0000
+++ ubuntu_system_tests/helpers/autopilot/utils.py	2016-08-03 05:45:48 +0000
@@ -21,7 +21,9 @@
 from contextlib import contextmanager
 
 from autopilot import introspection
-from autopilot.exceptions import StateNotFoundError
+from autopilot.introspection.utilities import process_util
+from autopilot.introspection._object_registry import patch_registry
+from autopilot.introspection.dbus import get_type_name
 
 from ubuntu_system_tests.helpers import (
     processes,
@@ -33,22 +35,12 @@
 ubuntuuitoolkit = try_import('ubuntuuitoolkit')
 
 
-@contextmanager
-def override_proxy_timeout(proxy, timeout_seconds):
-    original_timeout = proxy._poll_time
-    try:
-        proxy._poll_time = timeout_seconds
-        yield proxy
-    finally:
-        proxy._poll_time = original_timeout
-
-
 def _get_pid(pname):
     """ Wait until the process pname is running and retrieve its pid. Raise
     Runtime exception when the process is not started after 10 seconds
     """
     if wait_until(processes.is_process_running, pname):
-        return processes.get_process_id(pname)
+        return process_util.get_pid_for_process(pname)
     else:
         raise RuntimeError('Could not find process: {} '.format(pname))
 
@@ -83,65 +75,15 @@
     return root
 
 
-def is_element(predicate, *args, **kwargs):
-    """
-    Evaluate the predicate with the args and indicate if it raises
-    StateNotFoundError
-     :param: predicate: The method to be evaluated
-     :param: *args: The predicate positional parameters
-     :param: **kwargs: The predicate optional parameters
-     :return: False if the predicate raises StateNotFoundError, True otherwise
-    """
-    try:
-        predicate(*args, **kwargs)
-        return True
-    except StateNotFoundError:
-        return False
-
-
-def wait_select_single(root, type_name='*', timeout=10, **kwargs):
-    """
-    Perform wait_select_single on root object using a custom timeout value.
-    :param: root: The root object to make the query
-    :param: type_name: Either a string naming the type you want, or a class
-    of the appropriate type
-    :param: timeout: The timeout for the polling
-    """
-    default_time = root._poll_time
-    root._poll_time = timeout
-    try:
-        item = root.wait_select_single(type_name, **kwargs)
+@contextmanager
+def patched_select(class_object, class_name=None):
+    if not class_name:
+        class_name = get_type_name(class_object)
+    try:
+        with patch_registry(get_patched_registry(class_object, class_name)):
+            yield class_name
     finally:
-        root._poll_time = default_time
-    return item
-
-
-def wait_select_many(root, number=1, timeout=10, period=0.5, type_name='*',
-                     **kwargs):
-    """
-    Get a list of proxy objects matching some search criteria from the
-    introspection tree, with type equal to *type_name* and (optionally)
-    matching the keyword filters present in *kwargs*. This method will retry
-    until either the objects matching the criteria are >= number or the timeout
-    is reached
-    :param: root: The root object to make the query
-    :param: number: The number of objects that have to match to return
-    :param: timeout: The timeout for the polling
-    :param: period: The retry period of time
-    :param: type_name: Either a string naming the type you want, or a class
-    of the appropriate type
-    :param: **kwargs: The optional parameters used to match objects
-    :raise: StateNotFoundError: When the number of objects matching the query
-    are less than the number passed as parameter
-    :return: A list of proxy objects
-    """
-
-    if wait_until(
-            lambda: len(root.select_many(type_name, **kwargs)) >= number,
-            timeout=timeout, period=period):
-        return root.select_many(type_name, **kwargs)
-    else:
-        raise StateNotFoundError("Not found the number of elements requested")
+        pass
 
 
 def get_patched_registry(class_object, class_name):
@@ -164,60 +106,6 @@
     return registry
 
 
-def _patched_select(wait, root, class_object, class_name=None, **kwargs):
-    """
-    Patch the autopilot object registry and select an object from root.
-
-    This method is used to avoid autopilot CPO errors by patching the autopilot
-    object registry before calling the required select method on the specified
-    root object.
-
-    :param wait: Whether to call wait_select_single or select_single.
-    :param root: Root introspection object.
-    :param class_object: Instance of object to patch the registry with.
-    :param class_name: Name of registry entry to patch. If None then the class
-                       name of class_object will be used.
-    :return: Intropsection object of type class_object.
-
-    """
-    if not class_name:
-        class_name = class_object.__class__.__name__
-    registry = get_patched_registry(class_object, class_name)
-    with introspection._object_registry.patch_registry(registry):
-        if wait:
-            return root.wait_select_single(class_name, **kwargs)
-        else:
-            return root.select_single(class_name, **kwargs)
-
-
-def patched_select_single(root, class_object, class_name=None, **kwargs):
-    """
-    Perform select_single on root object using patched autopilot registry.
-
-    :param root: Root introspection object.
-    :param class_object: Instance of object to patch the registry with.
-    :param class_name: Name of registry entry to patch. If None then the class
-                       name of class_object will be used.
-    :return: Intropsection object of type class_object.
-
-    """
-    return _patched_select(False, root, class_object, class_name, **kwargs)
-
-
-def patched_wait_select_single(root, class_object, class_name=None, **kwargs):
-    """
-    Perform wait_select_single on root object using patched autopilot registry.
-
-    :param root: Root introspection object.
-    :param class_object: Instance of object to patch the registry with.
-    :param class_name: Name of registry entry to patch. If None then the class
-                       name of class_object will be used.
-    :return: Intropsection object of type class_object.
-
-    """
-    return _patched_select(True, root, class_object, class_name, **kwargs)
-
-
 @timeout(60)
 def get_proxy_object(pid):
     return introspection.get_proxy_object_for_existing_process(

=== modified file 'ubuntu_system_tests/helpers/camera/_cpo.py'
--- ubuntu_system_tests/helpers/camera/_cpo.py	2016-07-11 16:39:38 +0000
+++ ubuntu_system_tests/helpers/camera/_cpo.py	2016-08-03 05:45:48 +0000
@@ -27,7 +27,6 @@
 from camera_app.emulators.panel import Panel
 from retrying import retry
 
-from ubuntu_system_tests.helpers.autopilot.list import order_by_x_coord
 from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
 from ubuntu_system_tests.helpers import wait_until
 
@@ -219,9 +218,10 @@
 
     def start_playback(self):
         """ Start playing the video """
-        objs = self.app.select_many(name='media-playback-start', visible=True)
-        play = order_by_x_coord(objs)[0]
-        self.app.pointing_device.click_object(play)
+        objs = self.app.select_many(
+            ap_result_sort_keys=['x', 'y'], name='media-playback-start',
+            visible=True)
+        self.app.pointing_device.click_object(objs[0])
 
     def click_exposure_button(self):
         """ Click on the button to either take a picture or record a video """

=== modified file 'ubuntu_system_tests/helpers/clock/_cpo.py'
--- ubuntu_system_tests/helpers/clock/_cpo.py	2016-05-23 20:40:55 +0000
+++ ubuntu_system_tests/helpers/clock/_cpo.py	2016-08-03 05:45:48 +0000
@@ -22,8 +22,7 @@
 import ubuntuuitoolkit
 
 from ubuntu_system_tests.helpers.autopilot import (
-    patched_select_single, validate_dbus_object)
-from ubuntu_system_tests.helpers.autopilot.object import get_parent
+    patched_select, validate_dbus_object)
 
 logger = logging.getLogger(__name__)
 
@@ -83,8 +82,8 @@
         """Return current displayed PageHeader object."""
         from ubuntu_system_tests.helpers.ubuntuuitoolkit.pageheader import (
             PageHeader)
-        return patched_select_single(
-            self, PageHeader, class_name='PageHeader', visible=True)
+        with patched_select(PageHeader, 'PageHeader') as name:
+            return self.select_single(name, visible=True)
 
 
 class MainPage(Page):
@@ -148,7 +147,10 @@
         return self.main_view.wait_select_single(EditAlarmPage)
 
     def get_add_alarm_button(self):
-        return self.wait_select_single(objectName='addAlarmAction_button')
+        add_button = self.wait_select_single(
+            objectName='addAlarmAction_button')
+        add_button.wait_until_not_moving()
+        return add_button
 
 
 class EditAlarmPage(Page):
@@ -222,7 +224,7 @@
         self.unselect_selected_days()
         for day in days:
             label = self.wait_select_single(text=day)
-            list_item = get_parent(label, 'UCListItem')
+            list_item = label.get_parent('UCListItem')
             checkbox = list_item.select_single('CheckBox')
             checkbox.check()
 

=== modified file 'ubuntu_system_tests/helpers/dialer_app/_cpo.py'
--- ubuntu_system_tests/helpers/dialer_app/_cpo.py	2016-07-11 10:54:02 +0000
+++ ubuntu_system_tests/helpers/dialer_app/_cpo.py	2016-08-03 05:45:48 +0000
@@ -26,7 +26,7 @@
 from ubuntuuitoolkit import UbuntuUIToolkitCustomProxyObjectBase
 
 from ubuntu_system_tests.helpers.autopilot import (
-    patched_select_single, validate_dbus_object, wait_select_many)
+    patched_select, validate_dbus_object)
 from ubuntu_system_tests.helpers.dialer_app import unformatted_phone_number
 
 logger = logging.getLogger(__name__)
@@ -46,9 +46,8 @@
 
     @property
     def main_view(self):
-        return patched_select_single(
-            root=self, class_object=MainView, class_name='MainView',
-            objectName='mainView')
+        with patched_select(MainView, 'MainView') as name:
+            return self.select_single(name, objectName='mainView')
 
 
 class MainView(dialer_app.MainView):
@@ -80,9 +79,9 @@
         :return: Dialog object or None if it is not found.
         """
         try:
-            return patched_select_single(
-                self, Dialog, class_name='Dialog',
-                title='Call holding failure', visible=True)
+            with patched_select(Dialog, 'Dialog') as name:
+                return self.select_single(
+                    name, title='Call holding failure', visible=True)
         except autopilot.exceptions.StateNotFoundError:
             return None
 
@@ -269,10 +268,9 @@
             objectName='contactsPage')
 
     def _get_sorted_contact_delegates(self):
-        contact_delegates = wait_select_many(
-            self, type_name='ContactDelegate', visible=True)
-        return sorted(
-            contact_delegates, key=lambda delegate: delegate.globalRect.y)
+        return self.wait_select_many(
+            'ContactDelegate', ap_result_sort_keys=['globalRect.y'],
+            visible=True)
 
 
 class Dialog(UbuntuUIToolkitCustomProxyObjectBase):

=== modified file 'ubuntu_system_tests/helpers/gallery/_cpo.py'
--- ubuntu_system_tests/helpers/gallery/_cpo.py	2016-04-15 20:06:34 +0000
+++ ubuntu_system_tests/helpers/gallery/_cpo.py	2016-08-03 05:45:48 +0000
@@ -26,7 +26,6 @@
 from ubuntuuitoolkit import UbuntuUIToolkitCustomProxyObjectBase
 
 from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
-from ubuntu_system_tests.helpers.autopilot.list import order_by_x_coord
 from ubuntu_system_tests.helpers import context
 from ubuntu_system_tests.helpers import file_system as fs
 
@@ -99,7 +98,8 @@
         :param image_path: the path to match with the images source
         """
         all_photos = []
-        photos = self.app.select_many('UCUbuntuShape', visible=True)
+        photos = self.app.select_many(
+            'UCUbuntuShape', ap_result_sort_keys=['x', 'y'], visible=True)
         for photo in photos:
             images = photo.select_many('QQuickImage', status=1)
             imgs = [image for image in images if image_path in image.source]
@@ -108,7 +108,7 @@
         if not all_photos:
             raise exceptions.StateNotFoundError(class_name='QQuickImage',
                                                 status=1)
-        return order_by_x_coord(all_photos, include_off_screen=True)
+        return all_photos
 
     def get_media_list_for_event(self, event_number=0):
         event = self.get_event(event_number)

=== modified file 'ubuntu_system_tests/helpers/indicators/message.py'
--- ubuntu_system_tests/helpers/indicators/message.py	2016-07-06 13:12:27 +0000
+++ ubuntu_system_tests/helpers/indicators/message.py	2016-08-03 05:45:48 +0000
@@ -25,10 +25,7 @@
 from ubuntu_system_tests.helpers import ofono, unity8
 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,
-)
+from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
 
 
 logger = logging.getLogger(__name__)
@@ -111,7 +108,8 @@
 
     def get_last_message(self, number):
         """ Get the last message displayed in the indicator """
-        return wait_select_many(self, number, objectName='title')[-1].text
+        return self.wait_select_many(
+            ap_result_count=number, objectName='title')[-1].text
 
     def wait_while_indicator_visible(self):
         """ Wait until the indicator message is not displayed any more """

=== modified file 'ubuntu_system_tests/helpers/messaging/_cpo.py'
--- ubuntu_system_tests/helpers/messaging/_cpo.py	2016-05-06 22:37:58 +0000
+++ ubuntu_system_tests/helpers/messaging/_cpo.py	2016-08-03 05:45:48 +0000
@@ -21,6 +21,7 @@
 import time
 
 import autopilot
+from autopilot.introspection.utilities import sort_by_keys
 import ubuntuuitoolkit as uitk
 
 from autopilot.exceptions import StateNotFoundError
@@ -28,12 +29,7 @@
 from messaging_app import emulators as messaging_emulators
 
 from ubuntu_system_tests.helpers.autopilot import (
-    patched_select_single, patched_wait_select_single, validate_dbus_object,
-    wait_select_many
-)
-from ubuntu_system_tests.helpers.autopilot.list import order_by_y_coord
-from ubuntu_system_tests.helpers.autopilot.object import (
-    wait_until_is_not_moving)
+    patched_select, validate_dbus_object)
 from ubuntu_system_tests.helpers.messaging import (
     MEDIA_TYPE_PICTURE, MEDIA_TYPE_VIDEO, MEDIA_TYPE_CONTACT)
 from ubuntu_system_tests.helpers.system_settings import SIM_1, SIM_2
@@ -53,8 +49,8 @@
 
     def get_main_page(self):
         """Override base class method to use patched select method."""
-        return patched_wait_select_single(
-            root=self, class_object=MainPage, class_name='MainPage')
+        with patched_select(MainPage, 'MainPage') as name:
+            return self.wait_select_single(name)
 
     def get_main_title(self):
         """ Retrieve the app title """
@@ -89,9 +85,9 @@
 
     def get_mobile_number_label(self, number):
         """Return first matching label displayed."""
-        labels = wait_select_many(
-            self, type_name='UCLabel', text='Mobile {}'.format(number))
-        return order_by_y_coord(labels)[0]
+        return self.wait_select_many(
+            'UCLabel', ap_result_sort_keys=['y', 'x'],
+            text='Mobile {}'.format(number))[0]
 
     def detect_select_sim_prompt(self):
         """Detect if the select SIM dialog is shown."""
@@ -123,7 +119,7 @@
         """
         self.pointing_device.click_object(self._get_attachment_button())
         panel = self._get_attachment_panel()
-        wait_until_is_not_moving(panel)
+        panel.wait_until_not_moving()
         panel.choose_media_type(media_type)
         return self._get_content_picker()
 
@@ -206,9 +202,9 @@
 
     def _get_sim_confirmation_dialog(self, sim):
         """Return default confirmation dialog for specified SIM."""
-        return patched_select_single(
-            self, class_object=Dialog, class_name='Dialog',
-            text=DEFAULT_SIM_MSG.format(sim=sim))
+        with patched_select(Dialog, 'Dialog') as name:
+            return self.select_single(
+                name, text=DEFAULT_SIM_MSG.format(sim=sim))
 
     def get_sim1_default_confirmation_dialog(self):
         """Return SIM 1 default confirmation dialog."""
@@ -350,6 +346,7 @@
                 if ('filePath' in attachment.get_properties() and
                         len(attachment.filePath) > 0):
                     attachments.append(attachment)
+        return sort_by_keys(attachments, ['y', 'x'])
         return order_by_y_coord(attachments)
 
     def get_attachment_count(self):
@@ -440,8 +437,8 @@
         :param app_name: name of the app to tap
 
         """
-        app_icon = order_by_y_coord(wait_select_many(
-            self, text=app_name))[0].get_parent()
+        app_icon = self.wait_select_many(
+            ap_result_sort_keys=['y', 'x'], text=app_name)[0].get_parent()
         self.pointing_device.click_object(app_icon)
 
 

=== modified file 'ubuntu_system_tests/helpers/messaging/app.py'
--- ubuntu_system_tests/helpers/messaging/app.py	2016-07-07 10:18:52 +0000
+++ ubuntu_system_tests/helpers/messaging/app.py	2016-08-03 05:45:48 +0000
@@ -116,8 +116,8 @@
 
     from ubuntu_system_tests.helpers.messaging._cpo import MainView
     proxy = autopilot.get_proxy_object_for_existing_app(APP)
-    return autopilot.patched_wait_select_single(
-        root=proxy, class_object=MainView, class_name='MainView')
+    with autopilot.patched_select(MainView, 'MainView') as name:
+        return proxy.wait_select_single(name)
 
 
 def launch_messaging_app_from_launcher():

=== modified file 'ubuntu_system_tests/helpers/music/_cpo.py'
--- ubuntu_system_tests/helpers/music/_cpo.py	2016-06-13 19:20:19 +0000
+++ ubuntu_system_tests/helpers/music/_cpo.py	2016-08-03 05:45:48 +0000
@@ -20,7 +20,7 @@
 
 from ubuntu_system_tests.helpers.autopilot import(
     validate_dbus_object,
-    patched_wait_select_single
+    patched_select
 )
 from ubuntu_system_tests.helpers.ubuntuuitoolkit.mainview import (
     MultiTabMainView)
@@ -38,9 +38,8 @@
 
     @property
     def main_view(self):
-        return patched_wait_select_single(
-            root=self, class_object=MainView,
-            class_name='MainView', objectName='musicMainView')
+        with patched_select(MainView, 'MainView') as name:
+            return self.wait_select_single(name, objectName='musicMainView')
 
 
 class MainView(MultiTabMainView):
@@ -76,9 +75,9 @@
 
     @property
     def main_view(self):
-        return patched_wait_select_single(
-            root=self.get_root_instance(), class_object=MainView,
-            class_name='MainView', objectName='musicMainView')
+        with patched_select(MainView, 'MainView') as name:
+            root = self.get_root_instance()
+            return root.wait_select_single(name, objectName='musicMainView')
 
 
 class Songs(Page):

=== modified file 'ubuntu_system_tests/helpers/notifications/sim_pin.py'
--- ubuntu_system_tests/helpers/notifications/sim_pin.py	2016-06-02 09:12:43 +0000
+++ ubuntu_system_tests/helpers/notifications/sim_pin.py	2016-08-03 05:45:48 +0000
@@ -17,13 +17,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+import logging
+
 import autopilot
-import logging
-
+from autopilot.introspection import is_element
 from ubuntuuitoolkit import UbuntuUIToolkitCustomProxyObjectBase
 
-from ubuntu_system_tests.helpers.autopilot import (
-    is_element, validate_dbus_object)
+from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
 from ubuntu_system_tests.helpers.notifications.utils import NotificationBase
 from ubuntu_system_tests.helpers.ofono import get_number_of_modems
 from ubuntu_system_tests.helpers.unity8 import UNITY8_PATH_ROOT

=== modified file 'ubuntu_system_tests/helpers/notifications/utils.py'
--- ubuntu_system_tests/helpers/notifications/utils.py	2016-06-02 09:12:43 +0000
+++ ubuntu_system_tests/helpers/notifications/utils.py	2016-08-03 05:45:48 +0000
@@ -21,10 +21,10 @@
 import ubuntuuitoolkit as uitk
 
 from autopilot.exceptions import StateNotFoundError
+from autopilot.introspection import is_element
 
 from ubuntu_system_tests.helpers import wait_until
-from ubuntu_system_tests.helpers.autopilot import (
-    is_element, patched_select_single)
+from ubuntu_system_tests.helpers.autopilot import patched_select
 
 NeedsImplementationError = functools.partial(
     NotImplementedError,
@@ -93,9 +93,8 @@
 
         """
         try:
-            return patched_select_single(
-                self, class_object=notification_class,
-                class_name='Notification', objectName=obj_name, **kwargs)
+            with patched_select(notification_class, 'Notification') as name:
+                return self.select_single(name, objectName=obj_name, **kwargs)
         except StateNotFoundError:
             return None
 

=== modified file 'ubuntu_system_tests/helpers/power/fixture_setup.py'
--- ubuntu_system_tests/helpers/power/fixture_setup.py	2016-07-04 20:54:36 +0000
+++ ubuntu_system_tests/helpers/power/fixture_setup.py	2016-08-03 05:45:48 +0000
@@ -17,13 +17,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 import fixtures
-
 from subprocess import CalledProcessError
 
+from autopilot.introspection.utilities import process_util
+
 from ubuntu_system_tests.helpers.power import utils as power
 from ubuntu_system_tests.helpers import sensors
 from ubuntu_system_tests.helpers.power.utils import wait_until_powerd_running
-from ubuntu_system_tests.helpers.processes import get_process_id
 from ubuntu_system_tests.helpers.testbed import run_command_with_sudo as sudo
 
 STOP_POWERD_COMMAND = '/sbin/initctl stop powerd'
@@ -104,7 +104,7 @@
                              real sensors.
         """
         try:
-            pid = get_process_id('powerd')
+            pid = process_util.get_pid_for_process('powerd')
         except CalledProcessError:
             pass
         else:
@@ -126,7 +126,7 @@
     def are_fake_sensors_enabled(self):
         """Return True if fake sensors enabled on powerd."""
         try:
-            pid = get_process_id('powerd')
+            pid = process_util.get_pid_for_process('powerd')
         except CalledProcessError:
             return False
         return sensors.are_fake_sensors_enabled_for_process(pid)

=== modified file 'ubuntu_system_tests/helpers/power/utils.py'
--- ubuntu_system_tests/helpers/power/utils.py	2016-07-04 20:54:36 +0000
+++ ubuntu_system_tests/helpers/power/utils.py	2016-08-03 05:45:48 +0000
@@ -24,11 +24,11 @@
 
 import dbus
 from autopilot.matchers import Eventually
+from autopilot.introspection.utilities import process_util
 from testtools.matchers import Equals
 
 from ubuntu_system_tests.helpers import wait_until
-from ubuntu_system_tests.helpers.processes import (get_process_id,
-                                                   is_process_running)
+from ubuntu_system_tests.helpers.processes import is_process_running
 from ubuntu_system_tests.helpers.testbed import write_to_file_with_sudo
 
 GSETTINGS_BRIGHTNESS_MAX = 255
@@ -90,7 +90,8 @@
 
 def get_powerd_fifo_path():
     """Return path of fake sensor fifo used by powerd process."""
-    return '/tmp/sensor-fifo-{}'.format(get_process_id('powerd'))
+    pid = process_util.get_pid_for_process('powerd')
+    return '/tmp/sensor-fifo-{}'.format(pid)
 
 
 def write_to_powerd_fifo(commands):

=== modified file 'ubuntu_system_tests/helpers/processes.py'
--- ubuntu_system_tests/helpers/processes.py	2016-07-26 20:02:31 +0000
+++ ubuntu_system_tests/helpers/processes.py	2016-08-03 05:45:48 +0000
@@ -25,6 +25,8 @@
 
 import psutil
 
+from autopilot.introspection.utilities import process_util
+
 from ubuntu_system_tests.helpers import (
     try_import,
     wait_until,
@@ -57,39 +59,11 @@
 
 def is_process_running(pname):
     try:
-        return bool(get_process_ids(pname))
+        return bool(process_util.get_pids_for_process(pname))
     except ValueError:
         return False
 
 
-def _query_pids_for_process(process_name):
-    pids = [process.pid for process in psutil.process_iter()
-            if process.name() == process_name]
-
-    if not pids:
-        raise ValueError('Process \'{}\' not running'.format(process_name))
-    return pids
-
-
-def get_process_id(pname):
-    """
-    Return PID for the requested process.
-
-    :param pname: name of the process to get PID of.
-    """
-    pids = _query_pids_for_process(process_name=pname)
-    if len(pids) > 1:
-        raise ValueError(
-            'More than one PID exists for process \'{}\''.format(pname))
-
-    return pids[0]
-
-
-def get_process_ids(pname):
-    """Return PIDs of the requested process, in case there are multiple."""
-    return _query_pids_for_process(process_name=pname)
-
-
 def stop_process(pname):
     if is_process_running(pname):
         [process.terminate() for process in psutil.process_iter() if

=== modified file 'ubuntu_system_tests/helpers/scopes/apps/_cpo.py'
--- ubuntu_system_tests/helpers/scopes/apps/_cpo.py	2016-04-19 10:06:01 +0000
+++ ubuntu_system_tests/helpers/scopes/apps/_cpo.py	2016-08-03 05:45:48 +0000
@@ -21,10 +21,7 @@
 from autopilot import exceptions, introspection
 
 from ubuntu_system_tests.helpers.autopilot import (
-    get_patched_registry, patched_select_single, validate_dbus_object,
-    wait_select_many)
-from ubuntu_system_tests.helpers.autopilot.list import order_by_y_coord
-from ubuntu_system_tests.helpers.autopilot.object import get_parent
+    get_patched_registry, patched_select, validate_dbus_object)
 from ubuntu_system_tests.helpers.scopes.apps import _clickscope
 from ubuntu_system_tests.helpers.scopes.base import GenericScopeView
 from ubuntu_system_tests.helpers.unity8 import UNITY8_DASH_PATH_ROOT
@@ -65,15 +62,14 @@
         preview_list.subPageShown.wait_for(True)
         preview_list.x.wait_for(0)
         self.wait_for_processing_to_complete()
-        return patched_select_single(
-            root=preview_list, class_object=_preview.Preview,
-            class_name='Preview', objectName='preview')
+        with patched_select(_preview.Preview, 'Preview') as name:
+            return self.select_single(name, objectName='preview')
 
     def get_app_icon(self, app_name):
         """Return icon for required app_name."""
-        buttons = wait_select_many(self, type_name='UCAbstractButton',
-                                   title=app_name)
-        return order_by_y_coord(buttons, include_off_screen=True)[0]
+        return self.wait_select_many(
+            'UCAbstractButton', ap_result_sort_keys=['y', 'x'],
+            title=app_name)[0]
 
     def is_app_displayed(self, app_name):
         """Return True if app with specified name is displayed."""
@@ -86,4 +82,4 @@
     def get_app_category(self, app_name):
         """Return the category name for a specified app_name."""
         app = self.get_app_icon(app_name)
-        return get_parent(app, 'CardGrid').objectName
+        return app.get_parent('CardGrid').objectName

=== modified file 'ubuntu_system_tests/helpers/scopes/apps/_preview.py'
--- ubuntu_system_tests/helpers/scopes/apps/_preview.py	2016-04-19 18:39:43 +0000
+++ ubuntu_system_tests/helpers/scopes/apps/_preview.py	2016-08-03 05:45:48 +0000
@@ -21,8 +21,7 @@
 from autopilot import introspection
 from unity8.dash import Preview as DashPreview
 
-from ubuntu_system_tests.helpers.autopilot import (
-    get_path_root, wait_select_single)
+from ubuntu_system_tests.helpers.autopilot import get_path_root
 from ubuntu_system_tests.helpers.scopes.apps import _clickscope
 from ubuntu_system_tests.helpers.unity8 import UNITY8_DASH_PATH_ROOT
 
@@ -51,9 +50,9 @@
     def _get_preview_button(self, button, wait=False):
         object_name = 'button{}'.format(button)
         if wait:
-            return wait_select_single(
-                self, 'PreviewActionButton', objectName=object_name,
-                timeout=120)
+            return self.wait_select_single(
+                'PreviewActionButton', ap_query_timeout=120,
+                objectName=object_name)
         else:
             return self.select_single(
                 'PreviewActionButton', objectName=object_name)

=== modified file 'ubuntu_system_tests/helpers/scopes/base.py'
--- ubuntu_system_tests/helpers/scopes/base.py	2016-04-19 10:06:01 +0000
+++ ubuntu_system_tests/helpers/scopes/base.py	2016-08-03 05:45:48 +0000
@@ -21,10 +21,10 @@
 import logging
 
 from autopilot import exceptions
+from autopilot.introspection.utilities import sort_by_keys
 from collections import namedtuple
 from unity8 import dash as unity8_dash
 
-from ubuntu_system_tests.helpers.autopilot.list import order_by_y_coord
 from ubuntu_system_tests.helpers.ubuntuuitoolkit.pageheader import (
     DashPageHeader)
 from ubuntu_system_tests.helpers.url_dispatcher import go_to_url
@@ -63,9 +63,8 @@
         """
         if not subtitle:
             return category.wait_select_single(title=title)
-        icons = order_by_y_coord(
-            category.select_many('UCAbstractButton'),
-            include_off_screen=True)
+        icons = category.select_many(
+            'UCAbstractButton', ap_result_sort_keys=['y', 'x'])
         for icon in icons:
             try:
                 icon.select_single(objectName='titleLabel', text=title)
@@ -136,7 +135,9 @@
         existing_items list.
 
         """
-        for item in order_by_y_coord(new_items, include_off_screen=True):
+        sorted_items = sort_by_keys(
+            new_items, sort_keys=['globalRect.y', 'globalRect.x'])
+        for item in sorted_items:
             existing_items.append(item.data)
         return existing_items
 
@@ -247,15 +248,6 @@
         self.pointing_device.click_object(self._get_setup_skip_button())
         self.wait_for_header_to_stop_moving()
 
-    def _get_first_visible_object(self, objects):
-        """ Retrieve the object that is currently being displayed based on its
-        position
-        :param objects: the list of objects to compare
-        :return: First visible item from list
-
-        """
-        return order_by_y_coord(objects)[0]
-
     def has_skip_button(self):
         """ Indicates if the skip button is present"""
         return self._get_setup_skip_button() is not None
@@ -278,8 +270,8 @@
         return self.select_single(objectName='search_button')
 
     def get_search_text_field(self):
-        return order_by_y_coord(
-            self.select_many(objectName='searchTextField'))[0]
+        return self.select_many(
+            ap_result_sort_keys=['y', 'x'], objectName='searchTextField')[0]
 
     def search(self, text):
         """ Search for a specific text in the scope and waits until the results

=== modified file 'ubuntu_system_tests/helpers/scopes/music/_artist.py'
--- ubuntu_system_tests/helpers/scopes/music/_artist.py	2016-04-08 11:29:23 +0000
+++ ubuntu_system_tests/helpers/scopes/music/_artist.py	2016-08-03 05:45:48 +0000
@@ -19,7 +19,7 @@
 #
 
 from ubuntu_system_tests.helpers.autopilot import (
-    patched_wait_select_single, validate_dbus_object)
+    patched_select, validate_dbus_object)
 from ubuntu_system_tests.helpers.scopes.base import GenericScopeView
 from ubuntu_system_tests.helpers.unity8 import UNITY8_DASH_PATH_ROOT
 
@@ -57,14 +57,14 @@
         """Click on the track with the desired name and return Preview."""
         from ubuntu_system_tests.helpers.scopes.music import _track
         self._click_button_by_title(track)
-        return patched_wait_select_single(
-            root=self, class_object=_track.Preview, class_name='Preview',
-            objectName='preview', visible=True)
+        with patched_select(_track.Preview, 'Preview') as name:
+            return self.wait_select_single(
+                name, objectName='preview', visible=True)
 
     def select_album(self, album):
         """Click on the track with the desired name and return Preview."""
         from ubuntu_system_tests.helpers.scopes.music import _album
         self._click_button_by_title(album)
-        return patched_wait_select_single(
-            root=self, class_object=_album.Preview, class_name='Preview',
-            objectName='preview0', visible=True)
+        with patched_select(_album.Preview, 'Preview') as name:
+            return self.wait_select_single(
+                name, objectName='preview0', visible=True)

=== modified file 'ubuntu_system_tests/helpers/scopes/music/_cpo.py'
--- ubuntu_system_tests/helpers/scopes/music/_cpo.py	2016-07-06 13:12:27 +0000
+++ ubuntu_system_tests/helpers/scopes/music/_cpo.py	2016-08-03 05:45:48 +0000
@@ -19,11 +19,10 @@
 #
 
 from autopilot import exceptions
+from autopilot.introspection import is_element
 
 from ubuntu_system_tests.helpers.autopilot import (
-    is_element, patched_wait_select_single, wait_select_many,
-    validate_dbus_object)
-from ubuntu_system_tests.helpers.autopilot.list import order_by_y_coord
+    patched_select, validate_dbus_object)
 from ubuntu_system_tests.helpers.scopes.base import (
     GenericScopeView as GenericScopeViewBase)
 from ubuntu_system_tests.helpers.ubuntuuitoolkit import pageheader
@@ -117,9 +116,9 @@
 
     def get_artist(self, artist):
         """ Retrieve a list of artists with the desired name. """
-        artists = wait_select_many(
-            root=self, objectName='subtitleLabel', text=artist)
-        return order_by_y_coord(artists, include_off_screen=True)[0]
+        return self.wait_select_many(
+            ap_result_sort_keys=['y', 'x'], objectName='subtitleLabel',
+            text=artist)[0]
 
     def select_artist(self, artist):
         """
@@ -231,9 +230,9 @@
         """ Click on the track with the desired name """
         from ubuntu_system_tests.helpers.scopes.music import _track
         self._click_button_by_title(track)
-        return patched_wait_select_single(
-            root=self, class_object=_track.Preview, class_name='Preview',
-            objectName='preview0', visible=True)
+        with patched_select(_track.Preview, 'Preview') as name:
+            return self.wait_select_single(
+                name, objectName='preview0', visible=True)
 
     def select_artist(self, artist):
         """ Click on the artist with the desired name """

=== modified file 'ubuntu_system_tests/helpers/scopes/music/_preview.py'
--- ubuntu_system_tests/helpers/scopes/music/_preview.py	2016-02-03 16:09:24 +0000
+++ ubuntu_system_tests/helpers/scopes/music/_preview.py	2016-08-03 05:45:48 +0000
@@ -19,8 +19,6 @@
 #
 
 from unity8.dash import Preview as DashPreview
-from ubuntu_system_tests.helpers.autopilot.object import \
-    wait_until_is_not_moving
 
 
 class Preview(DashPreview):
@@ -30,5 +28,5 @@
         return False
 
     def click_not_moving(self, elem):
-        wait_until_is_not_moving(elem)
+        elem.wait_until_not_moving()
         self.pointing_device.click_object(elem)

=== modified file 'ubuntu_system_tests/helpers/scopes/photos/_category.py'
--- ubuntu_system_tests/helpers/scopes/photos/_category.py	2016-02-03 16:09:24 +0000
+++ ubuntu_system_tests/helpers/scopes/photos/_category.py	2016-08-03 05:45:48 +0000
@@ -17,12 +17,10 @@
 # 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 autopilot.introspection import is_element
 from ubuntuuitoolkit import UbuntuUIToolkitCustomProxyObjectBase
 
-from ubuntu_system_tests.helpers.autopilot import (
-    is_element, validate_dbus_object)
-from ubuntu_system_tests.helpers.autopilot.list import order_by_x_coord
+from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
 from ubuntu_system_tests.helpers.unity8 import UNITY8_DASH_PATH_ROOT
 
 
@@ -44,9 +42,9 @@
 
     def get_pictures_list(self):
         """ Retrieve all the pictures displayed currently in the list """
-        imgs = self.select_many(type_name='CroppedImageMinimumSourceSize',
-                                objectName='artImage')
-        return order_by_x_coord(imgs, include_off_screen=True)
+        return self.select_many(
+            'CroppedImageMinimumSourceSize', ap_result_sort_keys=['x', 'y'],
+            objectName='artImage')
 
     def is_see_all_displayed(self):
         """ Indicate if there is at least a button with text "See all" """

=== modified file 'ubuntu_system_tests/helpers/scopes/photos/_cpo.py'
--- ubuntu_system_tests/helpers/scopes/photos/_cpo.py	2016-04-15 20:09:08 +0000
+++ ubuntu_system_tests/helpers/scopes/photos/_cpo.py	2016-08-03 05:45:48 +0000
@@ -19,12 +19,11 @@
 #
 
 from autopilot import exceptions
+from autopilot.introspection import is_element
 from retrying import retry
 
-from ubuntu_system_tests.helpers.autopilot import(
-    is_element, patched_wait_select_single, validate_dbus_object)
-from ubuntu_system_tests.helpers.autopilot.list import order_by_x_coord
-from ubuntu_system_tests.helpers.autopilot.object import get_parent
+from ubuntu_system_tests.helpers.autopilot import (
+    patched_select, validate_dbus_object)
 from ubuntu_system_tests.helpers import context
 from ubuntu_system_tests.helpers.scopes.base import GenericScopeView
 from ubuntu_system_tests.helpers.unity8 import UNITY8_DASH_PATH_ROOT
@@ -82,10 +81,9 @@
         """
         kwargs = {'objectName': 'artImage', 'visible': True}
         pictures = self.select_many(
-            'CroppedImageMinimumSourceSize', **kwargs)
-        pictures_in_path = [picture for picture in pictures if
-                            pic_path in picture.source]
-        return order_by_x_coord(pictures_in_path, include_off_screen=True)
+            'CroppedImageMinimumSourceSize', ap_result_sort_keys=['x', 'y'],
+            **kwargs)
+        return [picture for picture in pictures if pic_path in picture.source]
 
     def select_picture_from_carousel(self, img):
         """ Select the picture in the carousel """
@@ -97,9 +95,8 @@
         :return: The PhotoPreview object
         """
         from ubuntu_system_tests.helpers.scopes.photos import _preview
-        return patched_wait_select_single(
-            root=self, class_object=_preview.Preview, class_name='Preview',
-            visible=True)
+        with patched_select(_preview.Preview, 'Preview') as name:
+            return self.wait_select_single(name, visible=True)
 
     def is_in_search_result(self, path):
         """
@@ -131,4 +128,4 @@
         label = context.shared.dash.select_single(
             'UCLabel', objectName='header_title_label', text='My Photos',
             visible=True)
-        return get_parent(label, 'ListViewWithPageHeader')
+        return label.get_parent('ListViewWithPageHeader')

=== modified file 'ubuntu_system_tests/helpers/scopes/photos/_list.py'
--- ubuntu_system_tests/helpers/scopes/photos/_list.py	2016-03-12 02:18:42 +0000
+++ ubuntu_system_tests/helpers/scopes/photos/_list.py	2016-08-03 05:45:48 +0000
@@ -21,7 +21,7 @@
 from ubuntuuitoolkit import QQuickFlickable
 
 from ubuntu_system_tests.helpers.autopilot import (
-    patched_wait_select_single, validate_dbus_object, wait_select_many)
+    patched_select, validate_dbus_object)
 from ubuntu_system_tests.helpers.unity8 import UNITY8_DASH_PATH_ROOT
 
 
@@ -36,16 +36,15 @@
     def get_today_category(self):
         """ Get the today category section """
         from ubuntu_system_tests.helpers.scopes.photos import _category
-        return patched_wait_select_single(
-            root=self, class_object=_category.DashCategoryBase,
-            class_name='DashCategoryBase', objectName='dashCategorytoday',
-            visible=True)
+        with patched_select(
+                _category.DashCategoryBase, 'DashCategoryBase') as name:
+            return self.wait_select_single(
+                name, objectName='dashCategorytoday', visible=True)
 
     def get_first_category(self):
         """ Get the first category section """
         from ubuntu_system_tests.helpers.scopes.photos import _category  # NOQA
-        return wait_select_many(self, type_name='DashCategoryBase',
-                                visible=True)[0]
+        return self.wait_select_many('DashCategoryBase', visible=True)[0]
 
     def see_all(self, category):
         """ Click on the see all button displayed in the selected position """

=== modified file 'ubuntu_system_tests/helpers/scopes/photos/_preview.py'
--- ubuntu_system_tests/helpers/scopes/photos/_preview.py	2016-02-19 22:36:36 +0000
+++ ubuntu_system_tests/helpers/scopes/photos/_preview.py	2016-08-03 05:45:48 +0000
@@ -23,8 +23,6 @@
 from ubuntuuitoolkit import UbuntuUIToolkitCustomProxyObjectBase
 
 from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
-from ubuntu_system_tests.helpers.autopilot.object import (
-    wait_until_is_not_moving)
 from ubuntu_system_tests.helpers.unity8 import UNITY8_DASH_PATH_ROOT
 
 
@@ -70,5 +68,5 @@
 
     def click_open_button(self):
         button = self.get_open_button()
-        wait_until_is_not_moving(button)
+        button.wait_until_not_moving()
         self.pointing_device.click_object(button)

=== modified file 'ubuntu_system_tests/helpers/scopes/video/_cpo.py'
--- ubuntu_system_tests/helpers/scopes/video/_cpo.py	2016-03-08 17:51:09 +0000
+++ ubuntu_system_tests/helpers/scopes/video/_cpo.py	2016-08-03 05:45:48 +0000
@@ -19,12 +19,11 @@
 #
 
 from autopilot import exceptions
+from autopilot.introspection import is_element
 
 from ubuntu_system_tests.helpers.autopilot import (
-    patched_wait_select_single,
-    is_element,
+    patched_select,
     validate_dbus_object,
-    wait_select_many
 )
 from ubuntu_system_tests.helpers.scopes.base import GenericScopeView
 from ubuntu_system_tests.helpers.unity8 import UNITY8_DASH_PATH_ROOT
@@ -52,7 +51,8 @@
             return False
 
     def _get_my_videos_section(self):
-        wait_select_many(self, timeout=30, objectName='dashCategorylocal')
+        self.wait_select_many(
+            ap_query_timeout=30, objectName='dashCategorylocal')
         return self.select_single(
             objectName='dashCategorylocal').select_single('QQuickGridView')
 
@@ -99,6 +99,5 @@
         self.pointing_device.click_object(video)
         self.wait_for_processing_to_complete()
         from ubuntu_system_tests.helpers.scopes.video import _preview
-        return patched_wait_select_single(
-            root=self, class_object=_preview.Preview, class_name='Preview',
-            objectName='preview')
+        with patched_select(_preview.Preview, 'Preview') as name:
+            return self.wait_select_single(name, objectName='preview')

=== modified file 'ubuntu_system_tests/helpers/system_settings/_cpo.py'
--- ubuntu_system_tests/helpers/system_settings/_cpo.py	2016-07-27 14:30:11 +0000
+++ ubuntu_system_tests/helpers/system_settings/_cpo.py	2016-08-03 05:45:48 +0000
@@ -22,13 +22,12 @@
 
 import autopilot.logging
 import autopilot.exceptions as exceptions
+from autopilot.introspection import is_element
 
 import ubuntuuitoolkit as uitk
 import ubuntu_system_settings as uss
 
-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.autopilot import validate_dbus_object
 from ubuntu_system_tests.helpers.brightness._cpo import BrightnessPageBase
 
 logger = logging.getLogger(__name__)
@@ -294,7 +293,7 @@
     def get_auto_adjust_checkbox(self):
         # TODO: Use select single once the checkbox gets an object name,
         # Until then, we need to get all the elements and filter them
-        return order_by_y_coord(self.select_many('CheckBox'))[0]
+        return self.select_many('CheckBox', ap_result_sort_keys=['y', 'x'])[0]
 
     def get_max_brightness(self):
         return 100

=== modified file 'ubuntu_system_tests/helpers/telegram/app.py'
--- ubuntu_system_tests/helpers/telegram/app.py	2016-06-09 19:56:51 +0000
+++ ubuntu_system_tests/helpers/telegram/app.py	2016-08-03 05:45:48 +0000
@@ -16,6 +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 autopilot.introspection.utilities import process_util
+
 from ubuntu_system_tests.helpers import autopilot
 from ubuntu_system_tests.helpers import processes
 from ubuntu_system_tests.helpers.scopes.apps import (
@@ -54,8 +56,8 @@
     """
     from ubuntu_system_tests.helpers.telegram._cpo import MainView  # NOQA
     proxy = autopilot.get_proxy_object(pid=pid)
-    return autopilot.patched_wait_select_single(
-        root=proxy, class_object=MainView, class_name='MainView')
+    with autopilot.patched_select(MainView, 'MainView') as name:
+        return proxy.wait_select_single(name)
 
 
 def get_telegram_process_id():
@@ -68,4 +70,4 @@
 
     :return: PID of telegram app
     """
-    return processes.get_process_ids(APP)[0]
+    return process_util.get_pid_for_process(APP)[0]

=== modified file 'ubuntu_system_tests/helpers/ubuntu_keyboard/_cpo.py'
--- ubuntu_system_tests/helpers/ubuntu_keyboard/_cpo.py	2016-02-12 14:52:45 +0000
+++ ubuntu_system_tests/helpers/ubuntu_keyboard/_cpo.py	2016-08-03 05:45:48 +0000
@@ -18,10 +18,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from autopilot.introspection import is_element
 import ubuntuuitoolkit
 
-from ubuntu_system_tests.helpers.autopilot import (
-    is_element, validate_dbus_object)
+from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
 
 APP_PATH_ROOT = b'maliit-server'
 

=== modified file 'ubuntu_system_tests/helpers/ubuntuuitoolkit/mainview.py'
--- ubuntu_system_tests/helpers/ubuntuuitoolkit/mainview.py	2016-06-16 08:35:00 +0000
+++ ubuntu_system_tests/helpers/ubuntuuitoolkit/mainview.py	2016-08-03 05:45:48 +0000
@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from autopilot.introspection import is_element
 # TODO: Remove this when extending from ubuntuuitoolkit main view
 from ubuntuuitoolkit._custom_proxy_objects import _tabs
 
@@ -25,7 +26,6 @@
 # views. Once that difference is implemented in ubuntuuitoolkit, then we
 # just import ubuntuuitoolkit here
 import ubuntuuitoolkit
-from ubuntu_system_tests.helpers.autopilot import is_element
 
 
 class SingleTabMainView:

=== modified file 'ubuntu_system_tests/helpers/ubuntuuitoolkit/optiontoggle.py'
--- ubuntu_system_tests/helpers/ubuntuuitoolkit/optiontoggle.py	2016-02-02 19:58:03 +0000
+++ ubuntu_system_tests/helpers/ubuntuuitoolkit/optiontoggle.py	2016-08-03 05:45:48 +0000
@@ -18,7 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from ubuntuuitoolkit import UbuntuUIToolkitCustomProxyObjectBase
-from ubuntu_system_tests.helpers.autopilot.list import order_by_y_coord
 
 
 class OptionToggle(UbuntuUIToolkitCustomProxyObjectBase):
@@ -38,7 +37,7 @@
 
     def get_options(self):
         """Return ordered list of availble options."""
-        options = order_by_y_coord(self.select_many('UCLabel'))
+        options = self.select_many('UCLabel', ap_result_sort_keys=['y', 'x'])
         return [option.text for option in options]
 
     def select_option(self, option):

=== modified file 'ubuntu_system_tests/helpers/ubuntuuitoolkit/pageheader.py'
--- ubuntu_system_tests/helpers/ubuntuuitoolkit/pageheader.py	2016-06-14 13:07:39 +0000
+++ ubuntu_system_tests/helpers/ubuntuuitoolkit/pageheader.py	2016-08-03 05:45:48 +0000
@@ -22,8 +22,6 @@
 from ubuntuuitoolkit._custom_proxy_objects._common import ToolkitException
 from ubuntuuitoolkit._custom_proxy_objects._header import AppHeader
 
-from ubuntu_system_tests.helpers.autopilot.list import order_by_y_coord
-
 
 class PageHeader(AppHeader):
 
@@ -68,18 +66,11 @@
 
     def _get_cancel_button(self):
         """Return header cancel button."""
-        cancel = order_by_y_coord(self.select_many(text='Cancel'))[0]
+        cancel = self.select_many(
+            ap_result_sort_keys=['y', 'x'], text='Cancel')[0]
         return cancel.get_parent()
 
     def clear_search(self):
         """Clear the search text field."""
         self.searchEntryEnabled.wait_for(True)
         self.pointing_device.click_object(self._get_cancel_button())
-
-    def wait_until_not_moving(self):
-        """Wait until the header has stopped moving."""
-        try:
-            container = self.select_single(objectName='headerContainer')
-            container.moving.wait_for(False)
-        except StateNotFoundError:
-            pass

=== modified file 'ubuntu_system_tests/helpers/unity8/dash.py'
--- ubuntu_system_tests/helpers/unity8/dash.py	2016-02-03 16:09:24 +0000
+++ ubuntu_system_tests/helpers/unity8/dash.py	2016-08-03 05:45:48 +0000
@@ -24,8 +24,7 @@
 from unity8 import dash as unity8_dash
 
 from ubuntu_system_tests.helpers.autopilot import (
-    patched_wait_select_single, validate_dbus_object, wait_select_many)
-from ubuntu_system_tests.helpers.autopilot.list import order_by_x_coord
+    patched_select, validate_dbus_object)
 from ubuntu_system_tests.helpers.ubuntuuitoolkit.pageheader import (
     DashPageHeader
 )
@@ -82,7 +81,7 @@
         self._scroll_to_right_scope()
         self.dash_content_list.moving.wait_for(False)
 
-    def get_current_scope(self, cpo=None, *args, **kwargs):
+    def get_current_scope(self, cpo=None, **kwargs):
         """
         Return the GenericScopeView proxy object for current scope.
 
@@ -95,9 +94,8 @@
             from ubuntu_system_tests.helpers.scopes.generic._cpo import (
                 GenericScopeView)
             cpo = GenericScopeView
-        return patched_wait_select_single(
-            root=self, class_object=cpo, class_name=SCOPE_CLASS_NAME,
-            isCurrent=True, *args, **kwargs)
+        with patched_select(cpo, SCOPE_CLASS_NAME) as name:
+            return self.wait_select_single(name, isCurrent=True, **kwargs)
 
     def get_scope_count(self):
         """Count how many scopes are present."""
@@ -115,11 +113,9 @@
         if wait_for_dash_loaded:
             self.wait_for_dash_loaded()
 
-        # Get a list of headers displayed on the screen
-        headers = wait_select_many(self, type_name=header_class, visible=True)
-
-        # Return the first visible header ordered by x co-ordinate
-        return order_by_x_coord(headers)[0]
+        # Return the first visible header ordered by x co-ordinate.
+        return self.wait_select_many(
+            header_class, ap_result_sort_keys=['x', 'y'], visible=True)[0]
 
     def swipe_screen_from_left(self):
         """Move a focused application to the background and return to dash."""

=== modified file 'ubuntu_system_tests/helpers/unity8/phone_stage.py'
--- ubuntu_system_tests/helpers/unity8/phone_stage.py	2016-04-27 21:43:27 +0000
+++ ubuntu_system_tests/helpers/unity8/phone_stage.py	2016-08-03 05:45:48 +0000
@@ -24,7 +24,6 @@
 from autopilot.exceptions import StateNotFoundError
 from ubuntuuitoolkit import UbuntuUIToolkitCustomProxyObjectBase
 from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
-from ubuntu_system_tests.helpers.autopilot.list import order_by_x_coord
 from ubuntu_system_tests.helpers.unity8 import (
     UNITY8_PATH_ROOT, APP_WIN_NAME)
 
@@ -38,9 +37,11 @@
         return validate_dbus_object(
             path, state, UNITY8_PATH_ROOT, b'PhoneStage', objectName='stage')
 
-    def _get_app_windows(self):
-        """Return list of displayed ApplicationWindow objects."""
-        return self.select_many('ApplicationWindow')
+    def get_all_app_windows(self):
+        """Return ordered list of all app window objects in task switcher."""
+        return self.select_many(
+            'ApplicationWindow',
+            ap_result_sort_keys=['globalRect.x', 'globalRect.y'])
 
     def _get_app_window(self, app_name):
         """Return ApplicationWindow object for required app."""
@@ -58,7 +59,7 @@
     def _get_next_app_window(self, app_window):
         """Return the app_window on the right of the specified app_window.
         If there are no more apps on the right then return None."""
-        apps = self.get_all_app_windows(include_off_screen=False)
+        apps = self.get_all_app_windows()
         next_app = self._get_app_window_position(apps, app_window) + 1
         try:
             return apps[next_app]
@@ -117,7 +118,7 @@
     def swipe_top_app_from_view(self):
         """Swipe the right-most visible app from view by swiping it to the
         right edge."""
-        apps = self.get_all_app_windows(include_off_screen=False)
+        apps = self.get_all_app_windows()
         app_count = len(apps)
         if app_count > 2:
             self._swipe_from_app_to_right_edge(apps[-1])
@@ -145,19 +146,13 @@
     def is_app_visible(self, app_window):
         """Return True if specified app_window is in the visible section of
         the view. This is limited to the top 3 windows."""
-        visible_apps = self.get_app_window_names(include_off_screen=False)[-3:]
+        visible_apps = self.get_app_window_names()[-3:]
         return app_window.title in visible_apps
 
-    def get_all_app_windows(self, include_off_screen=True):
-        """Return ordered list of all app window objects in task switcher."""
-        return order_by_x_coord(
-            self._get_app_windows(), include_off_screen=include_off_screen)
-
-    def get_app_window_names(self, include_off_screen=True):
+    def get_app_window_names(self):
         """Return ordered list of app window object names for each app
         displayed."""
-        return [app.title for app in self.get_all_app_windows(
-            include_off_screen)]
+        return [app.title for app in self.get_all_app_windows()]
 
     def close(self):
         """Close the task switcher and return to dash."""

=== modified file 'ubuntu_system_tests/helpers/unity8/settings_wizard.py'
--- ubuntu_system_tests/helpers/unity8/settings_wizard.py	2016-07-07 09:03:17 +0000
+++ ubuntu_system_tests/helpers/unity8/settings_wizard.py	2016-08-03 05:45:48 +0000
@@ -352,9 +352,9 @@
 
     def _get_notification(self, unity):
         logger.info('Waiting longer for notification object')
-        with override_proxy_timeout(unity, 30):
-            return unity.wait_select_single(
-                Notification, objectName='notification1', visible='True')
+        return unity.wait_select_single(
+            Notification, ap_query_timeout=30, objectName='notification1',
+            visible='True')
 
     def _get_back_button(self):
         return self.wait_select_single(

=== modified file 'ubuntu_system_tests/helpers/webbrowser/_cpo.py'
--- ubuntu_system_tests/helpers/webbrowser/_cpo.py	2016-06-01 08:47:36 +0000
+++ ubuntu_system_tests/helpers/webbrowser/_cpo.py	2016-08-03 05:45:48 +0000
@@ -24,8 +24,7 @@
 import ubuntuuitoolkit as uitk
 
 from ubuntu_system_tests.helpers.autopilot import (
-    patched_wait_select_single, validate_dbus_object, wait_select_many)
-from ubuntu_system_tests.helpers.autopilot.list import order_by_y_coord
+    patched_select, validate_dbus_object)
 
 logger = logging.getLogger(__name__)
 
@@ -143,7 +142,7 @@
 
     def get_history_urls(self):
         """Return all the pages (urls) that are shown in the history page"""
-        return wait_select_many(self, type_name='UrlDelegate', visible=True)
+        return self.wait_select_many('UrlDelegate', visible=True)
 
     def get_tab_preview_urls(self):
         """Return all the pages (urls) that are shown in the history page"""
@@ -168,14 +167,15 @@
         return next(elem for elem in elems if elem.text == text)
 
     def get_download_options_dialog(self):
-        return patched_wait_select_single(
-            self, Dialog, class_name='Dialog',
-            objectName='downloadOptionsDialog')
+        with patched_select(Dialog, 'Dialog') as name:
+            return self.wait_select_single(
+                name, objectName='downloadOptionsDialog')
 
     def get_open_with_dialog(self):
-        return patched_wait_select_single(
-            self, ContentPeerPicker13, class_name='ContentPeerPicker13',
-            objectName='contentPeerPicker')
+        with patched_select(
+                ContentPeerPicker13, 'ContentPeerPicker13') as name:
+            return self.wait_select_single(
+                name, objectName='contentPeerPicker')
 
     def open_page_and_accept_location_permission_prompt(self, url):
         """Open the provided url in the browser and accept the location
@@ -266,7 +266,7 @@
 
     def get_bookmarks_urls(self):
         """Return all the pages (urls) that are shown in the bookmarks page"""
-        return wait_select_many(self, type_name='UrlDelegate', visible=True)
+        return self.wait_select_many('UrlDelegate', visible=True)
 
     def delete_bookmark(self, url):
         bookmark_delegate = self.wait_select_single(UrlDelegate, url=url)
@@ -363,8 +363,11 @@
             objectName='contentPeerPicker')
 
     def _get_button(self, text):
-        return order_by_y_coord(
-            self.select_many(objectName='label', text=text))[0].get_parent()
+        buttons = self.select_many(
+            ap_result_sort_keys=['y', 'x'], objectName='label',
+            text=text)
+        top_button = buttons[0]
+        return top_button.get_parent()
 
     def _get_gallery_button(self):
         return self._get_button('Gallery')

=== modified file 'ubuntu_system_tests/helpers/webbrowser/app.py'
--- ubuntu_system_tests/helpers/webbrowser/app.py	2016-06-02 11:24:05 +0000
+++ ubuntu_system_tests/helpers/webbrowser/app.py	2016-08-03 05:45:48 +0000
@@ -18,6 +18,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from autopilot.introspection.utilities import process_util
+
 from ubuntu_system_tests.helpers import autopilot
 from ubuntu_system_tests.helpers import processes
 from ubuntu_system_tests.helpers.scopes.apps import (
@@ -68,4 +70,4 @@
 
 def get_webbrowser_process_id():
     """ Retrieve the webbrowser process id """
-    return processes.get_process_id(APP)
+    return process_util.get_pid_for_process(APP)

=== modified file 'ubuntu_system_tests/perftests/scalability/test_photos.py'
--- ubuntu_system_tests/perftests/scalability/test_photos.py	2016-06-14 17:59:07 +0000
+++ ubuntu_system_tests/perftests/scalability/test_photos.py	2016-08-03 05:45:48 +0000
@@ -24,7 +24,6 @@
 from retrying import retry
 from testtools import skipUnless
 
-from ubuntu_system_tests.helpers.autopilot import object
 from ubuntu_system_tests.helpers import cache
 from ubuntu_system_tests.helpers import context
 from ubuntu_system_tests.helpers import file_system as fs
@@ -70,7 +69,7 @@
 
     def _go_to_photo_preview(self, scope, pic):
         """ Go to the preview screen """
-        object.wait_until_is_not_moving(pic)
+        pic.wait_until_not_moving()
         scope.select_picture_from_carousel(pic)
         return scope.get_current_photo_preview()
 

=== modified file 'ubuntu_system_tests/selftests/test_config.py'
--- ubuntu_system_tests/selftests/test_config.py	2016-05-06 16:39:14 +0000
+++ ubuntu_system_tests/selftests/test_config.py	2016-08-03 05:45:48 +0000
@@ -28,34 +28,6 @@
 from ubuntu_system_tests import selftests
 from ubuntu_system_tests.common import config
 from ubuntu_system_tests.common.options import Option
-from ubuntu_system_tests.helpers.autopilot import override_proxy_timeout
-
-
-class HelpersTestCase(selftests.ConfigBaseTestCase):
-
-    def get_mock_proxy(self):
-        """Returns a rubbish proxy object that doesn't actually do anything."""
-        return ProxyBase({'id': [0, 0]}, b'/root', None)
-
-    def test_set_proxy_time_updates_polltime(self):
-        new_poll_time = 100
-        proxy = self.get_mock_proxy()
-        self.assertNotEqual(proxy._poll_time, new_poll_time)
-
-        with override_proxy_timeout(proxy, new_poll_time):
-            self.assertEqual(proxy._poll_time, new_poll_time)
-
-    def test_set_proxy_time_resets_polltime(self):
-        new_poll_time = 100
-        proxy = self.get_mock_proxy()
-        self.assertNotEqual(proxy._poll_time, new_poll_time)
-
-        original_timeout = proxy._poll_time
-
-        with override_proxy_timeout(proxy, new_poll_time):
-            pass
-
-        self.assertEqual(proxy._poll_time, original_timeout)
 
 
 class ConfigDirTestCase(selftests.ConfigBaseTestCase):

=== modified file 'ubuntu_system_tests/tests/indicators/test_indicator_battery.py'
--- ubuntu_system_tests/tests/indicators/test_indicator_battery.py	2016-06-09 19:06:08 +0000
+++ ubuntu_system_tests/tests/indicators/test_indicator_battery.py	2016-08-03 05:45:48 +0000
@@ -27,7 +27,6 @@
 
     def setUp(self):
         super().setUp()
-        self.restart_unity()
         self.indicator_page = indicators.open_battery_indicator()
 
     def test_battery_settings_item_open_correct_page(self):

=== modified file 'ubuntu_system_tests/tests/indicators/test_indicator_bluetooth.py'
--- ubuntu_system_tests/tests/indicators/test_indicator_bluetooth.py	2016-06-09 19:56:51 +0000
+++ ubuntu_system_tests/tests/indicators/test_indicator_bluetooth.py	2016-08-03 05:45:48 +0000
@@ -31,7 +31,6 @@
 
     def setUp(self):
         super().setUp()
-        self.restart_unity()
         self.bluetooth_indicator = indicators.open_bluetooth_indicator()
 
     def test_bluetooth_settings_item_open_correct_page(self):

=== modified file 'ubuntu_system_tests/tests/indicators/test_indicator_datetime.py'
--- ubuntu_system_tests/tests/indicators/test_indicator_datetime.py	2016-06-09 19:56:51 +0000
+++ ubuntu_system_tests/tests/indicators/test_indicator_datetime.py	2016-08-03 05:45:48 +0000
@@ -31,7 +31,6 @@
 
     def setUp(self):
         super().setUp()
-        self.restart_unity()
         self.indicator_page = indicators.open_datetime_indicator()
 
     def test_date_time_settings_item_open_correct_page(self):

=== modified file 'ubuntu_system_tests/tests/indicators/test_indicator_network.py'
--- ubuntu_system_tests/tests/indicators/test_indicator_network.py	2016-06-09 19:56:51 +0000
+++ ubuntu_system_tests/tests/indicators/test_indicator_network.py	2016-08-03 05:45:48 +0000
@@ -41,13 +41,17 @@
 class NetworkIndicatorBase(base.BaseUbuntuSystemTestCase):
 
     def setUp(self):
+        super().setUp()
+        self.indicator_page = indicators.open_network_indicator()
+
+
+class NetworkIndicatorWithSimBase(NetworkIndicatorBase):
+    def setUp(self):
         self.assertTrue(wait_for_all_sims_registered())
         super().setUp()
-        self.restart_unity()
-        self.indicator_page = indicators.open_network_indicator()
-
-
-class FlightModeTestCase(NetworkIndicatorBase):
+
+
+class FlightModeTestCase(NetworkIndicatorWithSimBase):
 
     @skipUnless(ofono.is_sim_inserted() and is_wifi_supported(),
                 'SIM and Wi-Fi support required.')
@@ -137,7 +141,7 @@
         network.ensure_internet_connectivity(timeout=15)
 
 
-class CellularProvidersTestCase(NetworkIndicatorBase):
+class CellularProvidersTestCase(NetworkIndicatorWithSimBase):
 
     @skipUnless(ofono.is_sim_inserted(), 'At least one SIM card required')
     def setUp(self):

=== modified file 'ubuntu_system_tests/tests/indicators/test_indicator_sound.py'
--- ubuntu_system_tests/tests/indicators/test_indicator_sound.py	2016-06-09 19:56:51 +0000
+++ ubuntu_system_tests/tests/indicators/test_indicator_sound.py	2016-08-03 05:45:48 +0000
@@ -41,7 +41,6 @@
 
     def setUp(self):
         super().setUp()
-        self.restart_unity()
         self.indicator_page = indicators.open_sound_indicator()
 
     def test_sound_settings_item_open_correct_page(self):
@@ -60,7 +59,6 @@
 
     def setUp(self):
         super().setUp()
-        self.restart_unity()
         self.useFixture(media.BackupRestoreLocalMediaFixture())
         self.useFixture(music_fixture.MusicAppWelcomeWizard(show_wizard=True))
         shutil.copy2(test_data.SRC_AUDIO_FILE_2, test_data.LOCAL_AUDIO_FILE_2)

=== modified file 'ubuntu_system_tests/tests/scopes/test_default_scopes.py'
--- ubuntu_system_tests/tests/scopes/test_default_scopes.py	2016-03-11 17:54:46 +0000
+++ ubuntu_system_tests/tests/scopes/test_default_scopes.py	2016-08-03 05:45:48 +0000
@@ -193,8 +193,7 @@
 
         """
         previous_index = -1
-        expected_labels = get_section_names_from_list(
-            expected_sections)
+        expected_labels = get_section_names_from_list(expected_sections)
         for expected_section, expected_label in zip(expected_sections,
                                                     expected_labels):
             if KEY_COMPARE_METHOD in expected_section:

=== modified file 'ubuntu_system_tests/tests/test_calls.py'
--- ubuntu_system_tests/tests/test_calls.py	2016-07-27 15:18:57 +0000
+++ ubuntu_system_tests/tests/test_calls.py	2016-08-03 05:45:48 +0000
@@ -24,6 +24,7 @@
 from threading import Event
 
 from autopilot.exceptions import StateNotFoundError
+from autopilot.input._uinput import UInputHardwareKeysDevice
 from autopilot.matchers import Eventually
 from retrying import retry
 from testtools import skipUnless
@@ -43,7 +44,6 @@
     AddressBook,
     fixture_setup as address_book_fixture
 )
-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,
@@ -444,7 +444,8 @@
         7. Terminate the call.
 
         """
-        input.press_power_button()
+        hardware_keys_device = UInputHardwareKeysDevice()
+        hardware_keys_device.press_and_release_power_button()
         self.assertTrue(
             wait_until(display.is_display_off, timeout=5),
             'Display did not turn off with power button.')

=== modified file 'ubuntu_system_tests/tests/test_clock.py'
--- ubuntu_system_tests/tests/test_clock.py	2016-07-20 19:41:05 +0000
+++ ubuntu_system_tests/tests/test_clock.py	2016-08-03 05:45:48 +0000
@@ -73,7 +73,7 @@
         # Wait until the alarm is triggered and a notification is displayed
         notifications = self.shell.get_notifications_list()
         notif = notifications.get_alarm_notification(timeout=120)
-        self.assertIn(date.strftime("%-I:%M %p"), notif.summary)
+        self.assertIn(date.strftime("%-I:%M"), notif.summary)
 
         # Validate the notification is dismissed
         notif.dismiss()

=== modified file 'ubuntu_system_tests/tests/test_with_webbrowser.py'
--- ubuntu_system_tests/tests/test_with_webbrowser.py	2016-07-07 10:23:31 +0000
+++ ubuntu_system_tests/tests/test_with_webbrowser.py	2016-08-03 05:45:48 +0000
@@ -23,10 +23,10 @@
 import os.path
 
 from autopilot import exceptions
+from autopilot.introspection import is_element
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
 
-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
 from ubuntu_system_tests.helpers import gallery
@@ -244,7 +244,7 @@
     def _assert_find_in_page_item_not_visible_in_drawer(self):
         """Open the drawer and ensure 'Find in page' item is not visible."""
         self.browser.open_drawer()
-        self.assertFalse(autopilot.is_element(
+        self.assertFalse(is_element(
             self.browser.chrome.get_drawer_action, 'findinpage'))
 
     def test_find_in_page_invisible_new_tabs_view(self):