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 4

Only set file and pill roots perms on linux

Browse source
This commit is contained in:
Megan Wilhite 2023-04-15 13:54:31 -06:00 • committed by Pedro Algarvio
parent b35db04826
commit d2bd6004a8
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/tests/conftest.py
View file

@ -424,7 +424,7 @@ def salt_minion(salt_factories, salt_master, install_salt):
# Salt factories calls salt.utils.verify.verify_env
# which sets root perms on /srv/salt and /srv/pillar since we are running
# the test suite as root, but we want to run Salt master as salt
if not platform.is_windows() or not platform.is_darwin():
if not platform.is_windows() and not platform.is_darwin():
file_roots = pathlib.Path("/srv/", "salt")
pillar_roots = pathlib.Path("/srv/", "pillar")
for _dir in [file_roots, pillar_roots]:
@ -466,9 +466,9 @@ def extras_pypath():
os.getenv("ProgramFiles"), "Salt Project", "Salt", extras_dir, "bin"
)
elif platform.is_darwin():
return pathlib.Path(f"{os.sep}opt", "salt", extras_dir, "bin")
return pathlib.Path(f"/opt", "salt", extras_dir, "bin")
else:
return pathlib.Path(f"{os.sep}opt", "saltstack", "salt", extras_dir, "bin")
return pathlib.Path(f"/opt", "saltstack", "salt", extras_dir, "bin")
@pytest.fixture(scope="module")