Merge lp:~cwayne/address-book-app/autopilot-upstart into lp:address-book-app

[Chris Wayne]

Use upstart for launching in autopilot tests, to fix issues within the touch_custom suite

Use launch_upstart_application to get the correct XDG_DATA_DIRS set

[lp:~cwayne/address-book-app/autopilot-upstart]

156. By Chris Wayne on 2014-03-26

Only set upstart launch for test_installed, not test_local

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:155
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/483/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-amd64-ci/193
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/193
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/193/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-i386-ci/193
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4258
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3843/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3692
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4336
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4336/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3845
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3845/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6130/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5213

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/483/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:156
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/484/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-amd64-ci/194
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/194
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/194/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-i386-ci/194
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4259
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3844/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3693
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4337
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4337/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3846
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3846/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6131/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5214

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/484/rebuild

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

This is good. Might need merging with https://code.launchpad.net/~canonical-platform-qa/address-book-app/main_window_objectName/+merge/250259

review: Approve

Unmerged revisions

156. By Chris Wayne on 2014-03-26

Only set upstart launch for test_installed, not test_local

155. By Chris Wayne on 2014-03-26

Change autopilot tests to launch with upstart

=== modified file 'tests/autopilot/address_book_app/tests/__init__.py'
--- tests/autopilot/address_book_app/tests/__init__.py	2014-01-30 08:35:04 +0000
+++ tests/autopilot/address_book_app/tests/__init__.py	2014-03-26 00:18:00 +0000
@@ -86,12 +86,8 @@
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_test_installed(self):
-        df = "/usr/share/applications/address-book-app.desktop"
-        self.ARGS.append("--desktop_file_hint=" + df)
-        self.app = self.launch_test_application(
+        self.app = self.launch_upstart_application(
             "address-book-app",
-            *AddressBookAppTestCase.ARGS,
-            app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_click_installed(self):