Merge lp:~nskaggs/ubuntu-calculator-app/add-click-test-support into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_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)]

FAILED: Continuous integration, rev:155
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/113/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/516/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/112/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/112/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/112/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/112/console

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

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-calculator-app/add-click-test-support]

156. By Nicholas Skaggs on 2013-09-27

fix pep8 errors

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

FAILED: Continuous integration, rev:156
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/114/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/524
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/113
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/113
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/113
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/113

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:156
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/115/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/526
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/114
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/114
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/114
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/114

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

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-calculator-app/add-click-test-support]

157. By Nicholas Skaggs on 2013-09-27

I <3 pep8

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

PASSED: Continuous integration, rev:157
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/116/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/528
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/115
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/115
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/115
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/115

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Thanks for the implementation Nicholas :)
Works good for me

review: Approve

=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/__init__.py'
--- tests/autopilot/ubuntu_calculator_app/tests/__init__.py	2013-09-17 14:24:28 +0000
+++ tests/autopilot/ubuntu_calculator_app/tests/__init__.py	2013-09-27 16:31:24 +0000
@@ -32,6 +32,8 @@
         scenarios = [('with touch', dict(input_device_class=Touch))]
 
     local_location = "../../ubuntu-calculator-app.qml"
+    installed_location = "/usr/share/ubuntu-calculator-app/" \
+                         "ubuntu-calculator-app.qml"
 
     sqlite_dir = os.path.expanduser(
         "~/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/Databases")
@@ -52,8 +54,10 @@
 
         if os.path.exists(self.local_location):
             self.launch_test_local()
-        else:
+        elif os.path.exists(self.installed_location):
             self.launch_test_installed()
+        else:
+            self.launch_test_click()
 
     def launch_test_local(self):
         self.app = self.launch_test_application(
@@ -65,12 +69,17 @@
     def launch_test_installed(self):
         self.app = self.launch_test_application(
             "qmlscene",
-            "/usr/share/ubuntu-calculator-app/ubuntu-calculator-app.qml",
+            self.installed_location,
             "--desktop_file_hint="
             "/usr/share/applications/ubuntu-calculator-app.desktop",
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
+    def launch_test_click(self):
+        self.app = self.launch_click_package(
+            "com.ubuntu.ubuntu-calculator-app",
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+
     def temp_move_sqlite_db(self):
         if os.path.exists(self.sqlite_dir):
             shutil.move(self.sqlite_dir, self.backup_dir)