Merge lp:~canonical-platform-qa/ubuntu-system-tests/fix-get-clock-pid into lp:ubuntu-system-tests

[Richard Huddie]

WIP

[lp:~canonical-platform-qa/ubuntu-system-tests/fix-get-clock-pid]

466. By Richard Huddie on 2016-09-16

Merge from trunk.

467. By Richard Huddie on 2016-09-16

Use pgrep to get the pid.

468. By Richard Huddie on 2016-09-19

Add periodic screenshots.

469. By Richard Huddie on 2016-09-19

Get screenshots only when launching.

470. By Richard Huddie on 2016-09-19

Get screenshots only when launching.

471. By Richard Huddie on 2016-09-19

Merge from trunk.

472. By Richard Huddie on 2016-09-19

Add a wait to ensure app is running before proceeding.

473. By Richard Huddie on 2016-09-19

Add extra screenshots.

474. By Richard Huddie on 2016-09-19

Add some more logging.

475. By Richard Huddie on 2016-09-19

Extra logging on going to scope.

476. By Richard Huddie on 2016-09-20

Move setup to after fixtures.

477. By Richard Huddie on 2016-09-20

Make location service a job, start removing old changes.

478. By Richard Huddie on 2016-09-20

Remove logging and screenshots.

479. By Richard Huddie on 2016-09-20

Tidy process helpers.

480. By Richard Huddie on 2016-09-20

Remove grep from process helpers.

481. By Richard Huddie on 2016-09-20

Use ubuntu-app-launch helpers for getting the app pids.

482. By Richard Huddie on 2016-09-20

remove redundant helpers for getting webapp proxy.

483. By Richard Huddie on 2016-09-20

Remove redundant app classes.

484. By Richard Huddie on 2016-09-21

Add a fix for failing ubuntu-app-stop.

485. By Richard Huddie on 2016-09-21

Update exisiting Application classes.

486. By Richard Huddie on 2016-09-21

Fix the app switcher tests to use the app helpers.

487. By Richard Huddie on 2016-09-21

Fix tests to use app helpers.

488. By Richard Huddie on 2016-09-21

Remove redundant helper.

489. By Richard Huddie on 2016-09-21

Fix music helpers.

490. By Richard Huddie on 2016-09-22

Merge from trunk.

491. By Richard Huddie on 2016-10-14

Merge from trunk.

Unmerged revisions

491. By Richard Huddie on 2016-10-14

Merge from trunk.

490. By Richard Huddie on 2016-09-22

Merge from trunk.

489. By Richard Huddie on 2016-09-21

Fix music helpers.

488. By Richard Huddie on 2016-09-21

Remove redundant helper.

487. By Richard Huddie on 2016-09-21

Fix tests to use app helpers.

486. By Richard Huddie on 2016-09-21

Fix the app switcher tests to use the app helpers.

485. By Richard Huddie on 2016-09-21

Update exisiting Application classes.

484. By Richard Huddie on 2016-09-21

Add a fix for failing ubuntu-app-stop.

483. By Richard Huddie on 2016-09-20

Remove redundant app classes.

482. By Richard Huddie on 2016-09-20

remove redundant helpers for getting webapp proxy.

=== modified file 'debian/tests/dependencies.json'
--- debian/tests/dependencies.json	2016-09-06 12:55:23 +0000
+++ debian/tests/dependencies.json	2016-10-14 14:22:00 +0000
@@ -132,6 +132,7 @@
                 "python3-testtools",
                 "python3-warlock",
                 "subunit",
+                "ubuntu-app-launch-tools",
                 "ubuntu-keyboard-autopilot",
                 "ubuntu-system-tests-helpers",
                 "ubuntu-system-tests-suite",

=== modified file 'ubuntu_system_tests/helpers/addressbook/app.py'
--- ubuntu_system_tests/helpers/addressbook/app.py	2016-07-15 14:22:08 +0000
+++ ubuntu_system_tests/helpers/addressbook/app.py	2016-10-14 14:22:00 +0000
@@ -18,22 +18,21 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 from collections import namedtuple
-from ubuntu_system_tests.helpers.application import QmlApplication
+from ubuntu_system_tests.helpers.application import Application
 
-APP_PROCESS_NAME = 'address-book-app'
 APP_NAME = 'Contacts'
 APP_ID = 'address-book-app'
-APP_CLICK = 'com.ubuntu.address-book'
+APP_PACKAGE = 'address-book-app'
 
 
 Contact = namedtuple('Contact', ['name', 'number', 'expected_reply'])
 Contact.__new__.__defaults__ = (None, None, None)
 
 
-class AddressBook(QmlApplication):
+class AddressBook(Application):
 
     def __init__(self):
-        super().__init__(APP_NAME, APP_CLICK, APP_PROCESS_NAME, APP_ID)
+        super().__init__(APP_NAME, APP_PACKAGE, APP_ID)
 
     def get_main_view(self):
         # TODO Move the address book helper upstream migrating the

=== modified file 'ubuntu_system_tests/helpers/application.py'
--- ubuntu_system_tests/helpers/application.py	2016-09-21 19:04:49 +0000
+++ ubuntu_system_tests/helpers/application.py	2016-10-14 14:22:00 +0000
@@ -22,10 +22,13 @@
 from autopilot.exceptions import ProcessSearchError
 from psutil import NoSuchProcess
 from retrying import retry
+from subprocess import CalledProcessError
 
-from ubuntu_system_tests.helpers import autopilot
+from ubuntu_system_tests.helpers import (
+    autopilot,
+    wait_until,
+)
 from ubuntu_system_tests.helpers import processes
-from ubuntu_system_tests.helpers.processes import ensure_application_closed
 from ubuntu_system_tests.helpers.scopes.apps import (
     launch_application_from_apps_scope)
 from ubuntu_system_tests.helpers.unity8 import (
@@ -35,9 +38,9 @@
 class Application:
     __metaclass__ = ABCMeta
 
-    def __init__(self, app_name, app_click, app_id=None):
+    def __init__(self, app_name, package, app_id=None):
         self.app_name = app_name
-        self.app_click = app_click
+        self.app_package = package
         self.app_id = app_id
         self.proxy_object = None
 
@@ -46,12 +49,14 @@
         Launch app from apps scope
         """
         launch_application_from_apps_scope(self.app_name)
+        self.wait_until_running()
         if return_proxy:
             return self.get_proxy_object()
 
     def launch_from_launcher(self, return_proxy=True):
         """Drag out the launcher and tap the application icon to start it."""
         launch_application_from_launcher(self.app_id)
+        self.wait_until_running()
         if return_proxy:
             return self.get_proxy_object()
 
@@ -59,21 +64,25 @@
         pass
 
     def stop(self):
-        ensure_application_closed(self.app_id)
+        processes.stop_application(self.app_package)
 
-    @abstractmethod
     def get_pid(self):
-        pass
+        return processes.get_application_pid(self.app_package)
 
-    @abstractmethod
     def is_running(self):
-        pass
+        return processes.is_application_running(self.app_package)
+
+    def wait_until_running(self):
+        """Wait until the application is running."""
+        if not wait_until(self.is_running):
+            raise RuntimeError('Application not running.')
 
     @retry(stop_max_delay=30000,
            wait_exponential_multiplier=1000,
            wait_exponential_max=10000,
            retry_on_exception=lambda exception: (
                isinstance(exception, ProcessSearchError) or
+               isinstance(exception, CalledProcessError) or
                isinstance(exception, processes.PidNotFoundError) or
                isinstance(exception, NoSuchProcess)))
     def get_proxy_object(self):
@@ -85,52 +94,3 @@
     @abstractmethod
     def get_main_view(self):
         pass
-
-
-class WebApplication(Application):
-
-    def get_proxy_object(self):
-        """To be implemented"""
-        pass
-
-    @abstractmethod
-    def get_main_window(self, proxy_object):
-        pass
-
-    @abstractmethod
-    def get_main_view(self):
-        pass
-
-
-class QmlApplication(Application):
-
-    def __init__(self, app_name, app_click, app_process_name, app_id=None):
-        self.app_process_name = app_process_name
-        super().__init__(app_name, app_click, app_id)
-
-    def get_pid(self):
-        """Return the QML application process id"""
-        return processes.get_process_id(self.app_process_name)
-
-    def is_running(self):
-        """Return bool representing if the app is running."""
-        return processes.is_process_running(self.app_process_name)
-
-    @abstractmethod
-    def get_main_view(self):
-        pass
-
-
-class QmlSceneApplication(Application):
-
-    def __init__(self, app_name, app_click, qml_file, app_id=None):
-        self.qml_file = qml_file
-        super().__init__(app_name, app_click, app_id)
-
-    def get_pid(self):
-        """Return the QML Scene application process id"""
-        return processes.get_qmlscene_process_id(self.qml_file)
-
-    @abstractmethod
-    def get_main_view(self):
-        pass

=== modified file 'ubuntu_system_tests/helpers/calculator/app.py'
--- ubuntu_system_tests/helpers/calculator/app.py	2016-08-29 14:25:05 +0000
+++ ubuntu_system_tests/helpers/calculator/app.py	2016-10-14 14:22:00 +0000
@@ -18,18 +18,17 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from ubuntu_system_tests.helpers.application import QmlSceneApplication
+from ubuntu_system_tests.helpers.application import Application
 
 APP_NAME = 'Calculator'
 APP_ID = 'com.ubuntu.calculator_calculator'
-APP_QML_FILE = 'ubuntu-calculator-app'
-APP_CLICK = 'com.ubuntu.calculator'
-
-
-class Calculator(QmlSceneApplication):
+APP_PACKAGE = 'com.ubuntu.calculator'
+
+
+class Calculator(Application):
 
     def __init__(self):
-        super().__init__(APP_NAME, APP_CLICK, APP_QML_FILE, APP_ID)
+        super().__init__(APP_NAME, APP_PACKAGE, APP_ID)
 
     def get_main_view(self):
         from ubuntu_system_tests.helpers.calculator import _cpo  # NOQA

=== modified file 'ubuntu_system_tests/helpers/camera/app.py'
--- ubuntu_system_tests/helpers/camera/app.py	2016-09-05 21:34:32 +0000
+++ ubuntu_system_tests/helpers/camera/app.py	2016-10-14 14:22:00 +0000
@@ -16,19 +16,18 @@
 # 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.application import QmlApplication
-
-
-APP_QML_FILE = 'camera-app'
+from ubuntu_system_tests.helpers.application import Application
+
+
 APP_NAME = 'Camera'
 APP_ID = 'com.ubuntu.camera_camera'
-APP_CLICK = 'com.ubuntu.camera'
-
-
-class Camera(QmlApplication):
+APP_PACKAGE = 'com.ubuntu.camera'
+
+
+class Camera(Application):
 
     def __init__(self):
-        super().__init__(APP_NAME, APP_CLICK, APP_QML_FILE, APP_ID)
+        super().__init__(APP_NAME, APP_PACKAGE, APP_ID)
 
     def get_main_view(self):
         from ubuntu_system_tests.helpers.camera._cpo import MainWindow

=== modified file 'ubuntu_system_tests/helpers/click.py'
--- ubuntu_system_tests/helpers/click.py	2015-06-03 15:46:34 +0000
+++ ubuntu_system_tests/helpers/click.py	2016-10-14 14:22:00 +0000
@@ -81,13 +81,6 @@
     return registry.has_package_name(package_name)
 
 
-def get_click_app_identifier(click):
-    """Return the app identifier or None if not found running."""
-    output = subprocess.check_output(['ubuntu-app-triplet', click],
-                                     universal_newlines=True)
-    return output.strip()
-
-
 def _get_click_registry():
     """Return click registry for the current user."""
     db = Click.DB()

=== modified file 'ubuntu_system_tests/helpers/clock/app.py'
--- ubuntu_system_tests/helpers/clock/app.py	2016-07-15 14:22:08 +0000
+++ ubuntu_system_tests/helpers/clock/app.py	2016-10-14 14:22:00 +0000
@@ -16,18 +16,17 @@
 # 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.application import QmlSceneApplication
+from ubuntu_system_tests.helpers.application import Application
 
 APP_NAME = 'Clock'
 APP_ID = 'com.ubuntu.clock_clock'
-APP_QML_FILE = 'ubuntu-clock-app'
-APP_CLICK = 'com.ubuntu.clock'
-
-
-class Clock(QmlSceneApplication):
+APP_PACKAGE = 'com.ubuntu.clock'
+
+
+class Clock(Application):
 
     def __init__(self):
-        super().__init__(APP_NAME, APP_CLICK, APP_QML_FILE, APP_ID)
+        super().__init__(APP_NAME, APP_PACKAGE, APP_ID)
 
     def get_main_view(self):
         from ubuntu_system_tests.helpers.clock._cpo import MainView  # NOQA

=== modified file 'ubuntu_system_tests/helpers/dialer_app/app.py'
--- ubuntu_system_tests/helpers/dialer_app/app.py	2016-09-20 13:29:33 +0000
+++ ubuntu_system_tests/helpers/dialer_app/app.py	2016-10-14 14:22:00 +0000
@@ -17,19 +17,17 @@
 # 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.application import QmlApplication
+from ubuntu_system_tests.helpers.application import Application
 
 APP_NAME = 'Phone'
-APP_ID = 'com.ubuntu.dialer'
-APP_QML_FILE = 'dialer-app'
-APP_CLICK = 'com.ubuntu.dialer'
-APP_WIN_ID = 'dialer-app'
-
-
-class Dialer(QmlApplication):
+APP_ID = 'dialer-app'
+APP_PACKAGE = 'dialer-app'
+
+
+class Dialer(Application):
 
     def __init__(self):
-        super().__init__(APP_NAME, APP_CLICK, APP_QML_FILE, APP_WIN_ID)
+        super().__init__(APP_NAME, APP_PACKAGE, APP_ID)
 
     def get_main_view(self):
         from ubuntu_system_tests.helpers.dialer_app import _cpo  # NOQA

=== modified file 'ubuntu_system_tests/helpers/gallery/__init__.py'
--- ubuntu_system_tests/helpers/gallery/__init__.py	2016-06-01 14:18:12 +0000
+++ ubuntu_system_tests/helpers/gallery/__init__.py	2016-10-14 14:22:00 +0000
@@ -20,9 +20,9 @@
 
 from ubuntu_system_tests.helpers.gallery.app import (
     APP,
-    APP_CLICK,
     APP_ICON_NAME,
     APP_NAME,
+    APP_PACKAGE,
     APP_WIN_ID,
     get_gallery_app_proxy,
     get_gallery_events_view,
@@ -34,9 +34,9 @@
 
 __all__ = [
     'APP',
-    'APP_CLICK',
     'APP_ICON_NAME',
     'APP_NAME',
+    'APP_PACKAGE',
     'APP_WIN_ID',
     'get_gallery_app_proxy',
     'get_gallery_events_view',

=== modified file 'ubuntu_system_tests/helpers/gallery/app.py'
--- ubuntu_system_tests/helpers/gallery/app.py	2016-08-29 21:57:45 +0000
+++ ubuntu_system_tests/helpers/gallery/app.py	2016-10-14 14:22:00 +0000
@@ -31,7 +31,7 @@
 APP = 'gallery-app'
 APP_NAME = 'Gallery'
 APP_WIN_ID = 'com.ubuntu.gallery_gallery'
-APP_CLICK = 'com.ubuntu.gallery'
+APP_PACKAGE = 'com.ubuntu.gallery'
 APP_ICON_NAME = 'gallery-app.png'
 
 

=== modified file 'ubuntu_system_tests/helpers/messaging/_cpo.py'
--- ubuntu_system_tests/helpers/messaging/_cpo.py	2016-09-22 12:58:15 +0000
+++ ubuntu_system_tests/helpers/messaging/_cpo.py	2016-10-14 14:22:00 +0000
@@ -140,7 +140,7 @@
 
     def _get_attachment_panel(self):
         """Return proxy object for attachment panel."""
-        return self.wait_select_single(AttachmentPanel)
+        return self.wait_select_single(AttachmentPanel, visible=True)
 
     def _get_content_picker(self):
         return self.wait_select_single(ContentPeerPicker13, visible=True)

=== modified file 'ubuntu_system_tests/helpers/music/__init__.py'
--- ubuntu_system_tests/helpers/music/__init__.py	2016-08-24 13:41:23 +0000
+++ ubuntu_system_tests/helpers/music/__init__.py	2016-10-14 14:22:00 +0000
@@ -20,6 +20,7 @@
     APP,
     APP_NAME,
     APP_ID,
+    APP_PACKAGE,
     APP_WIN_ID,
     CONFIG_FILE,
     get_music_app_proxy,
@@ -39,6 +40,7 @@
     'APP',
     'APP_NAME',
     'APP_ID',
+    'APP_PACKAGE',
     'APP_WIN_ID',
     'CONFIG_FILE',
     'get_current_album',

=== modified file 'ubuntu_system_tests/helpers/music/app.py'
--- ubuntu_system_tests/helpers/music/app.py	2016-09-06 12:55:23 +0000
+++ ubuntu_system_tests/helpers/music/app.py	2016-10-14 14:22:00 +0000
@@ -29,6 +29,7 @@
 APP = 'music-app'
 APP_NAME = 'Music'
 APP_ID = 'com.ubuntu.music'
+APP_PACKAGE = 'com.ubuntu.music'
 APP_WIN_ID = 'com.ubuntu.music_music'
 QML = 'music-app.qml'
 
@@ -49,7 +50,7 @@
 
 def is_music_app_running():
     """ Indicate if the music app is currently running """
-    return processes.is_qmlscene_running_with_qmlfile(APP)
+    return processes.is_application_running(APP_PACKAGE)
 
 
 def get_music_app_proxy():
@@ -60,10 +61,11 @@
 
     """
     from ubuntu_system_tests.helpers.music import _cpo  # NOQA
-    proxy = autopilot.get_proxy_object(processes.get_qmlscene_process_id(APP))
+    proxy = autopilot.get_proxy_object(
+        processes.get_application_pid(APP_PACKAGE))
     return proxy.main_view
 
 
 def stop_music_app():
     """ Stop the music app qml process """
-    processes.stop_qmlscene_process(QML)
+    processes.stop_application(APP_PACKAGE)

=== modified file 'ubuntu_system_tests/helpers/music/utils.py'
--- ubuntu_system_tests/helpers/music/utils.py	2016-08-24 13:41:23 +0000
+++ ubuntu_system_tests/helpers/music/utils.py	2016-10-14 14:22:00 +0000
@@ -22,7 +22,7 @@
 from ubuntu_system_tests.helpers import processes
 from ubuntu_system_tests.helpers.music import (
     CONFIG_FILE,
-    QML,
+    APP_PACKAGE,
 )
 
 FIRST_RUN_CONFIG_TEXT = 'firstRun='
@@ -40,7 +40,7 @@
     """ Retrieve the current song based on the url parameter
     :param delimiter: The delimiter used to split the url args parameters
     """
-    pid = processes.get_qmlscene_process_id(QML)
+    pid = processes.get_application_pid(APP_PACKAGE)
     line = processes.get_process_args(pid)
     args = line.split()
     for arg in args:

=== modified file 'ubuntu_system_tests/helpers/processes.py'
--- ubuntu_system_tests/helpers/processes.py	2016-09-21 19:04:49 +0000
+++ ubuntu_system_tests/helpers/processes.py	2016-10-14 14:22:00 +0000
@@ -32,8 +32,24 @@
 
 process_helpers = try_import('unity8.process_helpers')
 
+PROCESS_STATUS_WAITING = 'S'
+PROCESS_STATUS_RUNNING = 'R'
+PRCOESS_STATUS_UNINTERRUPTABLE = 'D'
+PROCESS_STATUS_STOPPED = 'T'
+PROCESS_STATUS_NOT_RUNNING = 'X'
+PROCESS_STATUS_ZOMBIE = 'Z'
+
+PROCESS_RUNNING_STATES = [
+    PROCESS_STATUS_WAITING,
+    PROCESS_STATUS_RUNNING,
+    PRCOESS_STATUS_UNINTERRUPTABLE,
+    PROCESS_STATUS_STOPPED,
+]
+
 logger = logging.getLogger(__name__)
 
+app_ids = None
+
 
 class PidNotFoundError(RuntimeError):
     """Pid not found error."""
@@ -65,65 +81,101 @@
     except subprocess.CalledProcessError:
         raise PidNotFoundError(pname)
     for pid in pids:
-        process = psutil.Process(int(pid))
-        if process.status() == psutil.STATUS_RUNNING \
-                or process.status() == psutil.STATUS_SLEEPING:
-            return process.pid
+        if get_process_status(pid) in PROCESS_RUNNING_STATES:
+            return int(pid)
     raise PidNotFoundError(pname)
 
 
+def get_process_status(pid):
+    """Return the status code for specifiec process id."""
+    try:
+        output = subprocess.check_output(['ps', '-p', pid, '-o', 'state'])
+    except subprocess.CalledProcessError:
+        return PROCESS_STATUS_NOT_RUNNING
+    else:
+        return output.decode().split()[1]
+
+
 def stop_process(pname):
     if is_process_running(pname):
         [process.terminate() for process in psutil.process_iter() if
          process.name() == pname]
 
 
-def start_application(app_name, *args):
-    subprocess.call(['ubuntu-app-launch', app_name] + list(args))
-
-
-def ensure_application_closed(app_id):
-    subprocess.call(['ubuntu-app-stop', app_id])
-
-
-def ensure_all_apps_closed():
+def start_application(package, *args):
+    """Start application with specified package."""
+    app_id = get_application_id(package)
+    subprocess.check_call(['ubuntu-app-launch', app_id] + list(args))
+
+
+def stop_application(package):
+    """Stop application with specified package."""
+    app_id = get_application_id(package)
+    if app_id == package:
+        # This is a native application.
+        # Due to https://launchpad.net/bugs/1626028 use os.kill instead of
+        # ubuntu-app-stop.
+        try:
+            pid = get_application_pid(package)
+        except PidNotFoundError:
+            pass  # app is already stopped
+        else:
+            os.kill(pid, signal.SIGKILL)
+    else:
+        # This is a web-app or click-app which works with ubuntu-app-stop
+        subprocess.check_call(['ubuntu-app-stop', app_id])
+
+
+def stop_all_applications():
+    """Stop all opened applications."""
     open_apps = list_open_applications()
     for app in open_apps:
-        ensure_application_closed(app)
+        stop_application(app)
+
+
+def get_app_id_list():
+    """Get list of installed app ids, using saved list if present."""
+    global app_ids
+    if not app_ids:
+        app_ids = subprocess.check_output(
+            ['ubuntu-app-launch-appids'],
+            universal_newlines=True).strip().split()
+    return app_ids
 
 
 def list_open_applications():
+    """Return a list of open application ids."""
     apps = subprocess.check_output(['ubuntu-app-list'],
-                                   shell=True,
                                    universal_newlines=True)
     return apps.split()
 
 
-def is_qmlscene_running_with_qmlfile(qmlfile):
-    """ Indicate if the qmlscene is running the qml file qmlfile """
-    pline = subprocess.check_output('ps -ef | grep qmlscene', shell=True,
-                                    universal_newlines=True)
-    return qmlfile in pline
-
-
-def get_qmlscene_process_id(qmlfile):
-    """ Retrieve the process id for the qmlscene running the file qmlfile """
+def is_application_running(package):
+    """Return boolean indicating if app is currently running."""
+    return get_application_id(package) in list_open_applications()
+
+
+def get_application_id(package):
+    """Return application id for specified app_id or package name."""
+    if package in get_app_id_list():
+        # The specified package is already a valid app id
+        return package
+    output = subprocess.check_output(
+        ['ubuntu-app-triplet', package], universal_newlines=True).strip()
+    if output:
+        return output
+    else:
+        raise ValueError('Package {} not found'.format(package))
+
+
+def get_application_pid(package):
+    app_id = get_application_id(package)
     try:
-        output = subprocess.check_output(['pgrep', 'qmlscene'])
-    except subprocess.CalledProcessError:
-        raise PidNotFoundError('qmlscene')
-    else:
-        for pid in output.decode().split():
-            if qmlfile in get_process_args(pid):
-                return int(pid)
-    raise PidNotFoundError('qmlscene {}'.format(qmlfile))
-
-
-def stop_qmlscene_process(qmlfile):
-    """ Stop the qmlscene process running the file qmlfile """
-    if is_qmlscene_running_with_qmlfile(qmlfile):
-        pid = get_qmlscene_process_id(qmlfile)
-        os.kill(pid, signal.SIGKILL)
+        pid = int(subprocess.check_output(['ubuntu-app-pid', app_id],
+                                          universal_newlines=True).strip())
+    except (subprocess.CalledProcessError, ValueError):
+        raise PidNotFoundError(app_id)
+    return pid
 
 
 def get_process_args(pid):

=== modified file 'ubuntu_system_tests/helpers/system_settings/app.py'
--- ubuntu_system_tests/helpers/system_settings/app.py	2016-09-06 12:55:23 +0000
+++ ubuntu_system_tests/helpers/system_settings/app.py	2016-10-14 14:22:00 +0000
@@ -28,6 +28,7 @@
 APP = 'system-settings'
 APP_NAME = 'System Settings'
 APP_WIN_ID = 'ubuntu-system-settings'
+APP_PACKAGE = 'ubuntu-system-settings'
 
 
 def launch_system_settings():

=== modified file 'ubuntu_system_tests/helpers/telegram/app.py'
--- ubuntu_system_tests/helpers/telegram/app.py	2016-08-26 18:44:37 +0000
+++ ubuntu_system_tests/helpers/telegram/app.py	2016-10-14 14:22:00 +0000
@@ -16,18 +16,17 @@
 # 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.application import QmlApplication
+from ubuntu_system_tests.helpers.application import Application
 
-APP_QML_FILE = 'telegram'
-APP_CLICK = 'com.ubuntu.telegram'
+APP_PACKAGE = 'com.ubuntu.telegram'
 APP_NAME = 'Telegram'
 APP_ID = 'com.ubuntu.telegram_telegram'
 
 
-class Telegram(QmlApplication):
+class Telegram(Application):
 
     def __init__(self):
-        super().__init__(APP_NAME, APP_CLICK, APP_QML_FILE, APP_ID)
+        super().__init__(APP_NAME, APP_PACKAGE, APP_ID)
 
     def get_main_view(self):
         from ubuntu_system_tests.helpers.telegram._cpo import MainView  # NOQA

=== modified file 'ubuntu_system_tests/helpers/ubuntuuitoolkit/_flickable.py'
--- ubuntu_system_tests/helpers/ubuntuuitoolkit/_flickable.py	2016-04-15 15:46:06 +0000
+++ ubuntu_system_tests/helpers/ubuntuuitoolkit/_flickable.py	2016-10-14 14:22:00 +0000
@@ -33,6 +33,7 @@
         """Over-ride base class helper to take account of OSK showing."""
         super().swipe_child_into_view(child)
         self.move_item_above_osk(child)
+        child.wait_until_not_moving()
 
     def move_upwards(self):
         """Swipe the flickable object upwards slightly."""

=== modified file 'ubuntu_system_tests/helpers/unity8/fixture_setup.py'
--- ubuntu_system_tests/helpers/unity8/fixture_setup.py	2016-09-23 20:23:53 +0000
+++ ubuntu_system_tests/helpers/unity8/fixture_setup.py	2016-10-14 14:22:00 +0000
@@ -29,8 +29,9 @@
 from ubuntu_system_tests.helpers import try_import
 from ubuntu_system_tests.helpers.processes import (
     PidNotFoundError,
-    ensure_all_apps_closed,
-    is_testability_enabled_for_process)
+    is_testability_enabled_for_process,
+    stop_all_applications,
+)
 from ubuntu_system_tests.helpers.unity8 import Unity8Job
 from autopilot import (
     exceptions
@@ -106,7 +107,7 @@
             if not is_testability_enabled_for_process(
                     self.unity8.get_pid()):
                 self.unity8.restart()
-        self.addCleanup(ensure_all_apps_closed)
+        self.addCleanup(stop_all_applications)
 
 
 class EnableUnity8FakeSensors(fixtures.Fixture):

=== modified file 'ubuntu_system_tests/helpers/webapp/__init__.py'
--- ubuntu_system_tests/helpers/webapp/__init__.py	2016-07-04 14:06:16 +0000
+++ ubuntu_system_tests/helpers/webapp/__init__.py	2016-10-14 14:22:00 +0000
@@ -23,8 +23,6 @@
     DEFAULT_WEBVIEW_INSPECTOR_IP,
     DEFAULT_WEBVIEW_INSPECTOR_PORT,
     get_webdriver,
-    is_webapp_runing,
-    launch_webapp,
 )
 
 
@@ -33,6 +31,4 @@
     'DEFAULT_WEBVIEW_INSPECTOR_IP',
     'DEFAULT_WEBVIEW_INSPECTOR_PORT',
     'get_webdriver',
-    'is_webapp_runing',
-    'launch_webapp',
 ]

=== modified file 'ubuntu_system_tests/helpers/webapp/_cpo.py'
--- ubuntu_system_tests/helpers/webapp/_cpo.py	2015-10-21 05:52:09 +0000
+++ ubuntu_system_tests/helpers/webapp/_cpo.py	2016-10-14 14:22:00 +0000
@@ -20,6 +20,22 @@
 
 from ubuntuuitoolkit import UbuntuUIToolkitCustomProxyObjectBase
 
+from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
+
+HERE_PATH_ROOT = b'comnokiaheremaps'
+
+
+class comnokiaheremaps(UbuntuUIToolkitCustomProxyObjectBase):
+
+    @classmethod
+    def validate_dbus_object(cls, path, state):
+        return validate_dbus_object(
+            path, state, HERE_PATH_ROOT, HERE_PATH_ROOT)
+
+    @property
+    def main_view(self):
+        return self.wait_select_single(BrowserWindow)
+
 
 class BrowserWindow(UbuntuUIToolkitCustomProxyObjectBase):
     """ Autopilot helper for the webapp Browser Window """

=== modified file 'ubuntu_system_tests/helpers/webapp/ebay.py'
--- ubuntu_system_tests/helpers/webapp/ebay.py	2016-07-14 19:11:58 +0000
+++ ubuntu_system_tests/helpers/webapp/ebay.py	2016-10-14 14:22:00 +0000
@@ -20,26 +20,21 @@
 
 from ubuntu_system_tests.helpers import (
     try_import,
-    webapp,
 )
+from ubuntu_system_tests.helpers.application import Application
 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'
-
-
-def launch_ebay_webapp():
-    """ Launch the Ebay webapp from apps scope and return its proxy object
-    """
-    return webapp.launch_webapp(WEBAPP_NAME, WEBAPP_PACKAGE)
-
-
-def is_ebay_webapp_running():
-    """ Indicate if the ebay webapp is currently running """
-    return webapp.is_webapp_runing(WEBAPP_PACKAGE)
+WEBAPP_ID = 'com.ubuntu.developer.webapps.webapp-ebay_webapp-ebay'
+
+
+class EbayApplication(Application):
+
+    def __init__(self):
+        super().__init__(WEBAPP_NAME, WEBAPP_PACKAGE, WEBAPP_ID)
 
 
 class Homepage(BasePage):

=== modified file 'ubuntu_system_tests/helpers/webapp/here.py'
--- ubuntu_system_tests/helpers/webapp/here.py	2016-07-15 13:30:57 +0000
+++ ubuntu_system_tests/helpers/webapp/here.py	2016-10-14 14:22:00 +0000
@@ -22,8 +22,8 @@
 
 from ubuntu_system_tests.helpers import (
     try_import,
-    webapp,
 )
+from ubuntu_system_tests.helpers.application import Application
 from ubuntu_system_tests.helpers.webapp import BasePage
 
 TimeoutException = try_import('selenium.common.exceptions').TimeoutException
@@ -33,19 +33,17 @@
 
 WEBAPP_NAME = 'HERE Maps'
 WEBAPP_PACKAGE = 'com.nokia.heremaps'
-WEBAPP_WIN_ID = 'com.nokia.heremaps_here'
-
-
-def launch_here_webapp():
-    """ Launch the Here webapp from apps scope and return its proxy object
-    """
-    return webapp.launch_webapp(WEBAPP_NAME, WEBAPP_PACKAGE)
-
-
-def is_here_webapp_running():
-    """ Indicate if the here webapp is currently running """
-    webapp_package = WEBAPP_PACKAGE
-    return webapp.is_webapp_runing(webapp_package)
+WEBAPP_ID = 'com.nokia.heremaps_here'
+
+
+class HereApplication(Application):
+
+    def __init__(self):
+        super().__init__(WEBAPP_NAME, WEBAPP_PACKAGE, WEBAPP_ID)
+
+    def get_main_view(self):
+        from ubuntu_system_tests.helpers.webapp import _cpo  # NOQA
+        return self.get_proxy_object().main_view
 
 
 class Homepage(BasePage):

=== modified file 'ubuntu_system_tests/helpers/webapp/utils.py'
--- ubuntu_system_tests/helpers/webapp/utils.py	2016-07-15 10:25:19 +0000
+++ ubuntu_system_tests/helpers/webapp/utils.py	2016-10-14 14:22:00 +0000
@@ -20,19 +20,10 @@
 
 import glob
 import logging
-import subprocess
 import os
 import time
 
-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
+from ubuntu_system_tests.helpers import try_import
 
 webdriver = try_import('selenium.webdriver')
 Options = webdriver.chrome.options.Options
@@ -44,65 +35,6 @@
 logger = logging.getLogger(__name__)
 
 
-def launch_webapp(app_name, web_app_package):
-    """ Launch the webapp and return the webapp proxy object
-    :param app_name: The name in the apps scope
-    :param web_app_package: The package name
-    :return: Proxy object for webapp
-    """
-    launch_application_from_apps_scope(app_name)
-    wait_until(is_webapp_runing, web_app_package)
-    return get_webapp_proxy(web_app_package)
-
-
-def is_webapp_runing(web_app):
-    """ Indicate if the web app is running """
-    try:
-        return get_webapp_pid(web_app) != 0
-    except:
-        return False
-
-
-def _get_webapp_id(web_app):
-    try:
-        webapp_id = subprocess.check_output(
-            ['ubuntu-app-triplet', web_app],
-            universal_newlines=True).strip()
-        return webapp_id
-    except subprocess.CalledProcessError:
-        raise RuntimeError('No such webapp {}'.format(web_app))
-
-
-def get_webapp_pid(web_app):
-    """ Retrieve the web app process id """
-    try:
-        webapp_id = _get_webapp_id(web_app)
-        return int(subprocess.check_output(['ubuntu-app-pid', webapp_id],
-                                           universal_newlines=True).strip())
-    except subprocess.CalledProcessError:
-        raise RuntimeError('No such webapp {} running'.format(webapp_id))
-
-
-def get_webapp_proxy(web_app_package):
-    """ Return webapp proxy object from existing process.
-    :param web_app_package: The package name
-    :return: Proxy object for webapp.
-    """
-    from ubuntu_system_tests.helpers.webapp import _cpo  # NOQA
-
-    pid = get_webapp_pid(web_app_package)
-    proxy = autopilot.get_proxy_object(pid)
-    return proxy.wait_select_single('BrowserWindow')
-
-
-def ensure_webapp_closed(web_app):
-    try:
-        webapp_id = _get_webapp_id(web_app)
-        processes.ensure_application_closed(webapp_id)
-    except subprocess.CalledProcessError:
-        pass
-
-
 def get_webdriver(cleanup_method):
     """ Retrieve the webdriver for the current webapp container """
     driver = setup_webdriver()

=== modified file 'ubuntu_system_tests/helpers/webbrowser/app.py'
--- ubuntu_system_tests/helpers/webbrowser/app.py	2016-07-15 14:22:08 +0000
+++ ubuntu_system_tests/helpers/webbrowser/app.py	2016-10-14 14:22:00 +0000
@@ -17,18 +17,17 @@
 # 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.application import QmlApplication
+from ubuntu_system_tests.helpers.application import Application
 
 APP_NAME = 'Browser'
 APP_ID = 'com.ubuntu.webbrowser'
-APP_QML_FILE = 'webbrowser-app'
-APP_CLICK = 'com.ubuntu.webbrowser'
-
-
-class WebBrowser(QmlApplication):
+APP_PACKAGE = 'webbrowser-app'
+
+
+class WebBrowser(Application):
 
     def __init__(self):
-        super().__init__(APP_NAME, APP_CLICK, APP_QML_FILE, APP_ID)
+        super().__init__(APP_NAME, APP_PACKAGE, APP_ID)
 
     def get_main_view(self):
         from ubuntu_system_tests.helpers.webbrowser import _cpo  # NOQA

=== modified file 'ubuntu_system_tests/perftests/scalability/test_photos.py'
--- ubuntu_system_tests/perftests/scalability/test_photos.py	2016-08-30 17:21:28 +0000
+++ ubuntu_system_tests/perftests/scalability/test_photos.py	2016-10-14 14:22:00 +0000
@@ -120,7 +120,7 @@
                       photo_viewer.get_photo_component().source)
         self._log_completed(CAROUSEL, PICS_ID)
 
-        processes.ensure_application_closed(gallery.APP)
+        processes.stop_application(gallery.APP_PACKAGE)
 
     @skipUnless(fs.is_media_folder_dir(fs.DIR_PICTURES), SD_REASON)
     @skipUnless(scopes.is_scope_included(scopes.SCOPE_ID_PHOTOS), PHOTO_REASON)
@@ -181,7 +181,7 @@
         self.assertLess(0, len(pics))
         self._log_completed(GALLERY, PICS_ID)
 
-        processes.ensure_application_closed(gallery.APP)
+        processes.stop_application(gallery.APP_PACKAGE)
 
     @skipUnless(fs.is_media_folder_dir(fs.DIR_PICTURES), SD_REASON)
     def test_view_gallery_pictures_on_sdcard(self):

=== modified file 'ubuntu_system_tests/tests/base_messaging.py'
--- ubuntu_system_tests/tests/base_messaging.py	2016-08-03 09:32:27 +0000
+++ ubuntu_system_tests/tests/base_messaging.py	2016-10-14 14:22:00 +0000
@@ -508,9 +508,9 @@
         addressbook = AddressBook()
         self._open_app_to_attach_content(
             attachment.media_type, addressbook.app_name)
-        addressbook_app = addressbook.proxy_object.main_window
-        self.addCleanup(processes.ensure_application_closed,
-                        addressbook.app_id)
+        addressbook_app = addressbook.get_main_view()
+        self.addCleanup(processes.stop_application,
+                        addressbook.app_package)
         list_page = addressbook_app.get_contact_list_pick_page()
         list_page.select_contact_by_name(attachment.identifier)
         list_page.confirm_selection()
@@ -520,7 +520,7 @@
         self._open_app_to_attach_content(
             attachment.media_type, gallery.APP_NAME)
         picker = gallery.get_gallery_app_proxy().picker_screen
-        self.addCleanup(processes.ensure_application_closed, gallery.APP)
+        self.addCleanup(processes.stop_application, gallery.APP_PACKAGE)
         sample_photo_location = os.path.join(fs.DIR_HOME_CAMERA_PICTURES,
                                              attachment.identifier)
         photos = picker.go_to_photos()
@@ -529,20 +529,22 @@
 
     def _add_attachment_from_camera(self, attachment):
         """Add an attachment using the camera app."""
+        camera_app = camera.Camera()
         self._open_app_to_attach_content(
-            attachment.media_type, camera.APP_NAME)
-        camera_app = camera.get_camera_app_proxy()
-        self.addCleanup(processes.ensure_application_closed, camera.APP)
-        camera_app.take_photo_and_select()
+            attachment.media_type, camera_app.app_name)
+        camera_view = camera_app.get_main_view()
+        self.addCleanup(processes.stop_application, camera_app.app_package)
+        camera_view.take_photo_and_select()
 
     def _add_attachment_from_camera_photoroll(self, attachment):
         """Add an attachment using the camera app photoroll."""
+        camera_app = camera.Camera()
         self._open_app_to_attach_content(
-            attachment.media_type, camera.APP_NAME)
-        camera_app = camera.get_camera_app_proxy()
-        self.addCleanup(processes.ensure_application_closed, camera.APP)
-        camera_app.swipe_to_gallery(self)
-        camera_app.select_photo_from_roll()
+            attachment.media_type, camera_app.app_name)
+        camera_view = camera_app.get_main_view()
+        self.addCleanup(processes.stop_application, camera_app.app_package)
+        camera_view.swipe_to_gallery(self)
+        camera_view.select_photo_from_roll()
 
     def set_default_sim_for_messages_with_uss(self, value):
         """
@@ -564,8 +566,8 @@
         settings.scroll_to_and_click(selector)
         selector.selected.wait_for(True)
         self.dash.swipe_screen_from_left()
-        self.addCleanup(processes.ensure_application_closed,
-                        system_settings.APP)
+        self.addCleanup(processes.stop_application,
+                        system_settings.APP_PACKAGE)
 
     def click_message_url(self, message_text):
         """Click the message text in a message bubble."""

=== modified file 'ubuntu_system_tests/tests/test_about_this_phone.py'
--- ubuntu_system_tests/tests/test_about_this_phone.py	2016-09-16 16:44:29 +0000
+++ ubuntu_system_tests/tests/test_about_this_phone.py	2016-10-14 14:22:00 +0000
@@ -99,7 +99,7 @@
 
     def _check_gallery_app_in_storage(self, storage_page):
         install_dir = os.path.join(fs.DIR_PREINSTALLED_CLICK_APPS,
-                                   gallery.APP_CLICK)
+                                   gallery.APP_PACKAGE)
         gallery_app_size = self._bytes_to_kb(
             fs.get_disk_usage(install_dir))
         self._check_storage_in_range(gallery_app_size, self._storage_to_kb(

=== modified file 'ubuntu_system_tests/tests/test_app_store.py'
--- ubuntu_system_tests/tests/test_app_store.py	2016-09-16 16:44:29 +0000
+++ ubuntu_system_tests/tests/test_app_store.py	2016-10-14 14:22:00 +0000
@@ -97,9 +97,8 @@
         # Wait for the application to start installing.
         self.dash.wait_for_processing_to_complete()
         preview.wait_until_package_installed()
-        app_id = click.get_click_app_identifier(google_maps.PACKAGE_NAME)
         preview.open()
-        self.addCleanup(processes.ensure_application_closed, app_id)
+        self.addCleanup(processes.stop_application, google_maps.PACKAGE_NAME)
 
         self.assertThat(
             self.shell.get_current_focused_app_id, Eventually(

=== modified file 'ubuntu_system_tests/tests/test_app_switcher.py'
--- ubuntu_system_tests/tests/test_app_switcher.py	2016-09-20 14:43:41 +0000
+++ ubuntu_system_tests/tests/test_app_switcher.py	2016-10-14 14:22:00 +0000
@@ -27,7 +27,8 @@
     fixture_setup as camera_fixture)
 from ubuntu_system_tests.helpers.dialer_app import (
     Dialer,
-    app as dialer_app_helpers)
+    app as dialer_app_helpers,
+)
 from ubuntu_system_tests.helpers.messaging import Messaging
 from ubuntu_system_tests.helpers.processes import is_process_running
 from ubuntu_system_tests.helpers import unity8
@@ -88,7 +89,7 @@
         camera_title, ma, aa, dialer_title = self._launch_applications(stage)
         self._switch_to_app(stage, camera_app_helpers.APP_ID, camera_title)
         stage = self.shell.swipe_to_show_app_switcher()
-        self._switch_to_app(stage, dialer_app_helpers.APP_WIN_ID, dialer_title)
+        self._switch_to_app(stage, camera_app_helpers.APP_ID, camera_title)
 
     def test_close_app(self):
         """
@@ -96,5 +97,5 @@
         the swipe actions.
         """
         stage = self._launch_switcher()
-        dialer_title = self._launch_applications(stage)[3]
-        self._close_app(stage, dialer_app_helpers.APP_WIN_ID, dialer_title)
+        dialer_title = self._launch_applications(stage)[0]
+        self._close_app(stage, dialer_app_helpers.APP_ID, dialer_title)

=== modified file 'ubuntu_system_tests/tests/webapps/test_ebay.py'
--- ubuntu_system_tests/tests/webapps/test_ebay.py	2016-09-16 12:58:16 +0000
+++ ubuntu_system_tests/tests/webapps/test_ebay.py	2016-10-14 14:22:00 +0000
@@ -31,7 +31,9 @@
 
     def setUp(self):
         super().setUp()
-        self.web_app = ebay.launch_ebay_webapp()
+        self.ebay_app = ebay.EbayApplication()
+        self.ebay_app.launch_from_scope(return_proxy=False)
+        self.web_app = self.ebay_app.get_proxy_object()
         self.driver = webapp.get_webdriver(self.addCleanup)
 
     def test_open_and_view_content(self):

=== modified file 'ubuntu_system_tests/tests/webapps/test_here.py'
--- ubuntu_system_tests/tests/webapps/test_here.py	2016-09-16 12:58:16 +0000
+++ ubuntu_system_tests/tests/webapps/test_here.py	2016-10-14 14:22:00 +0000
@@ -41,7 +41,9 @@
         self.useFixture(DummyLocation(*EIFFEL_TOWER))
         super().setUp()
         self.useFixture(SetLocationAccessRequests(self.LOCATION_APP))
-        self.webapp = here.launch_here_webapp()
+        self.here_app = here.HereApplication()
+        self.here_app.launch_from_scope(return_proxy=False)
+        self.webapp = self.here_app.get_main_view()
         self.driver = webapp.get_webdriver(self.addCleanup)
 
     def test_retrieve_location(self):