436e253 · unity8 · git.iko.soy

git.iko.soy/unity8

Updated upstart and autopilot test

commit436e25307acd50c07687129de3e1420f2b5a50d8 authorAndrea Cimitan <andrea.cimitan@canonical.com> dateThu 10 Apr 2014, 14:27 (13 years ago) parent77aa031

2 files changed+3−4

compare with xenial

unifiedsplit

data/unity8.conf+1−2 tests/autopilot/unity8/shell/tests/test_upstart.py+2−2

data/unity8.conf+1−2

@@ -12,7 +12,7 @@ respawn

1212expect stop

1313

1414pre-start script

15− # Tell unity-mir to raise SIGSTOP after we quit

15+ # Tell unity-mir to raise SIGSTOP after we start

1616 initctl set-env UNITY_MIR_EXPECTS_SIGSTOP=1

1717

1818 if [ -n "$MIR_SOCKET" ]; then

@@ -50,7 +50,6 @@ end script

5050exec ${BINARY:-unity8} $ARGS

5151

5252post-stop script

53− initctl unset-env UNITY_MIR_EXPECTS_SIGSTOP

5453 initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET

5554 initctl unset-env --global UNITY_MIR_SOCKET

5655end script

tests/autopilot/unity8/shell/tests/test_upstart.py+2−2

@@ -82,7 +82,7 @@ class UpstartIntegrationTests(UnityTestCase):

8282 ))

8383

8484 def test_no_sigstop(self):

85− self.patch_environment("UPSTART_JOB", "foo")

85+ self.patch_environment("UNITY_MIR_EXPECTS_SIGSTOP", "")

8686 self._launch_unity()

8787 self._set_proxy()

8888

@@ -91,7 +91,7 @@ class UpstartIntegrationTests(UnityTestCase):

9191 logger.debug("Unity loaded and ready.")

9292

9393 def test_expect_sigstop(self):

94− self.patch_environment("UPSTART_JOB", "unity8")

94+ self.patch_environment("UNITY_MIR_EXPECTS_SIGSTOP", "1")

9595 self._launch_unity()

9696 self.assertThat(lambda: os.WIFSTOPPED(self._get_status()), Eventually(Equals(True)), "Unity8 should raise SIGSTOP when ready")

9797