git.iko.soy/unity8
on xenial help sign in
Be more persistent for removing the socket.
2825a3cMichał Sawicz
tests/autopilot/unity8/shell/tests/__init__.py+6−1
compare with xenial
unifiedsplit
@@ -165,8 +165,13 @@ class UnityTestCase(AutopilotTestCase):
165 self._setup_extra_mock_environment_patch()
165 self._setup_extra_mock_environment_patch()
166
166
167 # FIXME: we shouldn't be doing this
167 # FIXME: we shouldn't be doing this
168+ # $MIR_SOCKET, fallback to $XDG_RUNTIME_DIR/mir_socket and /tmp/mir_socket as last resort
168 try:
169 try:
169− os.unlink(os.getenv('MIR_SOCKET', "/tmp/mir_socket"))
170+ os.unlink(os.getenv('MIR_SOCKET', os.path.join(os.getenv('XDG_RUNTIME_DIR'), "mir_socket")))
171+ except OSError:
172+ pass
173+ try:
174+ os.unlink("/tmp/mir_socket")
170 except OSError:
175 except OSError:
171 pass
176 pass
172
177