ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-22 12:50:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fixing some small bugs related to integration tests (v2)

Browse source
This commit is contained in:
James Cammarata 2015-06-01 16:41:52 -05:00
commit 4bc7703db3
12 changed files with 81 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/ansible/plugins/strategies/__init__.py
View file

@ -73,24 +73,28 @@ class StrategyBase:
self._blocked_hosts = dict()
def run(self, iterator, connection_info, result=True):
# save the counts on failed/unreachable hosts, as the cleanup/handler
# methods will clear that information during their runs
num_failed = len(self._tqm._failed_hosts)
num_unreachable = len(self._tqm._unreachable_hosts)
# save the failed/unreachable hosts, as the run_handlers()
# method will clear that information during its execution
failed_hosts = self._tqm._failed_hosts.keys()
unreachable_hosts = self._tqm._unreachable_hosts.keys()
debug("running handlers")
result &= self.run_handlers(iterator, connection_info)
# now update with the hosts (if any) that failed or were
# unreachable during the handler execution phase
failed_hosts = set(failed_hosts).union(self._tqm._failed_hosts.keys())
unreachable_hosts = set(unreachable_hosts).union(self._tqm._unreachable_hosts.keys())
# send the stats callback
self._tqm.send_callback('v2_playbook_on_stats', self._tqm._stats)
if not result:
if num_unreachable > 0:
return 3
elif num_failed > 0:
return 2
else:
return 1
if len(unreachable_hosts) > 0:
return 3
elif len(failed_hosts) > 0:
return 2
elif not result:
return 1
else:
return 0
@ -145,7 +149,7 @@ class StrategyBase:
task_result = result[1]
host = task_result._host
task = task_result._task
if result[0] == 'host_task_failed':
if result[0] == 'host_task_failed' or 'failed' in task_result._result:
if not task.ignore_errors:
debug("marking %s as failed" % host.name)
iterator.mark_host_failed(host)

4
lib/ansible/plugins/strategies/linear.py
View file

@ -211,7 +211,7 @@ class StrategyModule(StrategyBase):
try:
included_files = IncludedFile.process_include_results(host_results, self._tqm, iterator=iterator, loader=self._loader)
except AnsibleError, e:
return 1
return False
if len(included_files) > 0:
noop_task = Task()
@ -252,7 +252,7 @@ class StrategyModule(StrategyBase):
except (IOError, EOFError), e:
debug("got IOError/EOFError in task loop: %s" % e)
# most likely an abort, return failed
return 1
return False
# run the base class run() method, which executes the cleanup function
# and runs any outstanding handlers which have been triggered