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

Attempt to fix the mac tests... again

Browse source
This commit is contained in:
MKLeb 2023-02-16 12:24:50 -05:00 • committed by Pedro Algarvio
parent cdd5065667
commit 6a0a96a8f8
2 changed files with 33 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@ def test_services(install_salt, salt_cli, salt_minion):
services_enabled = []
services_disabled = ["salt-master", "salt-minion", "salt-syndic", "salt-api"]
else:
pytest.fail(f"Don't know how to handle os_family={os_family}")
pytest.fail(f"Don't know how to handle os_family={install_salt.distro_id}")
for service in services_enabled:
assert salt_cli.run("service.enabled")

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

@ -267,7 +267,6 @@ class SaltPkgInstall:
self.root = pathlib.Path(os.sep, "usr", "local", "bin")
if file_ext == "pkg":
self.compressed = False
self.onedir = True
self.installer_pkg = True
self.bin_dir = self.root / "salt" / "bin"
@ -315,25 +314,21 @@ class SaltPkgInstall:
"python": [python_bin],
}
else:
if os.path.exists(self.install_dir / "bin" / "salt"):
install_dir = self.install_dir / "bin"
else:
install_dir = self.install_dir
self.binary_paths = {
"salt": [install_dir / "salt"],
"api": [install_dir / "salt-api"],
"call": [install_dir / "salt-call"],
"cloud": [install_dir / "salt-cloud"],
"cp": [install_dir / "salt-cp"],
"key": [install_dir / "salt-key"],
"master": [install_dir / "salt-master"],
"minion": [install_dir / "salt-minion"],
"proxy": [install_dir / "salt-proxy"],
"run": [install_dir / "salt-run"],
"ssh": [install_dir / "salt-ssh"],
"syndic": [install_dir / "salt-syndic"],
"spm": [install_dir / "spm"],
"pip": [install_dir / "salt-pip"],
"salt": ["salt"],
"api": ["salt-api"],
"call": ["salt-call"],
"cloud": ["salt-cloud"],
"cp": ["salt-cp"],
"key": ["salt-key"],
"master": ["salt-master"],
"minion": ["salt-minion"],
"proxy": ["salt-proxy"],
"run": ["salt-run"],
"ssh": ["salt-ssh"],
"syndic": ["salt-syndic"],
"spm": ["spm"],
"pip": ["salt-pip"],
"python": [python_bin],
}
else:
@ -374,21 +369,25 @@ class SaltPkgInstall:
"python": [python_bin],
}
else:
if os.path.exists(self.install_dir / "bin" / "salt"):
install_dir = self.install_dir / "bin"
else:
install_dir = self.install_dir
self.binary_paths = {
"salt": [self.install_dir / "salt"],
"api": [self.install_dir / "salt-api"],
"call": [self.install_dir / "salt-call"],
"cloud": [self.install_dir / "salt-cloud"],
"cp": [self.install_dir / "salt-cp"],
"key": [self.install_dir / "salt-key"],
"master": [self.install_dir / "salt-master"],
"minion": [self.install_dir / "salt-minion"],
"proxy": [self.install_dir / "salt-proxy"],
"run": [self.install_dir / "salt-run"],
"ssh": [self.install_dir / "salt-ssh"],
"syndic": [self.install_dir / "salt-syndic"],
"spm": [self.install_dir / "spm"],
"pip": [self.install_dir / "salt-pip"],
"salt": [install_dir / "salt"],
"api": [install_dir / "salt-api"],
"call": [install_dir / "salt-call"],
"cloud": [install_dir / "salt-cloud"],
"cp": [install_dir / "salt-cp"],
"key": [install_dir / "salt-key"],
"master": [install_dir / "salt-master"],
"minion": [install_dir / "salt-minion"],
"proxy": [install_dir / "salt-proxy"],
"run": [install_dir / "salt-run"],
"ssh": [install_dir / "salt-ssh"],
"syndic": [install_dir / "salt-syndic"],
"spm": [install_dir / "spm"],
"pip": [install_dir / "salt-pip"],
"python": [python_bin],
}