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 tests... hopefully

Browse source
This commit is contained in:
twangboy 2015-09-29 15:28:23 -06:00
parent dc8c01ed07
commit 163c54505d
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tests/unit/modules/win_service_test.py
View file

@ -119,21 +119,16 @@ class WinServiceTestCase(TestCase):
'''
Test to restart the named service
'''
mock = MagicMock(side_effect=[True, True, False])
with patch.object(win_service, 'has_powershell', mock):
mock_true = MagicMock(return_value=True)
with patch.object(win_service, 'create_win_salt_restart_task',
mock_true = MagicMock(return_value=True)
with patch.object(win_service, 'create_win_salt_restart_task',
mock_true):
with patch.object(win_service, 'execute_salt_restart_task',
mock_true):
with patch.object(win_service, 'execute_salt_restart_task',
mock_true):
self.assertTrue(win_service.restart("salt-minion"))
self.assertTrue(win_service.restart("salt-minion"))
with patch.dict(win_service.__salt__, {'cmd.retcode': mock_true}):
self.assertFalse(win_service.restart("salt"))
with patch.object(win_service, 'stop', mock_true):
with patch.object(win_service, 'start', mock_true):
self.assertTrue(win_service.restart("salt"))
with patch.object(win_service, 'stop', mock_true):
with patch.object(win_service, 'start', mock_true):
self.assertTrue(win_service.restart("salt"))
def test_createwin_saltrestart_task(self):
'''