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

Some more fixes for the NSIS package tests

Browse source
This commit is contained in:
MKLeb 2023-06-27 14:19:26 -04:00 • committed by Gareth J. Greenaway
parent 0d622479b2
commit d007ebd8d9
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/support/helpers.py
View file

@ -749,13 +749,13 @@ class SaltPkgInstall:
self.bin_dir = self.install_dir / "bin"
self.run_root = self.bin_dir / f"salt.exe"
self.ssm_bin = self.bin_dir / "ssm.exe"
if self.file_ext == "msi":
if self.file_ext == "msi" or relenv:
self.ssm_bin = self.install_dir / "ssm.exe"
if not self.classic:
if not relenv:
win_pkg = f"salt-{full_version}-windows-amd64.{self.file_ext}"
win_pkg_url = f"https://repo.saltproject.io/salt/py3/windows/{full_version}/{win_pkg}"
win_pkg = f"salt-{self.prev_version}-windows-amd64.{self.file_ext}"
win_pkg_url = f"https://repo.saltproject.io/salt/py3/windows/{self.prev_version}/{win_pkg}"
else:
if self.file_ext == "msi":
win_pkg = (