valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update timezone module tests to reflect changes in mock_open

Browse Source
This commit is contained in:
Erik Johnson 2018-06-17 23:55:48 -05:00
parent fc0aa9934f
commit ed40371a06
No known key found for this signature in database
GPG Key ID: 5E5583C437808F3F
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/unit/modules/test_timezone.py
View File

@ -203,13 +203,11 @@ class TimezoneModuleTestCase(TestCase, LoaderModuleMockMixin):
:return: :return:
''' '''
with patch.dict(timezone.__grains__, {'os_family': ['Gentoo']}): with patch.dict(timezone.__grains__, {'os_family': ['Gentoo']}):
_fopen = mock_open() with patch('salt.utils.files.fopen', mock_open()) as m_open:
with patch('salt.utils.files.fopen', _fopen):
assert timezone.set_zone(self.TEST_TZ) assert timezone.set_zone(self.TEST_TZ)
name, args, kwargs = _fopen.mock_calls[0] fh_ = m_open.filehandles['/etc/timezone'][0]
assert args == ('/etc/timezone', 'w') assert fh_.call_args == ('/etc/timezone', 'w'), fh_.call_args
name, args, kwargs = _fopen.return_value.__enter__.return_value.write.mock_calls[0] assert fh_.write_calls == ['UTC', '\n'], fh_.write_calls
assert args == ('UTC',)
@skipIf(salt.utils.platform.is_windows(), 'os.symlink not available in Windows') @skipIf(salt.utils.platform.is_windows(), 'os.symlink not available in Windows')
@patch('salt.utils.path.which', MagicMock(return_value=False)) @patch('salt.utils.path.which', MagicMock(return_value=False))
@ -222,13 +220,11 @@ class TimezoneModuleTestCase(TestCase, LoaderModuleMockMixin):
:return: :return:
''' '''
with patch.dict(timezone.__grains__, {'os_family': ['Debian']}): with patch.dict(timezone.__grains__, {'os_family': ['Debian']}):
_fopen = mock_open() with patch('salt.utils.files.fopen', mock_open()) as m_open:
with patch('salt.utils.files.fopen', _fopen):
assert timezone.set_zone(self.TEST_TZ) assert timezone.set_zone(self.TEST_TZ)
name, args, kwargs = _fopen.mock_calls[0] fh_ = m_open.filehandles['/etc/timezone'][0]
assert args == ('/etc/timezone', 'w') assert fh_.call_args == ('/etc/timezone', 'w'), fh_.call_args
name, args, kwargs = _fopen.return_value.__enter__.return_value.write.mock_calls[0] assert fh_.write_calls == ['UTC', '\n'], fh_.write_calls
assert args == ('UTC',)
@skipIf(salt.utils.platform.is_windows(), 'os.symlink not available in Windows') @skipIf(salt.utils.platform.is_windows(), 'os.symlink not available in Windows')
@patch('salt.utils.path.which', MagicMock(return_value=True)) @patch('salt.utils.path.which', MagicMock(return_value=True))