saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 17:50:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add workaround for salt-master on classic mac pkg tests

Browse source
This commit is contained in:
Megan Wilhite 2023-09-11 09:46:27 -06:00 • committed by Pedro Algarvio
parent 05b141d934
commit 0fde37e4d5
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkg/tests/conftest.py
View file

@ -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,