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

Merge pull request #1 from twangboy/pull_46539

Browse source 
Fix unit test for win_ntp
This commit is contained in:
jfoboss 2018-04-11 10:01:53 +03:00 • committed by GitHub
commit 6890122e41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/win_ntp.py
View file

@ -48,7 +48,7 @@ def set_servers(*servers):
update_cmd = ['W32tm', '/config', '/update']
for cmd in server_cmd, reliable_cmd, update_cmd:
ret = __salt__['cmd.run'](cmd, python_shell=False)
__salt__['cmd.run'](cmd, python_shell=False)
if not sorted(list(servers)) == get_servers():
return False

16
tests/unit/modules/test_win_ntp.py
View file

@ -31,23 +31,25 @@ class WinNtpTestCase(TestCase, LoaderModuleMockMixin):
'''
Test if it set Windows to use a list of NTP servers
'''
# Windows Time (W32Time) service is not started
# Windows Time (W32Time) service fails to start
mock_service = MagicMock(return_value=False)
mock_cmd = MagicMock(return_value='Failure')
with patch.dict(win_ntp.__salt__, {'service.status': mock_service,
'service.start': mock_service,
'cmd.run': mock_cmd}):
'service.start': mock_service}):
self.assertFalse(win_ntp.set_servers('pool.ntp.org'))
# Windows Time service is running
# Fail to set NTP servers
mock_service = MagicMock(return_value=True)
mock_cmd = MagicMock(return_value='Failure')
mock_cmd = MagicMock(side_effect=['Failure', 'Failure', 'Failure', 'NtpServer: time.windows.com,0x8'])
with patch.dict(win_ntp.__salt__, {'service.status': mock_service,
'service.start': mock_service,
'cmd.run': mock_cmd}):
self.assertFalse(win_ntp.set_servers('pool.ntp.org'))
mock_cmd = MagicMock(return_value='command completed successfully')
# Windows Time service is running
# Successfully set NTP servers
mock_cmd = MagicMock(side_effect=['Success', 'Success', 'Success', 'NtpServer: pool.ntp.org'])
with patch.dict(win_ntp.__salt__, {'service.status': mock_service,
'service.start': mock_service,
'service.restart': mock_service,
'cmd.run': mock_cmd}):
self.assertTrue(win_ntp.set_servers('pool.ntp.org'))