Merge lp:~nskaggs/ubuntu-weather-app/add-click-testing-support into lp:ubuntu-weather-app/obsolete.trunk

[Nicholas Skaggs]

Add support for testing via click packages

Add support for testing via click packages

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:126
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/52/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/522
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/50
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/50
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/50
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/50

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/52/rebuild

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

Looks good to me...

review: Approve

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/__init__.py'
--- tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-09-24 17:26:04 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-09-27 15:51:02 +0000
@@ -32,6 +32,7 @@
         scenarios = [('with touch', dict(input_device_class=Touch))]
 
     local_location = "../../ubuntu-weather-app.qml"
+    installed_location = "/usr/share/ubuntu-weather-app/ubuntu-weather-app.qml"
 
     def setUp(self):
         self.pointing_device = Pointer(self.input_device_class.create())
@@ -47,8 +48,10 @@
     def launch_app(self):
         if os.path.exists(self.local_location):
             self.launch_test_local()
+        elif os.path.exists(self.installed_location):
+            self.launch_test_installed()
         else:
-            self.launch_test_installed()
+            self.launch_test_click()
 
     def launch_test_local(self):
         self.app = self.launch_test_application(
@@ -60,11 +63,14 @@
     def launch_test_installed(self):
         self.app = self.launch_test_application(
             self.qmlscene(),
-            "/usr/share/ubuntu-weather-app/ubuntu-weather-app.qml",
+            self.installed_location,
             "--desktop_file_hint=/usr/share/applications/ubuntu-weather-app.desktop",
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
+    def launch_test_click(self):
+        self.app = self.launch_click_package("com.ubuntu.ubuntu-weather-app", emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+
     def launch_and_quit_app(self):
         self.launch_app()
         self.get_qml_view().visible.wait_for(True)