Merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/upstart into lp:ubuntu-ui-toolkit/staging

[Leo Arias]

Make explicit the dependency on upstart for the autopilot helpers.

Currently we have helpers to set environment variables with upstart.
A branch is in progress to support also systemd, and choose the right commands depending on the pid1 running [1]. In the meantime, this makes it explicit that we depend on upstart.

[1] https://code.launchpad.net/~canonical-platform-qa/ubuntu-ui-toolkit/systemd/+merge/259210

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1505
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1770/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2846
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/498
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/500
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/500/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/497
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2439
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2844
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2844/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20540

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1770/rebuild

review: Needs Fixing (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

[Christian Dywan (kalikiana)]

Seems like a sensible plan; this needs explicit testing, tho, as long as CI isn't running wily.

review: Approve

[Leo Arias (elopio)]

We currently have a suite of tests in test_fixture_setup that sets init environment variables, and launches an app. If upstart is not installed, that suite will fail, which is how we noticed this problem in wily. Thanks for the reviews.

[Ken VanDine (ken-vandine)]

I'll go ahead and give this a packaging ACK

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2015-04-14 21:02:06 +0000
+++ debian/control	2015-05-15 15:40:19 +0000
@@ -147,6 +147,7 @@
          python3-autopilot-trace,
          qttestability-autopilot,
          ubuntu-ui-toolkit-examples (>= ${source:Version}),
+         upstart,
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= ${source:Version}) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
          qml-module-qttest | qtdeclarative5-test-plugin,
 Description: Test package for Ubuntu UI Toolkit