Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

win_updates fix when win_updates is run with async (#41756) #41764

Merged
merged 1 commit into from Jun 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/win_updates-async-fix.yml
@@ -0,0 +1,2 @@
bugfixes:
- win_updates - Fixed issue where running win_updates on async fails without any error
2 changes: 1 addition & 1 deletion lib/ansible/plugins/action/win_updates.py
Expand Up @@ -213,7 +213,7 @@ def run(self, tmp=None, task_vars=None):
# so we just return the result as is
# https://github.com/ansible/ansible/issues/38232
failed = result.get('failed', False)
if "updates" not in result.keys() or failed:
if ("updates" not in result.keys() and self._task.async_val == 0) or failed:
result['failed'] = True
return result

Expand Down
37 changes: 37 additions & 0 deletions test/units/plugins/action/test_win_updates.py
Expand Up @@ -118,3 +118,40 @@ def mock_execute_module(self, **kwargs):
assert actual['become'] == e_b
assert actual['become_method'] == e_bmethod
assert actual['become_user'] == e_buser

def test_module_exec_async_result(self, monkeypatch):
return_val = {
"ansible_async_watchdog_pid": 7584,
"ansible_job_id": "545519115287.9620",
"changed": True,
"finished": 0,
"results_file": r"C:\.ansible_async\545519115287.9620",
"started": 1
}
mock_execute = MagicMock(return_value=return_val)
monkeypatch.setattr(ActionModule, '_execute_module', mock_execute)

task = MagicMock(Task)
task.args = {}
task.async_val = 10

connection = MagicMock()
connection.module_implementation_preferences = ('.ps1', '.exe', '')

play_context = MagicMock()
play_context.check_mode = False
play_context.become = True
play_context.become_method = 'runas'
play_context.become_user = 'SYSTEM'

plugin = ActionModule(task, connection, play_context, loader=None,
templar=None, shared_loader_obj=None)
actual = plugin.run(None, {})

assert actual.get('failed') is None
assert actual['ansible_async_watchdog_pid'] == 7584
assert actual['ansible_job_id'] == "545519115287.9620"
assert actual['changed'] is True
assert actual['finished'] == 0
assert actual['results_file'] == r"C:\.ansible_async\545519115287.9620"
assert actual['started'] == 1