git.iko.soy/unity8
on xenial help sign in
Default to /run/mir_socket if MIR_SOCKET isn't set.
d52ab12Michał Sawicz
tests/autopilot/unity8/shell/tests/test_upstart.py+11−7
compare with xenial
unifiedsplit
@@ -20,6 +20,7 @@
20"""Tests for upstart integration."""
20"""Tests for upstart integration."""
21
21
22import os
22import os
23+import stat
23import signal
24import signal
24import subprocess
25import subprocess
25import time
26import time
@@ -57,15 +58,18 @@ class UpstartIntegrationTests(UnityTestCase):
57
58
58 def _launch_unity(self):
59 def _launch_unity(self):
59 self.patch_environment("QT_LOAD_TESTABILITY", "1")
60 self.patch_environment("QT_LOAD_TESTABILITY", "1")
61+
60 try:
62 try:
61− self._patch_environment("MIR_SERVER_HOST_SOCKET",
63+ host_socket = os.getenv("MIR_SOCKET", "/run/mir_socket")
62− os.environ["MIR_SOCKET"])
64+ if stat.S_ISSOCK(os.stat(host_socket).st_mode):
65+ self.patch_environment("MIR_SERVER_HOST_SOCKET",
66+ host_socket)
67+ socket = os.path.join(os.getenv("XDG_RUNTIME_DIR", "/tmp"),
68+ "mir_socket")
69+ self.patch_environment("MIR_SERVER_FILE", socket)
70+
63− except KeyError:
71+ except OSError:
64 pass
72 pass
65− else:
66− socket = os.path.join(os.getenv("XDG_RUNTIME_DIR", "/tmp"),
67− "mir_socket")
68− self._patch_environment("MIR_SERVER_FILE", socket)
69
73
70 self.process = subprocess.Popen(
74 self.process = subprocess.Popen(
71 [get_binary_path()] + self.unity_geometry_args)
75 [get_binary_path()] + self.unity_geometry_args)