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

Merge pull request #43021 from terminalmage/fix-network-test

Browse source 
Use socket.AF_INET6 to get the correct value instead of doing an OS check
This commit is contained in:
garethgreenaway 2017-08-17 10:57:08 -07:00 • committed by GitHub
commit 37c63e7cf2
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/unit/utils/network_test.py
View file

@ -12,7 +12,6 @@ ensure_in_syspath('../../')
# Import salt libs
from salt.utils import network
import salt.utils
LINUX = '''\
eth0 Link encap:Ethernet HWaddr e0:3f:49:85:6a:af
@ -115,14 +114,13 @@ class NetworkTestCase(TestCase):
'''
def _side_effect(host, *args):
try:
ipv6_fam = 30 if salt.utils.is_darwin() else 10
return {
'github.com': [
(2, 1, 6, '', ('192.30.255.112', 0)),
(2, 1, 6, '', ('192.30.255.113', 0)),
],
'ipv6host.foo': [
(ipv6_fam, 1, 6, '', ('2001:a71::1', 0, 0, 0)),
(socket.AF_INET6, 1, 6, '', ('2001:a71::1', 0, 0, 0)),
],
}[host]
except KeyError: