valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #43014 from Ch3LL/fix_network_mac

Browse Source 
Change AF_INET6 family for mac in test_host_to_ips
This commit is contained in:
garethgreenaway 2017-08-17 09:17:50 -07:00 committed by GitHub
commit ff1caeee68
1 changed files with 3 additions and 1 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,6 +12,7 @@ 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
@ -114,13 +115,14 @@ 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': [
(10, 1, 6, '', ('2001:a71::1', 0, 0, 0)),
(ipv6_fam, 1, 6, '', ('2001:a71::1', 0, 0, 0)),
],
}[host]
except KeyError: