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

More debug

Browse source
This commit is contained in:
David Murphy 2024-05-17 09:31:50 -06:00 • committed by Daniel Wozniak
parent d63062be82
commit 9abb43cdcf
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,17 +24,18 @@ def _get_running_salt_minion_pid(
# and psutil is only returning the salt-minion once
pids = []
log.warning(
f"DGM _get_running_salt_minion_pid entry, process_name '{process_name}'"
)
print(f"DGM _get_running_salt_minion_pid entry, process_name '{process_name}'")
for proc in psutil.process_iter():
log.warning(f"DGM _get_running_salt_minion_pid, proc.name '{proc.name()}'")
print(
f"DGM _get_running_salt_minion_pid, proc.name '{proc.name()}', and proc.cmdline '{proc.cmdline()}'"
)
dgm_cmdline = proc.cmdline()
cmdl_strg = " ".join(str(element) for element in proc.cmdline())
log.warning(
f"DGM _get_running_salt_minion_pid, proc.name exists, process_name '{process_name}', cmdl_strg '{cmdl_strg}'"
f"DGM _get_running_salt_minion_pid, cmdline, cmdl_strg '{cmdl_strg}'"
)
print(
f"DGM _get_running_salt_minion_pid, proc.name exists, process_name '{process_name}', cmdl_strg '{cmdl_strg}'"
f"DGM _get_running_salt_minion_pid, cmdline, cmdl_strg '{cmdl_strg}', from cmdline '{dgm_cmdline}'"
)
if process_name in cmdl_strg:
pids.append(proc.pid)
@ -61,7 +62,7 @@ def test_salt_upgrade_minion(
original_py_version = install_salt.package_python_version()
ret = salt_call_cli.run("--local", "cmd.run", "ps aux")
print(f"DGM test_salt_upgrade_minion, ps aux ret '{ret}'")
print(f"DGM test_salt_upgrade_minion, initial minion ps aux ret '{ret}'")
assert ret.returncode == 0
# Verify previous install version is setup correctly and works
ret = salt_call_cli.run("--local", "test.version")
@ -128,6 +129,11 @@ def test_salt_upgrade_minion(
process_name = "salt-minion.exe"
else:
process_name = "salt-minion"
ret = salt_call_cli.run("--local", "cmd.run", "ps aux")
print(f"DGM test_salt_upgrade_minion, upgraded minion ps aux ret '{ret}'")
assert ret.returncode == 0
new_pids = _get_running_salt_minion_pid(process_name)
assert new_pids