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 2

Re-arranged the IPv6 localhost test and allowed for forms of Arch

Browse source
This commit is contained in:
David Murphy 2023-10-26 15:31:29 -06:00 • committed by Pedro Algarvio
parent 6809e97146
commit 903778d83f
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tests/pytests/unit/utils/test_network.py
View file

@ -1388,14 +1388,6 @@ def test_ip_to_host(grains):
assert ret is None
ret = network.ip_to_host("::1")
dgm_os = grains["os"]
dgm_fam = grains["os_family"]
dgm_codename = grains["oscodename"]
print(
f"DGM grains os '{dgm_os}', os_family '{dgm_fam}', oscodename '{dgm_codename}', ret '{ret}'"
)
if grains["os"] == "Amazon":
assert ret == "localhost6"
elif grains["os_family"] == "Debian":
@ -1403,13 +1395,16 @@ def test_ip_to_host(grains):
assert ret == "localhost"
else:
assert ret == "ip6-localhost"
elif grains["oscodename"] == "Photon":
assert ret == "ipv6-localhost"
elif grains["os_family"] == "RedHat":
if grains["oscodename"] == "Photon":
assert ret == "ipv6-localhost"
else:
assert ret == "localhost"
elif grains["os_family"] == "Arch":
assert ret == "localhost"
elif grains["os_family"] == "Arch":
if grains.get("osmajorrelease", None) is None:
# running doesn't have osmajorrelease grains
assert ret == "localhost"
else:
assert ret == "ip6-localhost"
else:
assert ret == "localhost"