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

Fixed more lint

Browse source
This commit is contained in:
twangboy 2016-01-22 19:20:24 -07:00 • committed by Pablo Suárez Hernández
parent 63ff731009
commit f8c0b439b8
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tests/unit/modules/mac_sysctl_test.py
View file

@ -25,13 +25,13 @@ from salttesting.mock import (
ensure_in_syspath('../../')
# Globals
darwin_sysctl.__salt__ = {}
mac_sysctl.__salt__ = {}
@skipIf(NO_MOCK, NO_MOCK_REASON)
class DarwinSysctlTestCase(TestCase):
'''
TestCase for salt.modules.darwin_sysctl module
TestCase for salt.modules.mac_sysctl module
'''
def test_get(self):
@ -39,8 +39,8 @@ class DarwinSysctlTestCase(TestCase):
Tests the return of get function
'''
mock_cmd = MagicMock(return_value='foo')
with patch.dict(darwin_sysctl.__salt__, {'cmd.run': mock_cmd}):
self.assertEqual(darwin_sysctl.get('kern.ostype'), 'foo')
with patch.dict(mac_sysctl.__salt__, {'cmd.run': mock_cmd}):
self.assertEqual(mac_sysctl.get('kern.ostype'), 'foo')
def test_assign_cmd_failed(self):
'''
@ -49,9 +49,9 @@ class DarwinSysctlTestCase(TestCase):
cmd = {'pid': 3548, 'retcode': 1, 'stderr': '',
'stdout': 'net.inet.icmp.icmplim: 250 -> 50'}
mock_cmd = MagicMock(return_value=cmd)
with patch.dict(darwin_sysctl.__salt__, {'cmd.run_all': mock_cmd}):
with patch.dict(mac_sysctl.__salt__, {'cmd.run_all': mock_cmd}):
self.assertRaises(CommandExecutionError,
darwin_sysctl.assign,
mac_sysctl.assign,
'net.inet.icmp.icmplim', 50)
def test_assign(self):
@ -62,8 +62,8 @@ class DarwinSysctlTestCase(TestCase):
'stdout': 'net.inet.icmp.icmplim: 250 -> 50'}
ret = {'net.inet.icmp.icmplim': '50'}
mock_cmd = MagicMock(return_value=cmd)
with patch.dict(darwin_sysctl.__salt__, {'cmd.run_all': mock_cmd}):
self.assertEqual(darwin_sysctl.assign(
with patch.dict(mac_sysctl.__salt__, {'cmd.run_all': mock_cmd}):
self.assertEqual(mac_sysctl.assign(
'net.inet.icmp.icmplim', 50), ret)
@patch('os.path.isfile', MagicMock(return_value=False))
@ -74,7 +74,7 @@ class DarwinSysctlTestCase(TestCase):
with patch('salt.utils.fopen', mock_open()) as m_open:
helper_open = m_open()
helper_open.write.assertRaises(CommandExecutionError,
darwin_sysctl.persist,
mac_sysctl.persist,
'net.inet.icmp.icmplim',
50, config=None)
@ -84,7 +84,7 @@ class DarwinSysctlTestCase(TestCase):
Tests successful add of config file when previously not one
'''
with patch('salt.utils.fopen', mock_open()) as m_open:
darwin_sysctl.persist('net.inet.icmp.icmplim', 50)
mac_sysctl.persist('net.inet.icmp.icmplim', 50)
helper_open = m_open()
helper_open.write.assert_called_once_with(
'#\n# Kernel sysctl configuration\n#\n')
@ -97,7 +97,7 @@ class DarwinSysctlTestCase(TestCase):
to_write = '#\n# Kernel sysctl configuration\n#\n'
m_calls_list = [call.writelines(['net.inet.icmp.icmplim=50', '\n'])]
with patch('salt.utils.fopen', mock_open(read_data=to_write)) as m_open:
darwin_sysctl.persist('net.inet.icmp.icmplim', 50, config=to_write)
mac_sysctl.persist('net.inet.icmp.icmplim', 50, config=to_write)
helper_open = m_open()
calls_list = helper_open.method_calls
self.assertEqual(calls_list, m_calls_list)