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

Add regression test for _generate_minion_id()

Browse source
This commit is contained in:
Erik Johnson 2018-06-13 01:13:43 -05:00
parent 5e62d6d45f
commit 248467edac
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tests/unit/utils/test_network.py
View file

@ -3,11 +3,18 @@
from __future__ import absolute_import, unicode_literals, print_function
import logging
import socket
import textwrap
# Import Salt Testing libs
from tests.support.unit import skipIf
from tests.support.unit import TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock
from tests.support.mock import (
MagicMock,
mock_open,
patch,
NO_MOCK,
NO_MOCK_REASON,
)
# Import salt libs
import salt.utils.network as network
@ -147,6 +154,20 @@ class NetworkTestCase(TestCase):
def test_generate_minion_id(self):
self.assertTrue(network.generate_minion_id())
def test__generate_minion_id_with_unicode_in_etc_hosts(self):
'''
Test that unicode in /etc/hosts doesn't raise an error when
_generate_minion_id() helper is called to gather the hosts.
'''
content = textwrap.dedent('''\
# 以下为主机名解析
## ccc
127.0.0.1 localhost thisismyhostname # 本机
''')
fopen_mock = mock_open(read_data=content, match='/etc/hosts')
with patch('salt.utils.files.fopen', fopen_mock):
assert 'thisismyhostname' in network._generate_minion_id()
def test_is_ip(self):
self.assertTrue(network.is_ip('10.10.0.3'))
self.assertFalse(network.is_ip('0.9.800.1000'))