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

Upgrade to pytest-salt-factories 0.8.x

Browse source
This commit is contained in:
Pedro Algarvio 2020-04-22 18:50:23 +01:00 • committed by Daniel Wozniak
parent c5feb6859a
commit d30e09f297
2 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/conftest.py
View file

@ -862,7 +862,7 @@ def salt_sub_minion_config(request, salt_factories, salt_master_config):
return salt_factories.configure_minion(request, "sub_minion", master_id="master")
def pytest_saltfactories_generate_default_master_configuration(
def pytest_saltfactories_master_configuration_defaults(
request, factories_manager, root_dir, master_id, order_masters
):
"""
@ -917,7 +917,7 @@ def pytest_saltfactories_generate_default_master_configuration(
def pytest_saltfactories_master_configuration_overrides(
request, factories_manager, root_dir, master_id, default_options, order_masters
request, factories_manager, root_dir, master_id, config_defaults, order_masters
):
"""
Hook which should return a dictionary tailored for the provided master_id.
@ -1012,7 +1012,7 @@ def pytest_saltfactories_master_configuration_overrides(
return opts
def pytest_saltfactories_generate_default_minion_configuration(
def pytest_saltfactories_minion_configuration_defaults(
request, factories_manager, root_dir, minion_id, master_port
):
"""
@ -1051,7 +1051,7 @@ def pytest_saltfactories_generate_default_minion_configuration(
def pytest_saltfactories_minion_configuration_overrides(
request, factories_manager, root_dir, minion_id, default_options
request, factories_manager, root_dir, minion_id, config_defaults
):
"""
Hook which should return a dictionary tailored for the provided minion_id.
@ -1103,7 +1103,7 @@ def pytest_saltfactories_minion_configuration_overrides(
@pytest.hookspec(firstresult=True)
def pytest_saltfactories_generate_default_syndic_configuration(
def pytest_saltfactories_syndic_configuration_defaults(
request, factories_manager, root_dir, syndic_id, syndic_master_port
):
"""
@ -1131,7 +1131,7 @@ def pytest_saltfactories_generate_default_syndic_configuration(
@pytest.hookspec(firstresult=True)
def pytest_saltfactories_syndic_configuration_overrides(
request, factories_manager, syndic_id, default_options
request, factories_manager, syndic_id, config_defaults
):
"""
Hook which should return a dictionary tailored for the provided syndic_id.

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

@ -30,7 +30,7 @@ def salt_proxy(request, salt_factories, salt_master):
log.warning("The proxy minion key was not found at %s", proxy_key_file)
def pytest_saltfactories_generate_default_proxy_minion_configuration(
def pytest_saltfactories_proxy_minion_configuration_defaults(
request, factories_manager, root_dir, proxy_minion_id, master_port
):
"""
@ -55,14 +55,3 @@ def pytest_saltfactories_generate_default_proxy_minion_configuration(
RUNTIME_VARS.TMP_PROXY_CONF_DIR = root_dir.join("conf").strpath
return opts
def pytest_saltfactories_proxy_minion_configuration_overrides(
request, factories_manager, root_dir, proxy_minion_id, default_options
):
"""
Hook which should return a dictionary tailored for the provided proxy_minion_id.
This dictionary will override the default_options dictionary.
Stops at the first non None result
"""