@@ -142,8 +142,6 @@ class UnityTestCase(AutopilotTestCase):
142 self._data_dirs_mock_enabled = True
142 self._data_dirs_mock_enabled = True
143 self._environment = {}
143 self._environment = {}
145− self._patch_data_dirs()
147 #### FIXME: This is a work around re: lp:1238417 ####
145 #### FIXME: This is a work around re: lp:1238417 ####
148 if model() != "Desktop":
146 if model() != "Desktop":
149 from autopilot.input import _uinput
147 from autopilot.input import _uinput
@@ -269,6 +267,9 @@ class UnityTestCase(AutopilotTestCase):
269 if self._qml_mock_enabled:
267 if self._qml_mock_enabled:
270 self._setup_extra_mock_environment_patch()
268 self._setup_extra_mock_environment_patch()
270+ if self._data_dirs_mock_enabled:
271+ self._patch_data_dirs()
272 # FIXME: we shouldn't be doing this
273 # FIXME: we shouldn't be doing this
273 # $MIR_SOCKET, fallback to $XDG_RUNTIME_DIR/mir_socket and
274 # $MIR_SOCKET, fallback to $XDG_RUNTIME_DIR/mir_socket and
274 # /tmp/mir_socket as last resort
275 # /tmp/mir_socket as last resort