From 0fde37e4d5aee878f3446645debf5a7075dfc035 Mon Sep 17 00:00:00 2001 From: Megan Wilhite Date: Mon, 11 Sep 2023 09:46:27 -0600 Subject: [PATCH] Add workaround for salt-master on classic mac pkg tests --- pkg/tests/conftest.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/tests/conftest.py b/pkg/tests/conftest.py index 6609f2ddcc2..36c60b0e57b 100644 --- a/pkg/tests/conftest.py +++ b/pkg/tests/conftest.py @@ -412,6 +412,10 @@ def salt_master(salt_factories, install_salt, state_tree, pillar_tree): ) salt_factories.system_service = True else: + + if install_salt.classic and platform.is_darwin(): + os.environ["PATH"] += ":/opt/salt/bin" + factory = salt_factories.salt_master_daemon( random_string("master-"), defaults=config_defaults, @@ -478,6 +482,9 @@ def salt_minion(salt_factories, salt_master, install_salt): if install_salt.classic and platform.is_windows(): salt_factories.python_executable = None + if install_salt.classic and platform.is_darwin(): + os.environ["PATH"] += ":/opt/salt/bin" + factory = salt_master.salt_minion_daemon( minion_id, overrides=config_overrides,