diff --git a/tests/__init__.py b/tests/__init__.py index 909f68753c3..219b3c78a75 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -2,19 +2,14 @@ import os import pathlib import sys -_repo_root = pathlib.Path(__file__).parent.parent -_paths_to_check = {""} -if sys.platform.startswith("win"): - _paths_to_check.add(str(_repo_root).replace("\\", "\\\\")) - _paths_to_check.add(str(_repo_root.resolve()).replace("\\", "\\\\")) -else: - _paths_to_check.add(str(_repo_root)) - +_repo_root = pathlib.Path(__file__).resolve().parent.parent if os.environ.get("ONEDIR_TESTRUN", "0") == "1": # In this particular case, we want to make sure that the repo root # is not part if sys.path so that when we import salt, we import salt from # the onedir and not the code checkout - for path in _paths_to_check: - if path in sys.path: + for path in list(sys.path): + if path == "": + sys.path.remove(path) + elif pathlib.Path(path).resolve() == _repo_root: sys.path.remove(path)