git.iko.soy/unity8
on xenial help sign in
Remove the mir socket before starting unity8 during autopilot tests.
e4a75c6Michał Sawicz
tests/autopilot/unity8/shell/tests/__init__.py+11
compare with xenial
unifiedsplit
@@ -164,6 +164,17 @@ class UnityTestCase(AutopilotTestCase):
164 if self._qml_mock_enabled:
164 if self._qml_mock_enabled:
165 self._setup_extra_mock_environment_patch()
165 self._setup_extra_mock_environment_patch()
166
166
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
169+ try:
170+ os.unlink(os.getenv('MIR_SOCKET', os.path.join(os.getenv('XDG_RUNTIME_DIR', "/tmp"), "mir_socket")))
171+ except OSError:
172+ pass
173+ try:
174+ os.unlink("/tmp/mir_socket")
175+ except OSError:
176+ pass
177+
167 app_proxy = self.launch_test_application(
178 app_proxy = self.launch_test_application(
168 binary_path,
179 binary_path,
169 *self.unity_geometry_args,
180 *self.unity_geometry_args,