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 fixes some poorly-conceived mocking that was done because of some
equally dumb imports being done in salt/modules/junos.py (which I fixed
a few commits ago while in the process of cleaning up the docs).
This commit is contained in:
Erik Johnson 2018-05-30 12:47:06 -05:00
parent bc9e3acef3
commit b9ace5a859
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 47 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
tests/unit/modules/test_junos.py
View file

@ -20,6 +20,8 @@ try:
from jnpr.junos.utils.config import Config
from jnpr.junos.utils.sw import SW
from jnpr.junos.device import Device
from jnpr.junos.device import Device
import jxmlease
HAS_JUNOS = True
except ImportError:
HAS_JUNOS = False
@ -28,7 +30,7 @@ except ImportError:
import salt.modules.junos as junos
@skipIf(not HAS_JUNOS, 'Install junos-eznc to be able to run this test.')
@skipIf(not HAS_JUNOS, 'The junos-eznc and jxmlease modules are required')
class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
def setup_loader_modules(self):
@ -571,7 +573,7 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
with patch('jnpr.junos.utils.config.Config.commit_check') as mock_commit_check, \
patch('jnpr.junos.utils.config.Config.commit') as mock_commit, \
patch('jnpr.junos.utils.config.Config.rollback') as mock_rollback, \
patch('salt.modules.junos.fopen') as mock_fopen, \
patch('salt.utils.fopen') as mock_fopen, \
patch('jnpr.junos.utils.config.Config.diff') as mock_diff:
mock_commit_check.return_value = True
mock_diff.return_value = 'diff'
@ -592,7 +594,7 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
with patch('jnpr.junos.utils.config.Config.commit_check') as mock_commit_check, \
patch('jnpr.junos.utils.config.Config.commit') as mock_commit, \
patch('jnpr.junos.utils.config.Config.rollback') as mock_rollback, \
patch('salt.modules.junos.fopen') as mock_fopen, \
patch('salt.utils.fopen') as mock_fopen, \
patch('jnpr.junos.utils.config.Config.diff') as mock_diff:
mock_commit_check.return_value = True
mock_diff.return_value = None
@ -745,7 +747,7 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
self.assertEqual(junos.cli('show version'), ret)
def test_cli_write_output(self):
with patch('salt.modules.junos.fopen') as mock_fopen, \
with patch('salt.utils.fopen') as mock_fopen, \
patch('jnpr.junos.device.Device.cli') as mock_cli:
mock_cli.return_vale = 'cli text output'
args = {'__pub_user': 'root',
@ -875,8 +877,8 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
patch('jnpr.junos.utils.config.Config.commit_check') as mock_commit_check, \
patch('jnpr.junos.utils.config.Config.diff') as mock_diff, \
patch('jnpr.junos.utils.config.Config.load') as mock_load, \
patch('salt.modules.junos.safe_rm') as mock_safe_rm, \
patch('salt.modules.junos.files.mkstemp') as mock_mkstemp, \
patch('salt.utils.safe_rm') as mock_safe_rm, \
patch('salt.utils.files.mkstemp') as mock_mkstemp, \
patch('os.path.isfile') as mock_isfile, \
patch('os.path.getsize') as mock_getsize:
mock_isfile.return_value = True
@ -896,8 +898,8 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
patch('jnpr.junos.utils.config.Config.commit_check') as mock_commit_check, \
patch('jnpr.junos.utils.config.Config.diff') as mock_diff, \
patch('jnpr.junos.utils.config.Config.load') as mock_load, \
patch('salt.modules.junos.safe_rm') as mock_safe_rm, \
patch('salt.modules.junos.files.mkstemp') as mock_mkstemp, \
patch('salt.utils.safe_rm') as mock_safe_rm, \
patch('salt.utils.files.mkstemp') as mock_mkstemp, \
patch('os.path.isfile') as mock_isfile, \
patch('os.path.getsize') as mock_getsize:
mock_isfile.return_value = True
@ -917,8 +919,8 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
patch('jnpr.junos.utils.config.Config.commit_check') as mock_commit_check, \
patch('jnpr.junos.utils.config.Config.diff') as mock_diff, \
patch('jnpr.junos.utils.config.Config.load') as mock_load, \
patch('salt.modules.junos.safe_rm') as mock_safe_rm, \
patch('salt.modules.junos.files.mkstemp') as mock_mkstemp, \
patch('salt.utils.safe_rm') as mock_safe_rm, \
patch('salt.utils.files.mkstemp') as mock_mkstemp, \
patch('os.path.isfile') as mock_isfile, \
patch('os.path.getsize') as mock_getsize:
mock_isfile.return_value = True
@ -938,8 +940,8 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
patch('jnpr.junos.utils.config.Config.commit_check') as mock_commit_check, \
patch('jnpr.junos.utils.config.Config.diff') as mock_diff, \
patch('jnpr.junos.utils.config.Config.load') as mock_load, \
patch('salt.modules.junos.safe_rm') as mock_safe_rm, \
patch('salt.modules.junos.files.mkstemp') as mock_mkstemp, \
patch('salt.utils.safe_rm') as mock_safe_rm, \
patch('salt.utils.files.mkstemp') as mock_mkstemp, \
patch('os.path.isfile') as mock_isfile, \
patch('os.path.getsize') as mock_getsize:
mock_isfile.return_value = True
@ -971,8 +973,8 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
patch('jnpr.junos.utils.config.Config.commit_check') as mock_commit_check, \
patch('jnpr.junos.utils.config.Config.diff') as mock_diff, \
patch('jnpr.junos.utils.config.Config.load') as mock_load, \
patch('salt.modules.junos.safe_rm') as mock_safe_rm, \
patch('salt.modules.junos.files.mkstemp') as mock_mkstemp, \
patch('salt.utils.safe_rm') as mock_safe_rm, \
patch('salt.utils.files.mkstemp') as mock_mkstemp, \
patch('os.path.isfile') as mock_isfile, \
patch('os.path.getsize') as mock_getsize:
mock_isfile.return_value = True
@ -1004,8 +1006,8 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
patch('jnpr.junos.utils.config.Config.commit_check') as mock_commit_check, \
patch('jnpr.junos.utils.config.Config.diff') as mock_diff, \
patch('jnpr.junos.utils.config.Config.load') as mock_load, \
patch('salt.modules.junos.safe_rm') as mock_safe_rm, \
patch('salt.modules.junos.files.mkstemp') as mock_mkstemp, \
patch('salt.utils.safe_rm') as mock_safe_rm, \
patch('salt.utils.files.mkstemp') as mock_mkstemp, \
patch('os.path.isfile') as mock_isfile, \
patch('os.path.getsize') as mock_getsize:
mock_isfile.return_value = True
@ -1033,8 +1035,8 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
def test_install_config_load_causes_exception(self):
with patch('jnpr.junos.utils.config.Config.diff') as mock_diff, \
patch('jnpr.junos.utils.config.Config.load') as mock_load, \
patch('salt.modules.junos.safe_rm') as mock_safe_rm, \
patch('salt.modules.junos.files.mkstemp') as mock_mkstemp, \
patch('salt.utils.safe_rm') as mock_safe_rm, \
patch('salt.utils.files.mkstemp') as mock_mkstemp, \
patch('os.path.isfile') as mock_isfile, \
patch('os.path.getsize') as mock_getsize:
mock_isfile.return_value = True
@ -1052,8 +1054,8 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
def test_install_config_no_diff(self):
with patch('jnpr.junos.utils.config.Config.diff') as mock_diff, \
patch('jnpr.junos.utils.config.Config.load') as mock_load, \
patch('salt.modules.junos.safe_rm') as mock_safe_rm, \
patch('salt.modules.junos.files.mkstemp') as mock_mkstemp, \
patch('salt.utils.safe_rm') as mock_safe_rm, \
patch('salt.utils.files.mkstemp') as mock_mkstemp, \
patch('os.path.isfile') as mock_isfile, \
patch('os.path.getsize') as mock_getsize:
mock_isfile.return_value = True
@ -1070,10 +1072,10 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
patch('jnpr.junos.utils.config.Config.commit_check') as mock_commit_check, \
patch('jnpr.junos.utils.config.Config.diff') as mock_diff, \
patch('jnpr.junos.utils.config.Config.load') as mock_load, \
patch('salt.modules.junos.safe_rm') as mock_safe_rm, \
patch('salt.modules.junos.files.mkstemp') as mock_mkstemp, \
patch('salt.utils.safe_rm') as mock_safe_rm, \
patch('salt.utils.files.mkstemp') as mock_mkstemp, \
patch('os.path.isfile') as mock_isfile, \
patch('salt.modules.junos.fopen') as mock_fopen, \
patch('salt.utils.fopen') as mock_fopen, \
patch('os.path.getsize') as mock_getsize:
mock_isfile.return_value = True
mock_getsize.return_value = 10
@ -1105,10 +1107,10 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
patch('jnpr.junos.utils.config.Config.commit_check') as mock_commit_check, \
patch('jnpr.junos.utils.config.Config.diff') as mock_diff, \
patch('jnpr.junos.utils.config.Config.load') as mock_load, \
patch('salt.modules.junos.safe_rm') as mock_safe_rm, \
patch('salt.modules.junos.files.mkstemp') as mock_mkstemp, \
patch('salt.utils.safe_rm') as mock_safe_rm, \
patch('salt.utils.files.mkstemp') as mock_mkstemp, \
patch('os.path.isfile') as mock_isfile, \
patch('salt.modules.junos.fopen') as mock_fopen, \
patch('salt.utils.fopen') as mock_fopen, \
patch('os.path.getsize') as mock_getsize:
mock_isfile.return_value = True
mock_getsize.return_value = 10
@ -1141,8 +1143,8 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
patch('jnpr.junos.utils.config.Config.commit_check') as mock_commit_check, \
patch('jnpr.junos.utils.config.Config.diff') as mock_diff, \
patch('jnpr.junos.utils.config.Config.load') as mock_load, \
patch('salt.modules.junos.safe_rm') as mock_safe_rm, \
patch('salt.modules.junos.files.mkstemp') as mock_mkstemp, \
patch('salt.utils.safe_rm') as mock_safe_rm, \
patch('salt.utils.files.mkstemp') as mock_mkstemp, \
patch('os.path.isfile') as mock_isfile, \
patch('os.path.getsize') as mock_getsize:
mock_isfile.return_value = True
@ -1174,8 +1176,8 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
with patch('jnpr.junos.utils.config.Config.commit_check') as mock_commit_check, \
patch('jnpr.junos.utils.config.Config.diff') as mock_diff, \
patch('jnpr.junos.utils.config.Config.load') as mock_load, \
patch('salt.modules.junos.safe_rm') as mock_safe_rm, \
patch('salt.modules.junos.files.mkstemp') as mock_mkstemp, \
patch('salt.utils.safe_rm') as mock_safe_rm, \
patch('salt.utils.files.mkstemp') as mock_mkstemp, \
patch('os.path.isfile') as mock_isfile, \
patch('os.path.getsize') as mock_getsize:
mock_isfile.return_value = True
@ -1193,8 +1195,8 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
with patch('jnpr.junos.utils.config.Config.commit_check') as mock_commit_check, \
patch('jnpr.junos.utils.config.Config.diff') as mock_diff, \
patch('jnpr.junos.utils.config.Config.load') as mock_load, \
patch('salt.modules.junos.safe_rm') as mock_safe_rm, \
patch('salt.modules.junos.files.mkstemp') as mock_mkstemp, \
patch('salt.utils.safe_rm') as mock_safe_rm, \
patch('salt.utils.files.mkstemp') as mock_mkstemp, \
patch('os.path.isfile') as mock_isfile, \
patch('os.path.getsize') as mock_getsize:
mock_isfile.return_value = True
@ -1213,8 +1215,8 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
patch('jnpr.junos.utils.config.Config.commit_check') as mock_commit_check, \
patch('jnpr.junos.utils.config.Config.diff') as mock_diff, \
patch('jnpr.junos.utils.config.Config.load') as mock_load, \
patch('salt.modules.junos.safe_rm') as mock_safe_rm, \
patch('salt.modules.junos.files.mkstemp') as mock_mkstemp, \
patch('salt.utils.safe_rm') as mock_safe_rm, \
patch('salt.utils.files.mkstemp') as mock_mkstemp, \
patch('os.path.isfile') as mock_isfile, \
patch('os.path.getsize') as mock_getsize:
mock_isfile.return_value = True
@ -1275,8 +1277,8 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
def test_install_os(self):
with patch('jnpr.junos.utils.sw.SW.install') as mock_install, \
patch('salt.modules.junos.safe_rm') as mock_safe_rm, \
patch('salt.modules.junos.files.mkstemp') as mock_mkstemp, \
patch('salt.utils.safe_rm') as mock_safe_rm, \
patch('salt.utils.files.mkstemp') as mock_mkstemp, \
patch('os.path.isfile') as mock_isfile, \
patch('os.path.getsize') as mock_getsize:
mock_getsize.return_value = 10
@ -1289,8 +1291,8 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
def test_install_os_with_reboot_arg(self):
with patch('jnpr.junos.utils.sw.SW.install') as mock_install, \
patch('jnpr.junos.utils.sw.SW.reboot') as mock_reboot, \
patch('salt.modules.junos.safe_rm') as mock_safe_rm, \
patch('salt.modules.junos.files.mkstemp') as mock_mkstemp, \
patch('salt.utils.safe_rm') as mock_safe_rm, \
patch('salt.utils.files.mkstemp') as mock_mkstemp, \
patch('os.path.isfile') as mock_isfile, \
patch('os.path.getsize') as mock_getsize:
mock_getsize.return_value = 10
@ -1306,8 +1308,8 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
def test_install_os_pyez_install_throws_exception(self):
with patch('jnpr.junos.utils.sw.SW.install') as mock_install, \
patch('salt.modules.junos.safe_rm') as mock_safe_rm, \
patch('salt.modules.junos.files.mkstemp') as mock_mkstemp, \
patch('salt.utils.safe_rm') as mock_safe_rm, \
patch('salt.utils.files.mkstemp') as mock_mkstemp, \
patch('os.path.isfile') as mock_isfile, \
patch('os.path.getsize') as mock_getsize:
mock_getsize.return_value = 10
@ -1321,8 +1323,8 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
def test_install_os_with_reboot_raises_exception(self):
with patch('jnpr.junos.utils.sw.SW.install') as mock_install, \
patch('jnpr.junos.utils.sw.SW.reboot') as mock_reboot, \
patch('salt.modules.junos.safe_rm') as mock_safe_rm, \
patch('salt.modules.junos.files.mkstemp') as mock_mkstemp, \
patch('salt.utils.safe_rm') as mock_safe_rm, \
patch('salt.utils.files.mkstemp') as mock_mkstemp, \
patch('os.path.isfile') as mock_isfile, \
patch('os.path.getsize') as mock_getsize:
mock_getsize.return_value = 10
@ -1490,7 +1492,7 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
mock_execute.return_value = etree.XML(
'<rpc-reply>text rpc reply</rpc-reply>')
m = mock_open()
with patch('salt.modules.junos.fopen', m, create=True):
with patch('salt.utils.fopen', m, create=True):
junos.rpc('get-chassis-inventory', '/path/to/file', format='text')
handle = m()
handle.write.assert_called_with('text rpc reply')
@ -1500,7 +1502,7 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
patch('salt.modules.junos.json.dumps') as mock_dumps:
mock_dumps.return_value = 'json rpc reply'
m = mock_open()
with patch('salt.modules.junos.fopen', m, create=True):
with patch('salt.utils.fopen', m, create=True):
junos.rpc('get-chassis-inventory', '/path/to/file', format='json')
handle = m()
handle.write.assert_called_with('json rpc reply')
@ -1511,7 +1513,7 @@ class Test_Junos_Module(TestCase, LoaderModuleMockMixin, XMLEqualityMixin):
patch('jnpr.junos.device.Device.execute') as mock_execute:
mock_tostring.return_value = 'xml rpc reply'
m = mock_open()
with patch('salt.modules.junos.fopen', m, create=True):
with patch('salt.utils.fopen', m, create=True):
junos.rpc('get-chassis-inventory', '/path/to/file')
handle = m()
handle.write.assert_called_with('xml rpc reply')