saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Adjust sys.path and the salt_factories_config fixture for onedir test runs

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2022-12-22 08:31:23 +00:00 • committed by Pedro Algarvio
parent 7382aa187e
commit 2ca75aaed5
2 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tests/__init__.py
View file

@ -0,0 +1,14 @@
import os
import pathlib
import sys
_repo_root = pathlib.Path(__file__).parent.parent
if "ONEDIR_TESTRUN" in os.environ:
# 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
if "" in sys.path:
sys.path.remove("")
if str(_repo_root) in sys.path:
sys.path.remove(str(_repo_root))

18
tests/conftest.py
View file

@ -48,7 +48,8 @@ os.chdir(str(CODE_DIR))
# Make sure the current directory is the first item in sys.path
if str(CODE_DIR) in sys.path:
sys.path.remove(str(CODE_DIR))
sys.path.insert(0, str(CODE_DIR))
if os.environ.get("ONEDIR_TESTRUN", "0") == "0":
sys.path.insert(0, str(CODE_DIR))
os.environ["REPO_ROOT_DIR"] = str(CODE_DIR)
@ -754,15 +755,22 @@ def salt_factories_config():
start_timeout = 120
else:
start_timeout = 60
if "ONEDIR_TESTRUN" in os.environ:
code_dir = None
else:
code_dir = str(CODE_DIR)
kwargs = {
"code_dir": str(CODE_DIR),
"code_dir": code_dir,
"start_timeout": start_timeout,
"inject_sitecustomize": MAYBE_RUN_COVERAGE,
}
if MAYBE_RUN_COVERAGE:
kwargs["coverage_rc_path"] = str(COVERAGERC_FILE)
coverage_db_path = os.environ.get("COVERAGE_FILE")
if coverage_db_path:
kwargs["coverage_db_path"] = coverage_db_path
else:
kwargs["coverage_rc_path"] = None
kwargs["coverage_db_path"] = os.environ.get("COVERAGE_FILE")
return kwargs