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

Backport #53311 to 2019.2.1

Browse Source
This commit is contained in:
twangboy 2019-07-26 10:55:03 -06:00
parent cc1cda1099
commit 16c704ed8f
No known key found for this signature in database
GPG Key ID: 93FF3BDEB278C9EB
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/win_service.py
View File

@ -14,6 +14,7 @@ import time
# Import Salt libs
import salt.utils.platform
import salt.utils.path
from salt.exceptions import CommandExecutionError
# Import 3rd party libs
@ -581,7 +582,8 @@ def create_win_salt_restart_task():
salt '*' service.create_win_salt_restart_task()
'''
cmd = 'cmd'
# Updated to use full name for Nessus agent
cmd = salt.utils.path.which('cmd')
args = '/c ping -n 3 127.0.0.1 && net stop salt-minion && net start ' \
'salt-minion'
return __salt__['task.create_task'](name='restart-salt-minion',

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

@ -18,6 +18,7 @@ from tests.support.mock import (
# Import Salt Libs
import salt.modules.win_service as win_service
import salt.utils.path
# Import 3rd Party Libs
try:
@ -209,9 +210,22 @@ class WinServiceTestCase(TestCase, LoaderModuleMockMixin):
Test to create a task in Windows task
scheduler to enable restarting the salt-minion
'''
mock_true = MagicMock(return_value=True)
with patch.dict(win_service.__salt__, {'task.create_task': mock_true}):
self.assertTrue(win_service.create_win_salt_restart_task())
cmd = salt.utils.path.which('cmd')
mock = MagicMock()
with patch.dict(win_service.__salt__, {'task.create_task': mock}):
win_service.create_win_salt_restart_task()
mock.assert_called_once_with(
action_type='Execute',
arguments='/c ping -n 3 127.0.0.1 && net stop salt-minion && '
'net start salt-minion',
cmd=cmd,
force=True,
name='restart-salt-minion',
start_date='1975-01-01',
start_time='01:00',
trigger_type='Once',
user_name='System'
)
def test_execute_salt_restart_task(self):
'''