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

Fix crappy mocking

Browse source 
This mocking was poorly done, which was revealed when I made an EAFP
modification to _generate_minion_id().
This commit is contained in:
Erik Johnson 2018-06-13 14:11:44 -05:00
parent 248467edac
commit 4eaa5789ce
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -341,8 +341,7 @@ class NetworkTestCase(TestCase):
patch('socket.gethostname', MagicMock(return_value='hostname')), \
patch('socket.getfqdn', MagicMock(return_value='hostname.domainname.blank')), \
patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'attrname', ('127.0.1.1', 0))])), \
patch('salt.utils.files.fopen', MagicMock(return_value=False)), \
patch('os.path.exists', MagicMock(return_value=False)), \
patch('salt.utils.files.fopen', mock_open()), \
patch('salt.utils.network.ip_addrs', MagicMock(return_value=['1.2.3.4', '5.6.7.8'])):
self.assertEqual(network._generate_minion_id(),
['hostname.domainname.blank', 'nodename', 'hostname', '1.2.3.4', '5.6.7.8'])
@ -357,8 +356,7 @@ class NetworkTestCase(TestCase):
patch('socket.gethostname', MagicMock(return_value='127')), \
patch('socket.getfqdn', MagicMock(return_value='127.domainname.blank')), \
patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'attrname', ('127.0.1.1', 0))])), \
patch('salt.utils.files.fopen', MagicMock(return_value=False)), \
patch('os.path.exists', MagicMock(return_value=False)), \
patch('salt.utils.files.fopen', mock_open()), \
patch('salt.utils.network.ip_addrs', MagicMock(return_value=['1.2.3.4', '5.6.7.8'])):
self.assertEqual(network._generate_minion_id(),
['127.domainname.blank', '127', '1.2.3.4', '5.6.7.8'])
@ -373,8 +371,7 @@ class NetworkTestCase(TestCase):
patch('socket.gethostname', MagicMock(return_value='127890')), \
patch('socket.getfqdn', MagicMock(return_value='127890.domainname.blank')), \
patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'attrname', ('127.0.1.1', 0))])), \
patch('salt.utils.files.fopen', MagicMock(return_value=False)), \
patch('os.path.exists', MagicMock(return_value=False)), \
patch('salt.utils.files.fopen', mock_open()), \
patch('salt.utils.network.ip_addrs', MagicMock(return_value=['1.2.3.4', '5.6.7.8'])):
self.assertEqual(network._generate_minion_id(),
['127890.domainname.blank', '127890', '1.2.3.4', '5.6.7.8'])
@ -389,8 +386,7 @@ class NetworkTestCase(TestCase):
patch('socket.gethostname', MagicMock(return_value='hostname')), \
patch('socket.getfqdn', MagicMock(return_value='hostname')), \
patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'hostname', ('127.0.1.1', 0))])), \
patch('salt.utils.files.fopen', MagicMock(return_value=False)), \
patch('os.path.exists', MagicMock(return_value=False)), \
patch('salt.utils.files.fopen', mock_open()), \
patch('salt.utils.network.ip_addrs', MagicMock(return_value=['1.2.3.4', '1.2.3.4', '1.2.3.4'])):
self.assertEqual(network._generate_minion_id(), ['hostname', '1.2.3.4'])
@ -405,8 +401,7 @@ class NetworkTestCase(TestCase):
patch('socket.gethostname', MagicMock(return_value='hostname')), \
patch('socket.getfqdn', MagicMock(return_value='')), \
patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'hostname', ('127.0.1.1', 0))])), \
patch('salt.utils.files.fopen', MagicMock(return_value=False)), \
patch('os.path.exists', MagicMock(return_value=False)), \
patch('salt.utils.files.fopen', mock_open()), \
patch('salt.utils.network.ip_addrs', MagicMock(return_value=['1.2.3.4', '1.2.3.4', '1.2.3.4'])):
self.assertEqual(network.generate_minion_id(), 'very.long.and.complex.domain.name')
@ -420,8 +415,7 @@ class NetworkTestCase(TestCase):
patch('socket.gethostname', MagicMock(return_value='pick.me')), \
patch('socket.getfqdn', MagicMock(return_value='hostname.domainname.blank')), \
patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'hostname', ('127.0.1.1', 0))])), \
patch('salt.utils.files.fopen', MagicMock(return_value=False)), \
patch('os.path.exists', MagicMock(return_value=False)), \
patch('salt.utils.files.fopen', mock_open()), \
patch('salt.utils.network.ip_addrs', MagicMock(return_value=['1.2.3.4', '1.2.3.4', '1.2.3.4'])):
self.assertEqual(network.generate_minion_id(), 'hostname.domainname.blank')
@ -435,8 +429,7 @@ class NetworkTestCase(TestCase):
patch('socket.gethostname', MagicMock(return_value='ip6-loopback')), \
patch('socket.getfqdn', MagicMock(return_value='ip6-localhost')), \
patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'localhost', ('127.0.1.1', 0))])), \
patch('salt.utils.files.fopen', MagicMock(return_value=False)), \
patch('os.path.exists', MagicMock(return_value=False)), \
patch('salt.utils.files.fopen', mock_open()), \
patch('salt.utils.network.ip_addrs', MagicMock(return_value=['127.0.0.1', '::1', 'fe00::0', 'fe02::1', '1.2.3.4'])):
self.assertEqual(network.generate_minion_id(), '1.2.3.4')
@ -450,8 +443,7 @@ class NetworkTestCase(TestCase):
patch('socket.gethostname', MagicMock(return_value='ip6-loopback')), \
patch('socket.getfqdn', MagicMock(return_value='ip6-localhost')), \
patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'localhost', ('127.0.1.1', 0))])), \
patch('salt.utils.files.fopen', MagicMock(return_value=False)), \
patch('os.path.exists', MagicMock(return_value=False)), \
patch('salt.utils.files.fopen', mock_open()), \
patch('salt.utils.network.ip_addrs', MagicMock(return_value=['127.0.0.1', '::1', 'fe00::0', 'fe02::1'])):
self.assertEqual(network.generate_minion_id(), 'localhost')
@ -465,8 +457,7 @@ class NetworkTestCase(TestCase):
patch('socket.gethostname', MagicMock(return_value='ip6-loopback')), \
patch('socket.getfqdn', MagicMock(return_value='pick.me')), \
patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'localhost', ('127.0.1.1', 0))])), \
patch('salt.utils.files.fopen', MagicMock(return_value=False)), \
patch('os.path.exists', MagicMock(return_value=False)), \
patch('salt.utils.files.fopen', mock_open()), \
patch('salt.utils.network.ip_addrs', MagicMock(return_value=['127.0.0.1', '::1', 'fe00::0', 'fe02::1'])):
self.assertEqual(network.generate_minion_id(), 'pick.me')
@ -480,8 +471,7 @@ class NetworkTestCase(TestCase):
patch('socket.gethostname', MagicMock(return_value='ip6-loopback')), \
patch('socket.getfqdn', MagicMock(return_value='ip6-localhost')), \
patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'pick.me', ('127.0.1.1', 0))])), \
patch('salt.utils.files.fopen', MagicMock(return_value=False)), \
patch('os.path.exists', MagicMock(return_value=False)), \
patch('salt.utils.files.fopen', mock_open()), \
patch('salt.utils.network.ip_addrs', MagicMock(return_value=['127.0.0.1', '::1', 'fe00::0', 'fe02::1'])):
self.assertEqual(network.generate_minion_id(), 'pick.me')
@ -495,8 +485,7 @@ class NetworkTestCase(TestCase):
patch('socket.gethostname', MagicMock(return_value='ip6-loopback')), \
patch('socket.getfqdn', MagicMock(return_value='ip6-localhost')), \
patch('socket.getaddrinfo', MagicMock(return_value=[(2, 3, 0, 'localhost', ('127.0.1.1', 0))])), \
patch('salt.utils.files.fopen', MagicMock(return_value=False)), \
patch('os.path.exists', MagicMock(return_value=False)), \
patch('salt.utils.files.fopen', mock_open()), \
patch('salt.utils.network.ip_addrs', MagicMock(return_value=['127.0.0.1', '::1', 'fe00::0', 'fe02::1', '1.2.3.4'])):
self.assertEqual(network.generate_minion_id(), '1.2.3.4')