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

Disable macOS Mojave log forwarding on the proxy minion tests

Browse source 
Fixes https://github.com/saltstack/salt/issues/60201
This commit is contained in:
Pedro Algarvio 2021-06-21 16:59:44 +01:00 • committed by Megan Wilhite
parent 0c29595fb6
commit 5ae3bc9821
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/pytests/conftest.py
View file

@ -297,13 +297,15 @@ def salt_sub_minion_factory(salt_master_factory, salt_sub_minion_id):
@pytest.fixture(scope="session")
def salt_proxy_factory(salt_master_factory):
def salt_proxy_factory(salt_master_factory, grains):
proxy_minion_id = random_string("proxytest-")
config_overrides = {
"file_roots": salt_master_factory.config["file_roots"].copy(),
"pillar_roots": salt_master_factory.config["pillar_roots"].copy(),
}
if salt.utils.platform.is_darwin() and tuple(grains["osrelease_info"]) < (10, 50):
config_overrides["pytest-minion"] = {"log": {"disabled": True}}
factory = salt_master_factory.salt_proxy_minion_daemon(
proxy_minion_id,