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

Some fixes for macos tiamat downgrade tests

Browse source
This commit is contained in:
MKLeb 2023-08-28 16:49:37 -04:00 • committed by Pedro Algarvio
parent 660be2a5d0
commit dabc91ce75
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/tests/integration/test_salt_exec.py
View file

@ -15,7 +15,7 @@ def test_salt_cmd_run(salt_cli, salt_minion):
if platform.startswith("win"):
ret = salt_cli.run("cmd.run", "ipconfig", minion_tgt=salt_minion.id)
else:
ret = salt_cli.run("cmd.run", "ls -lah /", minion_tgt=salt_minion.id)
ret = salt_cli.run("cmd.run", "'ls -lah /'", minion_tgt=salt_minion.id)
assert ret
assert ret.stdout

5
pkg/tests/support/helpers.py
View file

@ -333,7 +333,10 @@ class SaltPkgInstall:
)
else:
self.binary_paths["python"] = [shutil.which("salt"), "shell"]
self.binary_paths["pip"] = [shutil.which("salt-pip")]
if platform.is_darwin():
self.binary_paths["pip"] = [self.run_root, "pip"]
else:
self.binary_paths["pip"] = [shutil.which("salt-pip")]
@staticmethod
def salt_factories_root_dir(system_service: bool = False) -> pathlib.Path: