Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-05-03 07:52:39 +01:00 committed by Pedro Algarvio
parent e4c5ce3692
commit ba29a27ad7
2 changed files with 1 additions and 5 deletions

View file

@ -12,5 +12,4 @@ def test_ssm_present(install_salt):
The ssm.exe binary needs to be present in both the zip and the exe/msi
builds
"""
ssm_path = os.path.join(*install_salt.binary_paths["ssm"])
assert os.path.exists(ssm_path)
assert os.path.exists(install_salt.ssm_bin)

View file

@ -380,7 +380,6 @@ class SaltPkgInstall:
"minion": ["salt-minion.exe"],
"pip": ["salt-pip.exe"],
"python": [python_bin],
"ssm": [self.ssm_bin],
}
else:
if os.path.exists(self.install_dir / "bin" / "salt"):
@ -413,7 +412,6 @@ class SaltPkgInstall:
"minion": [str(self.run_root), "minion"],
"pip": [str(self.run_root), "pip"],
"python": [python_bin],
"ssm": [self.ssm_bin],
}
else:
self.binary_paths = {
@ -441,7 +439,6 @@ class SaltPkgInstall:
"minion": [self.install_dir / "salt-minion.exe"],
"pip": [self.install_dir / "salt-pip.exe"],
"python": [python_bin],
"ssm": [self.ssm_bin],
}
else:
self.binary_paths = {