git.iko.soy/unity8
on xenial help sign in
remove overzealous type setting
03a5787Christopher Lee
tests/autopilot/unity8/__init__.py+3−3
compare with xenial
unifiedsplit
@@ -94,9 +94,9 @@ def get_binary_path(binary="unity8"):
94def get_data_dirs():
94def get_data_dirs():
95 """Prepend a mock data path to XDG_DATA_DIRS."""
95 """Prepend a mock data path to XDG_DATA_DIRS."""
96 if running_installed_tests():
96 if running_installed_tests():
97− data_path = u"/usr/share/unity8/mocks/data"
97+ data_path = "/usr/share/unity8/mocks/data"
98 else:
98 else:
99− data_path = u"../../mocks/data"
99+ data_path = "../../mocks/data"
100 full_data_path = os.path.abspath(
100 full_data_path = os.path.abspath(
101 os.path.join(
101 os.path.join(
102 os.path.dirname(__file__),
102 os.path.dirname(__file__),
@@ -107,7 +107,7 @@ def get_data_dirs():
107 if os.path.exists(full_data_path):
107 if os.path.exists(full_data_path):
108 xdg_path = _get_xdg_env_path()
108 xdg_path = _get_xdg_env_path()
109 if xdg_path is not None:
109 if xdg_path is not None:
110− return u"{0}:{1}".format(full_data_path, xdg_path)
110+ return "{0}:{1}".format(full_data_path, xdg_path)
111 else:
111 else:
112 return full_data_path
112 return full_data_path
113 else:
113 else:
tests/autopilot/unity8/shell/tests/__init__.py+1−1
@@ -298,7 +298,7 @@ class UnityTestCase(AutopilotTestCase):
298
298
299 def _launch_unity_with_upstart(self, binary_path, args):
299 def _launch_unity_with_upstart(self, binary_path, args):
300 logger.info("Starting unity")
300 logger.info("Starting unity")
301− self._patch_environment(u"QT_LOAD_TESTABILITY", 1)
301+ self._patch_environment("QT_LOAD_TESTABILITY", 1)
302
302
303 binary_arg = "BINARY=%s" % binary_path
303 binary_arg = "BINARY=%s" % binary_path
304 extra_args = "ARGS=%s" % " ".join(args)
304 extra_args = "ARGS=%s" % " ".join(args)