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

Fix test

Browse source
This commit is contained in:
David Murphy 2024-05-24 11:42:16 -06:00 • committed by Daniel Wozniak
parent 2da91cd48d
commit b3cc75e5de
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -163,7 +163,7 @@ def test_salt_wrk(
f"DGM salt_systemd_setup, '{test_item}' systemctl enabled test, ret '{ret}'",
flush=True,
)
test_enabled = ret.stdout.strip().split("=")[1]
test_enabled = ret.stdout.strip().split("=")[1].split('"')[0].strip()
print(
f"DGM salt_systemd_setup, '{test_item}' systemctl enabled test produced, line '{ret.stdout.strip().split('=')}', result '{test_enabled}'",
flush=True,
@ -177,7 +177,7 @@ def test_salt_wrk(
f"DGM salt_systemd_setup, '{test_item}' systemctl active test, ret '{ret}'",
flush=True,
)
test_active = ret.stdout.strip().split()[2]
test_active = ret.stdout.strip().split()[2].strip('"').strip()
print(
f"DGM salt_systemd_setup, '{test_item}' systemctl active test produced, line '{ret.stdout.strip().split()}', result '{test_active}'",
flush=True,
@ -227,7 +227,7 @@ def test_salt_wrk(
flush=True,
)
assert ret.returncode == 0
if test_name == "salt-minion":
if test_item == "salt-minion":
assert test_user == "root"
else:
assert test_user == "salt"
@ -243,7 +243,7 @@ def test_salt_wrk(
flush=True,
)
assert ret.returncode == 0
if test_name == "salt-minion":
if test_item == "salt-minion":
assert test_group == "root"
else:
assert test_group == "salt"