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

[Sergio Cazzolato]

Run app_startup tests. Running these tests, the elapsed times to start apps are saved to be processed.

Run the tests by doing:
./run-system-tests ubuntu_system_tests.tests.app_startup.test_application_startup

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:289
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1288/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-amd64-ci/1014
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-armhf-ci/1017
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-i386-ci/1014

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1288/rebuild

review: Approve (continuous-integration)

[Richard Huddie (rhuddie)]

I've made some minor comments below.

Also a question regarding best approach to stop the apps. By using the ubuntu-app-stop or process killing mechanism, we are not stopping the app in the way it would be done by user, so could potentially lead to data being left in bad state, or app doesn't get time to save data etc. So, as we now have the task switcher cpo which allows apps to be closed the correct way, should we use that? Perhaps not for cleanup actions where we just want to close the process, but when running performance tests in a loop I think it makes senses to do it the way a user would through the UI. What do you think?

I did a test run with a couple of failure results:
http://pastebin.ubuntu.com/14662564/

review: Needs Fixing

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

290. By Sergio Cazzolato on 2016-01-25

Split runs by run type and improve the cache cleanup

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:290
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1290/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-amd64-ci/1016
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-armhf-ci/1019
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-i386-ci/1016

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1290/rebuild

review: Approve (continuous-integration)

[Sergio Cazzolato (sergio-j-cazzolato)]

> I've made some minor comments below.
>
> Also a question regarding best approach to stop the apps. By using the ubuntu-
> app-stop or process killing mechanism, we are not stopping the app in the way
> it would be done by user, so could potentially lead to data being left in bad
> state, or app doesn't get time to save data etc. So, as we now have the task
> switcher cpo which allows apps to be closed the correct way, should we use
> that? Perhaps not for cleanup actions where we just want to close the process,
> but when running performance tests in a loop I think it makes senses to do it
> the way a user would through the UI. What do you think?
>
> I did a test run with a couple of failure results:
> http://pastebin.ubuntu.com/14662564/

I have implemented a close_app method in the base class following the method done for AppSwitcherTestCase

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

291. By Sergio Cazzolato on 2016-01-26

Stop apps method replaced by close apps method using the task switcher

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:291
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1291/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-amd64-ci/1017
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-armhf-ci/1020
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-i386-ci/1017

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1291/rebuild

review: Approve (continuous-integration)

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

292. By Sergio Cazzolato on 2016-01-26

Adding exception management for tests execution

293. By Sergio Cazzolato on 2016-01-26

Update exception message logged

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:293
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1292/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-amd64-ci/1018
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-armhf-ci/1021
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-i386-ci/1018

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1292/rebuild

review: Approve (continuous-integration)

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

294. By Sergio Cazzolato on 2016-01-26

Waiting until the app is started to get its proxy when the app is launched

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:294
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1293/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-amd64-ci/1019
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-armhf-ci/1022
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-i386-ci/1019

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1293/rebuild

review: Approve (continuous-integration)

[Richard Huddie (rhuddie)]

Running tests currently. App switcher closing is working well, 1 comment below where HERE is not dismissing the location request prompt.

review: Needs Fixing

[Richard Huddie (rhuddie)]

Also seeing some CPO failures getting the CPO for some apps:
http://pastebin.ubuntu.com/14679028/

Using the patched_wait_select_single() method might help to resolve this.

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

295. By Sergio Cazzolato on 2016-01-27

Creating new test class for here app

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:295
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1295/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-amd64-ci/1021
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-armhf-ci/1024
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-i386-ci/1021

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1295/rebuild

review: Approve (continuous-integration)

[Richard Huddie (rhuddie)]

I came across following failure when running on Arale and trying to launch the music app: http://pastebin.ubuntu.com/14688909/

See comment below.

review: Needs Fixing

[Richard Huddie (rhuddie)]

I've made an MP which will allow to get the category name for an app, so it should fix the issue I saw earlier where the category changed on different devices.

https://code.launchpad.net/~canonical-platform-qa/ubuntu-system-tests/get-app-category/+merge/284326

This could be added directly to this branch or used as pre-requisite branch.

[Sergio Cazzolato (sergio-j-cazzolato)]

Great, thanks Richard, so the idea should be autodetect the category and remove the category from the method signature. Do you agree with that?

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

296. By Sergio Cazzolato on 2016-01-28

Moving config to the config file and making run_id the same for all the times during the same run

297. By Sergio Cazzolato on 2016-01-28

Minor fix to cast the runs

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:296
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1302/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-amd64-ci/1028
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-armhf-ci/1031
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-i386-ci/1028

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1302/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:297
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1303/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-amd64-ci/1029
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-armhf-ci/1032
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-i386-ci/1029

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1303/rebuild

review: Approve (continuous-integration)

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

298. By Sergio Cazzolato on 2016-01-29

merge with get-app-category branch

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:298
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1307/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-amd64-ci/1033
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-armhf-ci/1036
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-i386-ci/1033

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1307/rebuild

review: Approve (continuous-integration)

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

299. By Sergio Cazzolato on 2016-02-01

merge with trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:299
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1308/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-amd64-ci/1034
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-armhf-ci/1037
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-i386-ci/1034

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1308/rebuild

review: Approve (continuous-integration)

[Richard Huddie (rhuddie)]

Currently getting this config error: http://pastebin.ubuntu.com/14856649/

review: Needs Fixing

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

300. By Sergio Cazzolato on 2016-02-02

Adding config values to config file

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:300
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1310/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-amd64-ci/1036
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-armhf-ci/1039
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-i386-ci/1036

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1310/rebuild

review: Approve (continuous-integration)

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

301. By Sergio Cazzolato on 2016-02-03

Merge with dependency branch

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:301
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1319/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-amd64-ci/1045
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-armhf-ci/1048
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-i386-ci/1045

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1319/rebuild

review: Approve (continuous-integration)

[Richard Huddie (rhuddie)]

I did a test run, there were a few times the apps didn't load, but this was logged accordingly. No CPO errors now.

I've added a few minor comments below.

review: Needs Fixing

[Sergio Cazzolato (sergio-j-cazzolato)]

Changes implemented

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

302. By Sergio Cazzolato on 2016-02-05

Updating changes based on code reviews

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:302
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1327/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-amd64-ci/1053
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-armhf-ci/1056
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-wily-i386-ci/1053

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sanity-tests-ci/1327/rebuild

review: Approve (continuous-integration)

[Richard Huddie (rhuddie)]

Looks good and tests working well, approving.

review: Approve

=== modified file 'ubuntu_system_tests/config.py'
--- ubuntu_system_tests/config.py	2015-11-05 17:35:49 +0000
+++ ubuntu_system_tests/config.py	2016-02-05 13:59:58 +0000
@@ -109,6 +109,14 @@
         'max_unity8_retry_delay', default=30000,
         help_string='The boundary for how long we should be retrying until '
                     'unity8 is started'),
+    options.Option(
+        'app_startup_cold_runs', default=5,
+        help_string='How many iterations to run for the cold start app '
+                    'performance tests?'),
+    options.Option(
+        'app_startup_hot_runs', default=5,
+        help_string='How many iterations to run for the hot start app '
+                    'performance tests?'),
 ]
 """Options for tests in external debian and click packages."""
 

=== modified file 'ubuntu_system_tests/helpers/autopilot.py'
--- ubuntu_system_tests/helpers/autopilot.py	2016-02-02 17:23:05 +0000
+++ ubuntu_system_tests/helpers/autopilot.py	2016-02-05 13:59:58 +0000
@@ -262,17 +262,30 @@
 
 
 def get_channel_name():
-    """
-    Return the build channel name. In case there is not channel defined, it
-    returns the default value
+    """ Return the build channel name. In case there is not channel defined, it
+    return the default value
+    """
+    default = 'ubuntu-touch/rc-proposed/bq-aquaris.en'
+    return _get_image_info('service', 'channel', default)
+
+
+def get_build_number():
+    """ Return the build number. In case there is not channel defined, it
+    return the default value
+    """
+    return _get_image_info('service', 'build_number', '0')
+
+
+def _get_image_info(category, item, default):
+    """ Return the image item requested. In case it is not defined, it return
+    the default value
     """
     file = '/etc/system-image/channel.ini'
-    default = 'ubuntu-touch/rc-proposed/bq-aquaris.en'
     if not os.path.isfile(file):
         return default
     parser = configparser.ConfigParser()
     parser.read(file)
-    return parser['service']['channel']
+    return parser[category][item]
 
 
 def is_agps_supported():

=== modified file 'ubuntu_system_tests/helpers/music.py'
--- ubuntu_system_tests/helpers/music.py	2015-11-06 22:35:54 +0000
+++ ubuntu_system_tests/helpers/music.py	2016-02-05 13:59:58 +0000
@@ -24,10 +24,6 @@
 QML = 'music-app.qml'
 
 
-def is_music_app_running():
-    return processes.is_qmlscene_running_with_qmlfile(QML)
-
-
 def stop_music_app():
     processes.stop_qmlscene_process(QML)
 

=== modified file 'ubuntu_system_tests/helpers/scopes/base.py'
--- ubuntu_system_tests/helpers/scopes/base.py	2016-01-05 15:28:08 +0000
+++ ubuntu_system_tests/helpers/scopes/base.py	2016-02-05 13:59:58 +0000
@@ -18,6 +18,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+import logging
+
 from autopilot import exceptions
 from collections import namedtuple
 from unity8 import dash as unity8_dash
@@ -26,6 +28,7 @@
 from ubuntu_system_tests.helpers.ubuntuuitoolkit.pageheader import (
     DashPageHeader
 )
+from ubuntu_system_tests.helpers import timer
 from ubuntu_system_tests.helpers.unity8 import get_dash
 from ubuntu_system_tests.helpers.url_dispatcher import go_to_url
 
@@ -33,6 +36,8 @@
 
 IMAGE_TYPES = ['QQuickImage', 'CroppedImageMinimumSourceSize']
 
+logger = logging.getLogger(__name__)
+
 
 class GenericScopeView(unity8_dash.GenericScopeView):
     """
@@ -70,6 +75,7 @@
         x, y, width, height = icon.globalRect
         self.pointing_device.move(x + 1, y + 1)
         self.pointing_device.click(press_duration=press_duration)
+        timer.start(timer.LAUNCH_ID)
 
     def _get_data_from_object(self, object):
         """

=== added file 'ubuntu_system_tests/helpers/timer.py'
--- ubuntu_system_tests/helpers/timer.py	1970-01-01 00:00:00 +0000
+++ ubuntu_system_tests/helpers/timer.py	2016-02-05 13:59:58 +0000
@@ -0,0 +1,53 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Ubuntu System Tests
+# Copyright (C) 2016 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+from datetime import datetime
+
+start_times = {}
+
+LAUNCH_ID = 'launch'
+
+
+def start(id):
+    """ Start the timer identified with the id """
+    global start_times
+    start_times[id] = datetime.now()
+
+
+def _get_elapsed_time(id):
+    global start_times
+    end_time = datetime.now()
+    if id not in start_times:
+        raise RuntimeError('Timer with id {} not initialized'.format(id))
+
+    elapsed_time = end_time - start_times[id]
+    return elapsed_time.total_seconds()
+
+
+def stop(id):
+    """ Retrieve the elapsed time in seconds from the id was started and stop
+    the counter """
+    elapsed_time = _get_elapsed_time(id)
+    start_times.pop(id)
+    return elapsed_time
+
+
+def get_elaspsed_time(id):
+    """ Retrieve the elapsed time in seconds from the id was started """
+    return _get_elapsed_time(id)

=== modified file 'ubuntu_system_tests/helpers/webbrowser/__init__.py'
--- ubuntu_system_tests/helpers/webbrowser/__init__.py	2015-11-23 05:00:48 +0000
+++ ubuntu_system_tests/helpers/webbrowser/__init__.py	2016-02-05 13:59:58 +0000
@@ -23,11 +23,6 @@
 APP = 'webbrowser-app'
 
 
-def is_webbrowser_running():
-    """ Indicate if the webbrowser is running """
-    return processes.is_process_running(APP)
-
-
 def get_webbrowser_process_id():
     """ Retrieve the webbrowser process id """
     return processes.get_process_id(APP)

=== added directory 'ubuntu_system_tests/tests/app_startup'
=== added file 'ubuntu_system_tests/tests/app_startup/__init__.py'
--- ubuntu_system_tests/tests/app_startup/__init__.py	1970-01-01 00:00:00 +0000
+++ ubuntu_system_tests/tests/app_startup/__init__.py	2016-02-05 13:59:58 +0000
@@ -0,0 +1,19 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Ubuntu System Tests
+# Copyright (C) 2015, 2016 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#

=== added file 'ubuntu_system_tests/tests/app_startup/test_application_startup.py'
--- ubuntu_system_tests/tests/app_startup/test_application_startup.py	1970-01-01 00:00:00 +0000
+++ ubuntu_system_tests/tests/app_startup/test_application_startup.py	2016-02-05 13:59:58 +0000
@@ -0,0 +1,212 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Ubuntu System Tests
+# Copyright (C) 2015, 2016 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import logging
+import os
+import traceback
+
+from ubuntu_system_tests import config
+from ubuntu_system_tests.helpers import autopilot
+from ubuntu_system_tests.helpers.camera.fixture_setup import (
+    SetCameraAccessRequests
+)
+from ubuntu_system_tests.helpers.clock.fixture_setup import (
+    SetClockAccessRequests)
+from ubuntu_system_tests.helpers import file_system as fs
+from ubuntu_system_tests.helpers.location.fixture_setup import (
+    SetLocationAccessRequests)
+from ubuntu_system_tests.helpers.testbed import run_command_with_sudo
+from ubuntu_system_tests.helpers import timer
+from ubuntu_system_tests.helpers.webbrowser.fixture_setup import (
+    WebbrowserTestEnvironment
+)
+from ubuntu_system_tests.tests.base import BaseUbuntuSystemTestCase
+
+logger = logging.getLogger(__name__)
+
+HOT = 'hot'
+COLD = 'cold'
+COLD_RUNS_KEY = 'app_startup_cold_runs'
+HOT_RUNS_KEY = 'app_startup_hot_runs'
+RUN_ID = fs.get_random_string()
+
+
+class BaseAppStartupTestCase(BaseUbuntuSystemTestCase):
+
+    def setUp(self):
+        super().setUp()
+        self.shell = self.restart_unity()
+        self.addCleanup(self._clear_qml_cache)
+        self._log_global_info()
+
+    def _clear_qml_cache(self):
+        fs.clean_dir(os.path.join(fs.DIR_HOME_CACHE, 'QML'))
+        run_command_with_sudo('sysctl -w vm.drop_caches=3')
+
+    def _load_config_values(self, key, default=None):
+        config_stack = config.get_device_config_stack()
+        try:
+            return config_stack.get(key)
+        except KeyError:
+            return default
+
+    def _log_started(self, app, type):
+        started = {"app": app, "time": timer.stop(timer.LAUNCH_ID),
+                   "type": type}
+        logger.info("Started => {}".format(started))
+
+    def _log_global_info(self):
+        global_info = {"run_id": RUN_ID,
+                       "device": autopilot.get_device_name(),
+                       "channel": autopilot.get_channel_name(),
+                       "build_number": autopilot.get_build_number()}
+
+        logger.info("Global Info <= {}".format(global_info))
+
+    def _run(self, runs, app_name, run_type, launch_method,
+             close_method, loaded_method=None, setup_method=None):
+        runs_passed = 0
+        for i in range(runs):
+            try:
+                if setup_method:
+                    setup_method()
+                launch_method()
+                if loaded_method:
+                    loaded_method()
+                self._log_started(app_name, run_type)
+                runs_passed += 1
+            except:
+                logger.error('Unexpected error: {}'.format(
+                    traceback.format_exc()))
+            finally:
+                close_method()
+        return runs_passed
+
+    def _run_test(self, app_name, launch_method, close_method,
+                  loaded_method=None):
+        cold_runs = int(self._load_config_values(COLD_RUNS_KEY, 1))
+        res_cold = self._run(cold_runs, app_name, COLD,
+                             launch_method, close_method,
+                             loaded_method=loaded_method,
+                             setup_method=self._clear_qml_cache)
+        hot_runs = int(self._load_config_values(HOT_RUNS_KEY, 1))
+        res_hot = self._run(hot_runs, app_name, HOT,
+                            launch_method, close_method,
+                            loaded_method=loaded_method)
+
+        msg = 'Not all the runs worked properly for app {}. Cold runs ' \
+              'passed {}/{}. Hot runs passed {}/{}'
+        self.assertTrue(cold_runs == res_cold and hot_runs == res_hot,
+                        msg.format(app_name, res_cold, cold_runs, res_hot,
+                                   hot_runs))
+
+
+class AppStartupTestCase(BaseAppStartupTestCase):
+
+    def test_dialer_startup(self):
+        self._run_test('dialer', self.launch_dialer_app,
+                       self.close_dialer_app,
+                       loaded_method=self.shell.ensure_app_loaded)
+
+    def test_calculator_startup(self):
+        self._run_test('calculator', self.launch_calculator_app,
+                       self.close_calculator_app,
+                       loaded_method=self.shell.ensure_app_loaded)
+
+    def test_address_book_startup(self):
+        self._run_test('address_book', self.launch_address_book,
+                       self.close_address_book,
+                       loaded_method=self.shell.ensure_app_loaded)
+
+    def test_messaging_startup(self):
+        self._run_test('messaging', self.launch_messaging_app,
+                       self.close_messaging_app,
+                       loaded_method=self.shell.ensure_app_loaded)
+
+    def test_ebay_startup(self):
+        self._run_test('ebay', self.launch_ebay_webapp,
+                       self.close_ebay_webapp,
+                       loaded_method=self.shell.ensure_app_loaded)
+
+    def test_system_settings_startup(self):
+        self._run_test('system_settings', self.launch_system_settings,
+                       self.close_system_settings,
+                       loaded_method=self.shell.ensure_app_loaded)
+
+    def test_gallery_startup(self):
+        self._run_test('gallery', self.launch_gallery_app_from_launcher,
+                       self.close_gallery_app,
+                       loaded_method=self.shell.ensure_app_loaded)
+
+    def test_music_startup(self):
+        self._run_test('music', self.launch_music_app,
+                       self.close_music_app,
+                       loaded_method=self.shell.ensure_app_loaded)
+
+
+class CameraAppStartupTestCase(BaseAppStartupTestCase):
+
+    def setUp(self):
+        self.useFixture(SetCameraAccessRequests())
+        super().setUp()
+
+    def _launch_camera_app(self):
+        camera = self.launch_camera_app()
+        camera.ensure_camera_ready()
+
+    def test_camera_startup(self):
+        self._run_test('camera', self._launch_camera_app,
+                       self.close_camera_app)
+
+
+class WebBrowserAppStartupTestCase(BaseAppStartupTestCase):
+
+    def setUp(self):
+        self.useFixture(WebbrowserTestEnvironment())
+        super().setUp()
+
+    def test_webbrowser_startup(self):
+        self._run_test('webbrowser', self.launch_webbrowser_app,
+                       self.close_webbrowser_app,
+                       loaded_method=self.shell.ensure_app_loaded)
+
+
+class ClockAppStartupTestCase(BaseAppStartupTestCase):
+
+    def setUp(self):
+        self.useFixture(SetClockAccessRequests())
+        super().setUp()
+
+    def test_clock_startup(self):
+        self._run_test('clock', self.launch_clock_app,
+                       self.close_clock_app,
+                       loaded_method=self.shell.ensure_app_loaded)
+
+
+class HereAppStartupTestCase(BaseAppStartupTestCase):
+
+    def setUp(self):
+        self.useFixture(SetLocationAccessRequests('com.nokia.heremaps_here'))
+        super().setUp()
+
+    def test_here_startup(self):
+        self._run_test('here', self.launch_here_webapp,
+                       self.close_here_webapp,
+                       loaded_method=self.shell.ensure_app_loaded)

=== modified file 'ubuntu_system_tests/tests/base.py'
--- ubuntu_system_tests/tests/base.py	2016-01-29 12:10:01 +0000
+++ ubuntu_system_tests/tests/base.py	2016-02-05 13:59:58 +0000
@@ -50,6 +50,7 @@
 from ubuntu_system_tests.helpers import mir
 from ubuntu_system_tests.helpers import processes
 from ubuntu_system_tests.helpers import screen
+from ubuntu_system_tests.helpers import timer
 from ubuntu_system_tests.helpers import unity8
 from ubuntu_system_tests.helpers import wait_until
 from ubuntu_system_tests.helpers import webapp
@@ -61,6 +62,7 @@
 # Any test name ending with this will leave device locked
 TEST_ID_DEVICE_LOCKED = 'device_locked'
 
+# Apps and cleanup names
 CALCULATOR_APP = 'ubuntu-calculator-app'
 
 CATEGORY_LOCAL = 'local'
@@ -246,6 +248,7 @@
 
         """
         unity = self.get_job_proxy_object('unity8')
+        timer.start(timer.LAUNCH_ID)
         unity.main_window.launch_application(app_name)
 
     def _get_proxy_object_for_existing_app(
@@ -325,6 +328,15 @@
             'Contacts', CATEGORY_PREDEFINED)
         return self.get_address_book_app_proxy()
 
+    def close_address_book(self):
+        """ Close the address book app using task switcher """
+        if self.is_address_book_app_running():
+            self._close_app('address-book-app')
+
+    def is_address_book_app_running(self):
+        """ Indicate if the address book app is currently running """
+        return processes.is_process_running('address-book-app')
+
     def launch_address_book_from_launcher(self):
         """Drag out the launcher and tap the address book icon to start it."""
         self._launch_application_from_launcher('address-book-app')
@@ -338,6 +350,7 @@
 
         """
         from ubuntu_system_tests.helpers.addressbook import _cpo  # NOQA
+        wait_until(self.is_address_book_app_running, period=0.5)
         proxy = self._get_proxy_object_for_existing_app('address-book-app')
         return proxy.main_window
 
@@ -351,6 +364,15 @@
         self._launch_application_from_apps_scope('Camera', CATEGORY_PREDEFINED)
         return self.get_camera_app_proxy()
 
+    def close_camera_app(self):
+        """ Close the camera app using task switcher """
+        if self.is_camera_app_running():
+            self._close_app('com.ubuntu.camera_camera')
+
+    def is_camera_app_running(self):
+        """ Indicate if the camera app is currently running """
+        return processes.is_process_running('camera-app')
+
     def launch_camera_app_from_launcher(self):
         """Drag out the launcher and tap the camera icon to start it."""
         self._launch_application_from_launcher('com.ubuntu.camera_camera')
@@ -365,6 +387,7 @@
 
         """
         from ubuntu_system_tests.helpers.camera._cpo import MainWindow
+        wait_until(self.is_camera_app_running, period=0.5)
         proxy = self._get_proxy_object_for_existing_app(
             'camera-app',
             cleanup_process=click.get_click_app_identifier('com.ubuntu.camera')
@@ -381,6 +404,15 @@
         self._launch_application_from_apps_scope('Phone', CATEGORY_PREDEFINED)
         return self.get_dialer_app_proxy()
 
+    def close_dialer_app(self):
+        """ Close the dialer app using task switcher """
+        if self.is_dialer_app_running():
+            self._close_app('dialer-app')
+
+    def is_dialer_app_running(self):
+        """ Indicate if the dialer app is currently running """
+        return processes.is_process_running('dialer-app')
+
     def get_dialer_app_proxy(self):
         """
         Return dialer app proxy object from existing process.
@@ -389,6 +421,7 @@
 
         """
         from ubuntu_system_tests.helpers.dialer_app import _cpo  # NOQA
+        wait_until(self.is_dialer_app_running, period=0.5)
         proxy = self._get_proxy_object_for_existing_app('dialer-app')
         return proxy.main_view
 
@@ -403,6 +436,15 @@
         self._launch_application_from_apps_scope('Gallery', CATEGORY_LOCAL)
         return EventsView(self.get_gallery_app_proxy())
 
+    def close_gallery_app(self):
+        """ Close the gallery app using task switcher """
+        if self.is_gallery_app_running():
+            self._close_app('com.ubuntu.gallery_gallery')
+
+    def is_gallery_app_running(self):
+        """ Indicate if the gallery app is currently running """
+        return processes.is_process_running('gallery-app')
+
     def get_gallery_app_proxy(self):
         """
         Return gallery app proxy object from existing process.
@@ -410,9 +452,11 @@
         :return: Proxy object for gallery application.
 
         """
-        proxy = self._get_proxy_object_for_existing_app('gallery-app')
-        # ubuntu-app-stop does not work with gallery app, use process helper
-        self.addCleanup(processes.stop_process, 'gallery-app')
+        wait_until(self.is_gallery_app_running, period=0.5)
+        proxy = self._get_proxy_object_for_existing_app(
+            'gallery-app',
+            cleanup_process=click.get_click_app_identifier(
+                'com.ubuntu.gallery'))
         return proxy
 
     def get_gallery_events_view(self):
@@ -447,6 +491,15 @@
             'Messaging', CATEGORY_PREDEFINED)
         return self.get_messaging_app_proxy()
 
+    def close_messaging_app(self):
+        """ Close the messaging app using task switcher """
+        if self.is_messaging_app_running():
+            self._close_app('messaging-app')
+
+    def is_messaging_app_running(self):
+        """ Indicate if the messaging app is currently running """
+        return processes.is_process_running('messaging-app')
+
     def get_messaging_app_proxy(
             self, base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
         """
@@ -455,6 +508,7 @@
         :return: Proxy object for messaging application.
 
         """
+        wait_until(self.is_messaging_app_running, period=0.5)
         if not base:
             return self._get_proxy_object_for_existing_app('messaging-app',
                                                            base=base)
@@ -474,6 +528,15 @@
             'System Settings', CATEGORY_LOCAL)
         return self.get_system_settings_proxy()
 
+    def close_system_settings(self):
+        """ Close the system settings app using task switcher """
+        if self.is_system_settings_running():
+            self._close_app('ubuntu-system-settings')
+
+    def is_system_settings_running(self):
+        """ Indicate if the system settings is currently running """
+        return processes.is_process_running('system-settings')
+
     def get_system_settings_proxy(self):
         """
         Return system settings proxy object from existing process.
@@ -482,6 +545,7 @@
 
         """
         from ubuntu_system_tests.helpers.system_settings import _cpo  # NOQA
+        wait_until(self.is_system_settings_running, period=0.5)
         proxy = self._get_proxy_object_for_existing_app(
             'system-settings', cleanup_process='ubuntu-system-settings')
         return proxy.main_view
@@ -497,6 +561,15 @@
             'Browser', CATEGORY_PREDEFINED)
         return self.get_webbrowser_app_proxy()
 
+    def close_webbrowser_app(self):
+        """ Close the webbrowser app using task switcher """
+        if self.is_webbrowser_app_running():
+            self._close_app('webbrowser-app')
+
+    def is_webbrowser_app_running(self):
+        """ Indicate if the webbrowser app is currently running """
+        return processes.is_process_running('webbrowser-app')
+
     def get_webbrowser_app_proxy(self):
         """
         Return webbrowser app proxy object from existing process.
@@ -505,6 +578,7 @@
 
         """
         from ubuntu_system_tests.helpers.webbrowser import _cpo  # NOQA
+        wait_until(self.is_webbrowser_app_running, period=0.5)
         proxy = self._get_proxy_object_for_existing_app('webbrowser-app')
         return proxy.main_window
 
@@ -515,11 +589,20 @@
         :return: Proxy object for calendar application.
 
         """
-        self._launch_application_from_apps_scope(
-            'Calendar', CATEGORY_LOCAL)
-        wait_until(processes.is_qmlscene_running_with_qmlfile, 'calendar')
+        self._launch_application_from_apps_scope('Calendar', CATEGORY_LOCAL)
+        wait_until(self.is_calendar_app_running, period=0.5)
+
         return self.get_calendar_app_proxy()
 
+    def close_calendar_app(self):
+        """ Close the calendar app using task switcher """
+        if self.is_calendar_app_running():
+            self._close_app('calendar')
+
+    def is_calendar_app_running(self):
+        """ Indicate if the calendar app is currently running """
+        return processes.is_qmlscene_running_with_qmlfile('calendar')
+
     def get_calendar_app_proxy(self):
         """
         Return calendar app proxy object from existing process.
@@ -539,14 +622,17 @@
 
         """
         self._launch_application_from_apps_scope('Clock', CATEGORY_PREDEFINED)
-        wait_until(processes.is_qmlscene_running_with_qmlfile,
-                   'ubuntu-clock-app')
+        wait_until(self.is_clock_app_running, period=0.5)
         return self.get_clock_app_proxy()
 
-    def launch_webbrowser_from_launcher(self):
-        """Start webbrowser from the launcher."""
-        self._launch_application_from_launcher('webbrowser-app')
-        return self.get_webbrowser_app_proxy()
+    def close_clock_app(self):
+        """ Close the calendar app using task switcher """
+        if self.is_clock_app_running():
+            self._close_app('com.ubuntu.clock_clock')
+
+    def is_clock_app_running(self):
+        """ Indicate if the clock app is currently running """
+        return processes.is_qmlscene_running_with_qmlfile('ubuntu-clock-app')
 
     def get_clock_app_proxy(self):
         """
@@ -560,6 +646,11 @@
             'ubuntu-clock-app')
         return proxy.main_view
 
+    def launch_webbrowser_from_launcher(self):
+        """Start webbrowser from the launcher."""
+        self._launch_application_from_launcher('webbrowser-app')
+        return self.get_webbrowser_app_proxy()
+
     def launch_messaging_app_from_launcher(self):
         """Drag out the launcher and tap the messaging app icon to start it."""
         self._launch_application_from_launcher('messaging-app')
@@ -570,6 +661,11 @@
         self._launch_application_from_launcher('dialer-app')
         return self.get_dialer_app_proxy()
 
+    def launch_gallery_app_from_launcher(self):
+        """Drag out the launcher and tap the gallery app icon to start it."""
+        self._launch_application_from_launcher('com.ubuntu.gallery_gallery')
+        return self.get_gallery_app_proxy()
+
     def get_webapp_proxy(self, web_app_package):
         """ Return webapp proxy object from existing process.
         :param web_app_package: The package name
@@ -612,9 +708,19 @@
         """
         self._launch_application_from_apps_scope(
             'Calculator', CATEGORY_LOCAL)
-        wait_until(processes.is_qmlscene_running_with_qmlfile, CALCULATOR_APP)
+        wait_until(self.is_calculator_app_running, period=0.5)
         return self.get_calculator_app_proxy()
 
+    def close_calculator_app(self):
+        """ Close the calculator app using task switcher """
+        if self.is_calculator_app_running():
+            self._close_app('com.ubuntu.calculator_calculator')
+
+    def is_calculator_app_running(self):
+        """ Indicate if the calculator app is currently running """
+        return processes.is_qmlscene_running_with_qmlfile(
+            'ubuntu-calculator-app')
+
     def get_calculator_app_proxy(self):
         """Return the proxy object of the calculator app."""
         from ubuntu_system_tests.helpers.calculator import _cpo  # NOQA
@@ -625,3 +731,86 @@
     def get_ubuntu_keyboard_proxy(self):
         from ubuntu_system_tests.helpers.ubuntu_keyboard import _cpo  # NOQA
         return self._get_proxy_object_for_existing_app('maliit-server')
+
+    def launch_ebay_webapp(self):
+        """ Launch the Ebay webapp from apps scope and return its proxy object
+        """
+        webapp_name = 'eBay'
+        webapp_package = 'com.ubuntu.developer.webapps.webapp-ebay'
+        return self.launch_webapp(webapp_name, webapp_package)
+
+    def close_ebay_webapp(self):
+        """ Close the ebay webapp using task switcher """
+        if self.is_ebay_webapp_running():
+            self._close_app(
+                'com.ubuntu.developer.webapps.webapp-ebay_webapp-ebay')
+
+    def is_ebay_webapp_running(self):
+        """ Indicate if the ebay webapp is currently running """
+        webapp_package = 'com.ubuntu.developer.webapps.webapp-ebay'
+        return webapp.is_webapp_runing(webapp_package)
+
+    def launch_here_webapp(self):
+        """ Launch the Here webapp from apps scope and return its proxy object
+        """
+        webapp_name = 'HERE Maps'
+        webapp_package = 'com.nokia.heremaps'
+        return self.launch_webapp(webapp_name, webapp_package)
+
+    def close_here_webapp(self):
+        """ Close the here webapp using task switcher """
+        if self.is_here_webapp_running():
+            self._close_app('com.nokia.heremaps_here')
+
+    def is_here_webapp_running(self):
+        """ Indicate if the here webapp is currently running """
+        webapp_package = 'com.nokia.heremaps'
+        return webapp.is_webapp_runing(webapp_package)
+
+    def launch_music_app(self):
+        """
+        Launch the music app from apps scope and return proxy object.
+
+        :return: Proxy object for music application.
+
+        """
+        self._launch_application_from_apps_scope('Music')
+        wait_until(self.is_music_app_running, period=0.5)
+        return self.get_music_app_proxy()
+
+    def close_music_app(self):
+        """ Close the music app using task switcher """
+        if self.is_music_app_running():
+            self._close_app('com.ubuntu.music_music')
+
+    def is_music_app_running(self):
+        """ Indicate if the music app is currently running """
+        return processes.is_qmlscene_running_with_qmlfile('music-app')
+
+    def get_music_app_proxy(self):
+        """
+        Return music app proxy object from existing process.
+
+        :return: Proxy object for music application.
+
+        """
+        proxy = self._get_proxy_object_for_existing_qmlscene_process(
+            'music-app')
+        return proxy.wait_select_single(ubuntuuitoolkit.MainView)
+
+    def _close_app(self, app_name):
+        """Close an app using task switcher and check process is stopped."""
+        unity_proxy = self.get_job_proxy_object('unity8')
+
+        # Get the windows name
+        stage = unity_proxy.main_window.swipe_to_show_app_switcher()
+        app_window_name = 'appWindow_' + app_name
+        app_windows = stage.get_app_window_names()
+        count = len(app_windows)
+        self.assertTrue(app_window_name in app_windows)
+
+        # Close the windows and assert that it is closed
+        stage.close_app(app_name)
+        app_windows = stage.get_app_window_names()
+        self.assertFalse(app_window_name in app_windows)
+        self.assertEqual(len(app_windows), count - 1)

=== modified file 'ubuntu_system_tests/tests/scopes/test_music_scope.py'
--- ubuntu_system_tests/tests/scopes/test_music_scope.py	2016-01-26 14:03:27 +0000
+++ ubuntu_system_tests/tests/scopes/test_music_scope.py	2016-02-05 13:59:58 +0000
@@ -62,7 +62,7 @@
 
         # Verify the music app is playing the selected song
         track_preview.play_in_music_app()
-        self.assertTrue(wait_until(music_helper.is_music_app_running))
+        self.assertTrue(wait_until(self.is_music_app_running))
         self.addCleanup(music_helper.stop_music_app)
         self.assertEqual(
             test_data.LOCAL_AUDIO_FILE_2, music_helper.get_current_song())

=== modified file 'ubuntu_system_tests/tests/scopes/test_video_scope.py'
--- ubuntu_system_tests/tests/scopes/test_video_scope.py	2015-11-17 20:15:59 +0000
+++ ubuntu_system_tests/tests/scopes/test_video_scope.py	2016-02-05 13:59:58 +0000
@@ -131,7 +131,7 @@
 
         # Validate the webbrowser is launched by clicking in the play button
         preview.play_video()
-        self.assertTrue(wait_until(webbrowser.is_webbrowser_running))
+        self.assertTrue(wait_until(self.is_webbrowser_app_running))
 
         # Validate the url opened in the webbrowser is youtube
         browser = self.get_webbrowser_app_proxy()

=== modified file 'ubuntu_system_tests/tests/test_sdcard.py'
--- ubuntu_system_tests/tests/test_sdcard.py	2016-01-27 11:39:06 +0000
+++ ubuntu_system_tests/tests/test_sdcard.py	2016-02-05 13:59:58 +0000
@@ -240,7 +240,7 @@
         # Play the album in the music app and verify the desired album is
         # being reproduced
         preview.play_in_music_app()
-        self.assertTrue(wait_until(music.is_music_app_running, timeout=20))
+        self.assertTrue(wait_until(self.is_music_app_running, timeout=20))
         self.addCleanup(music.stop_music_app)
         song_path = os.path.join(
             fs.DIR_MEDIA_ROOT, sdcard.get_sd_card_dir_name(), 'Music',

=== modified file 'ubuntu_system_tests/tests/webapps/test_ebay.py'
--- ubuntu_system_tests/tests/webapps/test_ebay.py	2015-10-21 05:52:09 +0000
+++ ubuntu_system_tests/tests/webapps/test_ebay.py	2016-02-05 13:59:58 +0000
@@ -29,14 +29,9 @@
 
 class EbayTestCase(BaseWebAppTestCase):
 
-    WEB_APP_NAME = 'eBay'
-    WEB_APP_PACKAGE = 'com.ubuntu.developer.webapps.webapp-ebay'
-
     def setUp(self):
         super().setUp()
-        self.unity_proxy = self.restart_unity()
-        self.webapp = self.launch_webapp(self.WEB_APP_NAME,
-                                         self.WEB_APP_PACKAGE)
+        self.web_app = self.launch_ebay_webapp()
         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	2015-10-23 14:12:44 +0000
+++ ubuntu_system_tests/tests/webapps/test_here.py	2016-02-05 13:59:58 +0000
@@ -35,17 +35,13 @@
 class HereTestCase(BaseWebAppTestCase):
 
     PARIS = 'Paris'
-
-    WEB_APP_NAME = 'HERE Maps'
-    WEB_APP_PACKAGE = 'com.nokia.heremaps'
     LOCATION_APP = 'com.nokia.heremaps_here'
 
     def setUp(self):
         self.useFixture(DummyLocation(*EIFFEL_TOWER))
         super().setUp()
         self.useFixture(SetLocationAccessRequests(self.LOCATION_APP))
-        self.webapp = self.launch_webapp(self.WEB_APP_NAME,
-                                         self.WEB_APP_PACKAGE)
+        self.webapp = self.launch_here_webapp()
         self.driver = webapp.get_webdriver(self.addCleanup)
 
     def test_retrieve_location(self):