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

Allow for Photon returning the wrong thing for IPv4 localhost test

Browse source
This commit is contained in:
David Murphy 2023-10-27 15:49:54 -06:00 • committed by Pedro Algarvio
parent 903778d83f
commit beea32d839
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1382,7 +1382,11 @@ def test_get_socket():
def test_ip_to_host(grains):
ret = network.ip_to_host("127.0.0.1")
assert ret == "localhost"
if grains["oscodename"] == "Photon":
# Photon returns this for IPv4
assert ret == "ipv6-localhost"
else:
assert ret == "localhost"
ret = network.ip_to_host("2001:a71::1")
assert ret is None
@ -1395,10 +1399,11 @@ 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":
assert ret == "localhost"
if grains["oscodename"] == "Photon":
assert ret == "ipv6-localhost"
else:
assert ret == "localhost"
elif grains["os_family"] == "Arch":
if grains.get("osmajorrelease", None) is None:
# running doesn't have osmajorrelease grains