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 2

Fix the hosts tests

Browse source
This commit is contained in:
Pedro Algarvio 2020-04-08 16:28:03 +01:00 • committed by Daniel Wozniak
parent d742aafd5a
commit eea435b91e
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/conftest.py
View file

@ -987,8 +987,8 @@ def pytest_saltfactories_generate_default_master_configuration(
) as rfh:
opts = yaml.deserialize(rfh.read())
opts["hosts.file"] = root_dir.join("hosts").strpath
opts["aliases.file"] = root_dir.join("aliases").strpath
opts["hosts.file"] = os.path.join(RUNTIME_VARS.TMP, "hosts")
opts["aliases.file"] = os.path.join(RUNTIME_VARS.TMP, "aliases")
opts["transport"] = request.config.getoption("--transport")
return opts
@ -1133,8 +1133,8 @@ def pytest_saltfactories_generate_default_minion_configuration(
else:
raise RuntimeError("Not prepared to handle minion_id '{}'".format(minion_id))
opts["hosts.file"] = root_dir.join("hosts").strpath
opts["aliases.file"] = root_dir.join("aliases").strpath
opts["hosts.file"] = os.path.join(RUNTIME_VARS.TMP, "hosts")
opts["aliases.file"] = os.path.join(RUNTIME_VARS.TMP, "aliases")
opts["transport"] = request.config.getoption("--transport")
return opts
@ -1212,8 +1212,8 @@ def pytest_saltfactories_generate_default_syndic_configuration(
) as rfh:
opts = yaml.deserialize(rfh.read())
opts["hosts.file"] = root_dir.join("hosts").strpath
opts["aliases.file"] = root_dir.join("aliases").strpath
opts["hosts.file"] = os.path.join(RUNTIME_VARS.TMP, "hosts")
opts["aliases.file"] = os.path.join(RUNTIME_VARS.TMP, "aliases")
opts["transport"] = request.config.getoption("--transport")
factory_opts["syndic"] = opts
return factory_opts

4
tests/integration/proxy/conftest.py
View file

@ -48,8 +48,8 @@ def pytest_saltfactories_generate_default_proxy_minion_configuration(
"Not prepared to handle proxy_minion_id '{}'".format(proxy_minion_id)
)
opts["hosts.file"] = root_dir.join("hosts").strpath
opts["aliases.file"] = root_dir.join("aliases").strpath
opts["hosts.file"] = os.path.join(RUNTIME_VARS.TMP, "hosts")
opts["aliases.file"] = os.path.join(RUNTIME_VARS.TMP, "aliases")
opts["transport"] = request.config.getoption("--transport")
RUNTIME_VARS.TMP_PROXY_CONF_DIR = root_dir.join("conf").strpath