git.iko.soy/unity8
on xenial help sign in
Use XDG_DATA_DIRS instead.
b116735Michał Sawicz
tests/autopilot/unity8/__init__.py+9−4
compare with xenial
unifiedsplit
@@ -83,16 +83,21 @@ def get_binary_path(binary="unity8"):
83 raise RuntimeError("Unable to locate %s binary: %r" % (binary, e))
83 raise RuntimeError("Unable to locate %s binary: %r" % (binary, e))
84 return binary_path
84 return binary_path
85
85
86−def get_data_path():
86+def get_data_dirs():
87− """Return the path to XDG_DATA_HOME."""
87+ """Prepend a local path to XDG_DATA_DIRS."""
88+ xdg_path = os.getenv("XDG_DATA_DIRS")
88 if running_installed_tests():
89 if running_installed_tests():
89− return ""
90+ return xdg_path or ""
90 else:
91 else:
91− return os.path.abspath(
92+ data_path = os.path.abspath(
92 os.path.join(os.path.dirname(__file__),
93 os.path.join(os.path.dirname(__file__),
93 "../share"
94 "../share"
94 )
95 )
95 )
96 )
97+ if xdg_path:
98+ return "{0}:{1}".format(data_path, xdg_path)
99+ else:
100+ return data_path
96
101
97def get_grid_size():
102def get_grid_size():
98 grid_size = os.getenv('GRID_UNIT_PX')
103 grid_size = os.getenv('GRID_UNIT_PX')
tests/autopilot/unity8/shell/tests/__init__.py+2−2
@@ -41,7 +41,7 @@ from unity8 import (
41 get_binary_path,
41 get_binary_path,
42 get_mocks_library_path,
42 get_mocks_library_path,
43 get_default_extra_mock_libraries,
43 get_default_extra_mock_libraries,
44− get_data_path
44+ get_data_dirs
45)
45)
46from unity8.shell.emulators import UnityEmulatorBase
46from unity8.shell.emulators import UnityEmulatorBase
47from unity8.shell.emulators.dash import Dash
47from unity8.shell.emulators.dash import Dash
@@ -122,7 +122,7 @@ class UnityTestCase(AutopilotTestCase):
122 self._lightdm_mock_type = None
122 self._lightdm_mock_type = None
123 self._qml_mock_enabled = True
123 self._qml_mock_enabled = True
124 self._environment = {
124 self._environment = {
125− 'XDG_DATA_HOME': get_data_path()
125+ 'XDG_DATA_DIRS': get_data_dirs()
126 }
126 }
127
127
128 #### FIXME: This is a work around re: lp:1238417 ####
128 #### FIXME: This is a work around re: lp:1238417 ####