@@ -20,6 +20,7 @@
2020"""Tests for upstart integration."""
2121
2222import os
23+import stat
2324import signal
2425import subprocess
2526import time
@@ -57,15 +58,18 @@ class UpstartIntegrationTests(UnityTestCase):
5758
5859 def _launch_unity(self):
5960 self.patch_environment("QT_LOAD_TESTABILITY", "1")
61+
6062 try:
61− self._patch_environment("MIR_SERVER_HOST_SOCKET",
62− os.environ["MIR_SOCKET"])
63− except KeyError:
63+ host_socket = os.getenv("MIR_SOCKET", "/run/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+
71+ except OSError:
6472 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)
6973
7074 self.process = subprocess.Popen(
7175 [get_binary_path()] + self.unity_geometry_args)