Merge lp:~fboucault/camera-app/autopilot_no_location_service into lp:camera-app

[Florian Boucault]

[Autopilot] Do not stop/start the location service at the beginning of each test.

[lp:~fboucault/camera-app/autopilot_no_location_service]

405. By Florian Boucault on 2014-10-13

Removed unused helper.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:405
http://jenkins.qa.ubuntu.com/job/camera-app-ci/300/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/116
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/116/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/116
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/484
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4063
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/627
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/804
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14603
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3429
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4392
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4392/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/300/rebuild

review: Needs Fixing (continuous-integration)

=== removed file 'tests/autopilot/camera_app/helpers.py'
--- tests/autopilot/camera_app/helpers.py	2014-08-16 08:26:46 +0000
+++ tests/autopilot/camera_app/helpers.py	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2014 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
-"""Camera-app autopilot helpers."""
-
-import subprocess
-
-
-def set_location_service_testing(test_mode):
-    test = "true" if test_mode else "false"
-    try:
-        subprocess.check_call(
-            'sudo setprop custom.location.testing {}'.format(test),
-            shell=True)
-        subprocess.check_call(
-            "sudo restart ubuntu-location-service && "
-            "restart ubuntu-location-service-trust-stored",
-            shell=True)
-    except subprocess.CalledProcessError:
-        print("Unable to start location service in testing mode "
-              "tests may fail as a result.")

=== modified file 'tests/autopilot/camera_app/tests/__init__.py'
--- tests/autopilot/camera_app/tests/__init__.py	2014-08-16 08:26:46 +0000
+++ tests/autopilot/camera_app/tests/__init__.py	2014-10-13 15:49:52 +0000
@@ -16,7 +16,6 @@
 from camera_app.emulators.main_window import MainWindow
 from camera_app.emulators.baseemulator import CameraCustomProxyObjectBase
 from camera_app.emulators.panel import Panel
-from camera_app.helpers import set_location_service_testing
 
 class CameraAppTestCase(AutopilotTestCase):
 
@@ -35,8 +34,6 @@
     def setUp(self):
         self.pointing_device = Pointer(self.input_device_class.create())
         super(CameraAppTestCase, self).setUp()
-        set_location_service_testing(True)
-        self.addCleanup(set_location_service_testing, False)
         if os.path.exists(self.local_location):
             self.launch_test_local()
         elif os.path.exists(self.deb_location):