mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 00:55:19 +00:00
Update fibre_channel grains tests to reflect changes in mock_open
This commit is contained in:
parent
ed40371a06
commit
77e5288d42
@ -32,20 +32,14 @@ class FibreChannelGrainsTestCase(TestCase):
|
|||||||
cmd_run_mock = MagicMock(return_value=wwns)
|
cmd_run_mock = MagicMock(return_value=wwns)
|
||||||
with patch('salt.modules.cmdmod.powershell', cmd_run_mock):
|
with patch('salt.modules.cmdmod.powershell', cmd_run_mock):
|
||||||
ret = fibre_channel._windows_wwns()
|
ret = fibre_channel._windows_wwns()
|
||||||
self.assertEqual(ret, wwns)
|
assert ret == wwns, ret
|
||||||
|
|
||||||
def test_linux_fibre_channel_wwns_grains(self):
|
def test_linux_fibre_channel_wwns_grains(self):
|
||||||
|
|
||||||
def multi_mock_open(*file_contents):
|
contents = ['0x500143802426baf4', '0x500143802426baf5']
|
||||||
mock_files = [mock_open(read_data=content).return_value for content in file_contents]
|
|
||||||
mock_opener = mock_open()
|
|
||||||
mock_opener.side_effect = mock_files
|
|
||||||
|
|
||||||
return mock_opener
|
|
||||||
|
|
||||||
files = ['file1', 'file2']
|
files = ['file1', 'file2']
|
||||||
with patch('glob.glob', MagicMock(return_value=files)):
|
with patch('glob.glob', MagicMock(return_value=files)), \
|
||||||
with patch('salt.utils.files.fopen', multi_mock_open('0x500143802426baf4', '0x500143802426baf5')):
|
patch('salt.utils.files.fopen', mock_open(read_data=contents)):
|
||||||
ret = fibre_channel._linux_wwns()
|
ret = fibre_channel._linux_wwns()
|
||||||
|
|
||||||
self.assertEqual(ret, ['500143802426baf4', '500143802426baf5'])
|
assert ret == ['500143802426baf4', '500143802426baf5'], ret
|
||||||
|
Loading…
Reference in New Issue
Block a user