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

Accept 2 as a valid exitcode for the nsis installer

Browse source
This commit is contained in:
Shane Lee 2024-07-23 10:23:09 -06:00 • committed by Daniel Wozniak
parent 22f3d26708
commit 962f7529fb
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/pytests/pkg/download/test_pkg_download.py
View file

@ -496,7 +496,7 @@ def setup_windows(
ret = shell.run(
"msiexec", "/qn", "/i", str(pkg_path), 'START_MINION=""'
)
assert ret.returncode == 0, ret
assert ret.returncode in (0, 2), ret
log.debug("Removing installed salt-minion service")
ret = shell.run(
@ -508,7 +508,7 @@ def setup_windows(
"confirm",
check=False,
)
assert ret.returncode == 0, ret
assert ret.returncode in (0, 2), ret
else:
# We are testing the onedir download
onedir_name = f"salt-{salt_release}-onedir-windows-{arch}.zip"