Skip to content
Snippets Groups Projects
Commit 39ba2257 authored by Thomas Woerner's avatar Thomas Woerner
Browse files

ansible_freeipa_module: Fix errors in batch mode

The error string returned by execute_ipa_commands in batch mode
additionally contains the whole parameter list for the command. This is
different to non batch mode execution and breaks tests that are checking
the returned error message.

A left over debug message also have been removed from the error
processing.
parent a1230cab
Branches
Tags
No related merge requests found
...@@ -1485,7 +1485,6 @@ class IPAAnsibleModule(AnsibleModule): ...@@ -1485,7 +1485,6 @@ class IPAAnsibleModule(AnsibleModule):
filter(lambda x: x[0] in keeponly, filter(lambda x: x[0] in keeponly,
_res.items()) _res.items())
) )
self.tm_warn("res: %s" % repr(res))
if "error" not in res or res["error"] is None: if "error" not in res or res["error"] is None:
if result_handler is not None: if result_handler is not None:
...@@ -1498,10 +1497,9 @@ class IPAAnsibleModule(AnsibleModule): ...@@ -1498,10 +1497,9 @@ class IPAAnsibleModule(AnsibleModule):
changed = True changed = True
else: else:
_errors.append( _errors.append(
"%s %s %s: %s" % "%s: %s: %s" %
(batch_args[ri]["method"], (batch_args[ri]["method"],
repr(batch_args[ri]["params"][0][0]), str(batch_args[ri]["params"][0][0]),
repr(batch_args[ri]["params"][1]),
res["error"])) res["error"]))
# clear batch command list (python2 compatible) # clear batch command list (python2 compatible)
del batch_args[:] del batch_args[:]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment