Merge lp:~gerboland/unity8/fix-run.sh-script into lp:unity8

[Gerry Boland]

Fix the run.sh script - pretend to be running with qtmir and emit SIGSTOP at the right time

Fix the run.sh script - pretend to be running with qtmir and emit SIGSTOP at the right time

 * Are there any related MPs required for this MP to build/function as expected? Please list.
N
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * Did you make sure that your branch does not contain spurious tags?
Y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
 * If you changed the UI, has there been a design review?
N

[lp:~gerboland/unity8/fix-run.sh-script]

1092. By Gerry Boland on 2014-07-30

Use csignal instead of signal.h

1093. By Gerry Boland on 2014-07-30

Make slightly more readable

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass? If not, please explain why.
Waiting

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1093
http://jenkins.qa.ubuntu.com/job/unity8-ci/3679/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2711
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/681
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/773
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/773
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/773/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/773
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2818
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3954
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3954/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10671

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3679/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

FWIW the autopilot tests won't pass with this as it sets the env var to an empty string. Leo is fixing this in lp:~canonical-platform-qa/unity8/dash-as-app-autopilot

[lp:~gerboland/unity8/fix-run.sh-script]

1094. By Gerry Boland on 2014-07-31

Make slightly less readable - revert 1093 - AP bug to unset env vars actually sets them to empty strings

[Gerry Boland (gerboland)]

Well I reverted the breaking change

[lp:~gerboland/unity8/fix-run.sh-script]

1095. By Gerry Boland on 2014-07-31

AP test to ensure sigstop emitted

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yezz.

 * Did CI run pass? If not, please explain why.
Locally did.

review: Approve

[lp:~gerboland/unity8/fix-run.sh-script]

1096. By Gerry Boland on 2014-07-31

Unrevert the revert

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1094
http://jenkins.qa.ubuntu.com/job/unity8-ci/3695/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2807
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/697
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/789
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/789
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/789/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/789
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2896
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4050
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4050/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10763

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3695/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/main.cpp'
--- src/main.cpp	2014-07-25 11:29:56 +0000
+++ src/main.cpp	2014-07-31 10:52:44 +0000
@@ -25,6 +25,7 @@
 #include <QtQml/QQmlContext>
 #include <QLibrary>
 #include <QDebug>
+#include <csignal>
 #include <libintl.h>
 
 // local
@@ -140,6 +141,12 @@
     view->setSource(source);
     QObject::connect(view->engine(), SIGNAL(quit()), application, SLOT(quit()));
 
+    if (!isMirServer && qEnvironmentVariableIsSet("UNITY_MIR_EMITS_SIGSTOP")) {
+        // Emit SIGSTOP as expected by upstart, under Mir it's qtmir that will raise it.
+        // see http://upstart.ubuntu.com/cookbook/#expect-stop
+        raise(SIGSTOP);
+    }
+
     if (isMirServer || parser.isSet(fullscreenOption)) {
         view->showFullScreen();
     } else {
 
=== modified file 'tests/autopilot/unity8/shell/tests/test_upstart.py'
--- tests/autopilot/unity8/shell/tests/test_upstart.py	2014-07-22 21:07:44 +0000
+++ tests/autopilot/unity8/shell/tests/test_upstart.py	2014-07-31 10:52:44 +0000
@@ -25,7 +25,8 @@
 import subprocess
 import time
 
-from testtools.matchers._basic import Equals
+import fixtures
+from testtools.matchers import Equals, MismatchError
 from autopilot.matchers import Eventually
 from autopilot.introspection import get_proxy_object_for_existing_process
 
@@ -100,8 +101,21 @@
                 emulator_base=UnityEmulatorBase,))
 
     def test_no_sigstop(self):
-        self.patch_environment("UNITY_MIR_EMITS_SIGSTOP", "")
+        self.useFixture(
+            fixtures.EnvironmentVariable(
+                'UNITY_MIR_EMITS_SIGSTOP', newvalue=None))
         self._launch_unity()
+
+        try:
+            self.assertThat(
+                lambda: os.WIFSTOPPED(self._get_status()),
+                Eventually(Equals(True)))
+        except MismatchError:
+            pass
+        else:
+            self.process.send_signal(signal.SIGCONT)
+            self.fail('Unity8 raised SIGSTOP')
+
         self._set_proxy()
 
         logger.debug("Unity started, waiting for it to be ready.")
@@ -109,7 +123,8 @@
         logger.debug("Unity loaded and ready.")
 
     def test_expect_sigstop(self):
-        self.patch_environment("UNITY_MIR_EMITS_SIGSTOP", "1")
+        self.useFixture(
+            fixtures.EnvironmentVariable('UNITY_MIR_EMITS_SIGSTOP', '1'))
         self._launch_unity()
         self.assertThat(
             lambda: os.WIFSTOPPED(self._get_status()),