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

Further debug statements

Browse source
This commit is contained in:
David Murphy 2024-05-17 14:17:25 -06:00 • committed by Daniel Wozniak
parent 9abb43cdcf
commit 24a44edf8c
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/pytests/pkg/upgrade/test_salt_upgrade.py
View file

@ -1,4 +1,5 @@
import logging
import time
import packaging.version
import psutil
@ -102,6 +103,9 @@ def test_salt_upgrade_minion(
# Upgrade Salt from previous version and test
install_salt.install(upgrade=True)
time.sleep(60) # give it some time, DGM
ret = salt_call_cli.run("--local", "test.version")
log.warning(f"DGM test_salt_upgrade_minion, upgrade test_version ret '{ret}'")
print(f"DGM test_salt_upgrade_minion, upgrade test_version ret '{ret}'")

6
tests/support/pkg.py
View file

@ -483,9 +483,9 @@ class SaltPkgInstall:
log.debug("Installing: %s", str(pkg))
ret = self.proc.run("installer", "-pkg", str(pkg), "-target", "/")
self._check_retcode(ret)
# Stop the service installed by the installer
self.proc.run("launchctl", "disable", f"system/{service_name}")
self.proc.run("launchctl", "bootout", "system", str(plist_file))
## DGM # Stop the service installed by the installer
## DGM self.proc.run("launchctl", "disable", f"system/{service_name}")
## DGM self.proc.run("launchctl", "bootout", "system", str(plist_file))
elif upgrade:
env = os.environ.copy()
extra_args = []