d28e017 · unity8 · git.iko.soy

git.iko.soy/unity8

Re-include libusermetrics into the fold.

commitd28e017596c2021648d18723047f7b74a3f6809b authorChristopher Lee <chris.lee@canonical.com> dateMon 22 Jul 2013, 13:34 (13 years ago) parentf918aa2

2 files changed+10−2

compare with xenial

unifiedsplit

tests/autopilot/unity8/__init__.py+5 tests/autopilot/unity8/shell/__init__.py+5−2

tests/autopilot/unity8/__init__.py+5

@@ -43,6 +43,11 @@ def get_lib_path():

4343 return lib_path

4444

4545

46+def get_default_extra_mock_libraries():

47+ mocks_path = get_mocks_library_path()

48+ return os.path.join(mocks_path, 'libusermetrics')

49+

50+

4651def get_mocks_library_path():

4752 if running_installed_tests():

4853 mock_path = "qml/mocks/"

tests/autopilot/unity8/shell/__init__.py+5−2

@@ -23,7 +23,7 @@ from functools import wraps

2323import logging

2424import os.path

2525

26−from unity8 import get_mocks_library_path

26+from unity8 import get_mocks_library_path, get_default_extra_mock_libraries

2727

2828

2929logger = logging.getLogger(__name__)

@@ -35,7 +35,10 @@ def with_lightdm_mock(mock_type):

3535 @wraps(fn)

3636 def wrapper(*args, **kwargs):

3737 logger.info("Setting up LightDM mock type '%s'", mock_type)

38− new_ld_library_path = _get_ld_library_path(mock_type)

38+ new_ld_library_path = "%s:%s" % (

39+ get_default_extra_mock_libraries(),

40+ _get_ld_library_path(mock_type)

41+ )

3942 logger.info("New library path: %s", new_ld_library_path)

4043 tests_self = args[0]

4144 tests_self.patch_environment(