Skip to content

Commit

Permalink
Disable macOS Mojave log forwarding on the proxy minion tests
Browse files Browse the repository at this point in the history
  • Loading branch information
s0undt3ch authored and Ch3LL committed Jun 22, 2021
1 parent 0c29595 commit 5ae3bc9
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion tests/pytests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 5ae3bc9

Please sign in to comment.