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

Completely remove reactors from the configuration

Browse source
This commit is contained in:
Pedro Algarvio 2020-04-08 19:26:19 +01:00 • committed by Daniel Wozniak
parent 5e5414e9dc
commit 14e606b39c
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/conftest.py
View file

@ -1024,13 +1024,6 @@ def pytest_saltfactories_master_configuration_overrides(
}
)
opts["pillar_opts"] = True
opts["reactor"] = [
{
"salt/minion/*/start": [
os.path.join(RUNTIME_VARS.FILES, "reactor-sync-minion.sls")
],
},
]
# We need to copy the extension modules into the new master root_dir or
# it will be prefixed by it

14
tests/integration/conftest.py
View file

@ -38,12 +38,22 @@ def salt_master(request, salt_factories):
@pytest.fixture(scope="package")
def salt_minion(request, salt_factories, salt_master):
return salt_factories.spawn_minion(request, "minion", master_id="master")
proc = salt_factories.spawn_minion(request, "minion", master_id="master")
# Sync All
salt_call_cli = salt_factories.get_salt_call_cli("minion")
ret = salt_call_cli.run("saltutil.sync_all", _timeout=120)
assert ret.exitcode == 0, ret
return proc
@pytest.fixture(scope="package")
def salt_sub_minion(request, salt_factories, salt_master):
return salt_factories.spawn_minion(request, "sub_minion", master_id="master")
proc = salt_factories.spawn_minion(request, "sub_minion", master_id="master")
# Sync All
salt_call_cli = salt_factories.get_salt_call_cli("sub_minion")
ret = salt_call_cli.run("saltutil.sync_all", _timeout=120)
assert ret.exitcode == 0, ret
return proc
@pytest.fixture(scope="package", autouse=True)