Follow changes in ansible shell module

Now stdout/stderr lives in json encoded module_stdout key.

Author: philpep

test/test_backends.py

@@ -86,8 +86,9 @@ def test_encoding(host):
     elif host.backend.get_connection_type() == "ansible" and host.backend.force_ansible:
         # XXX: this encoding issue comes directly from ansible
         # not sure how to handle this...
-        assert cmd.stderr == (
-            "ls: impossible d'accéder à '/é': " "Aucun fichier ou dossier de ce type"
+        assert (
+            cmd.stderr
+            == "ls: impossible d'acc\udce9der \udce0 '/é': Aucun fichier ou dossier de ce type"
         )
     else:
         assert cmd.stderr_bytes == (

testinfra/backend/ansible.py

@@ -10,6 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import json
 import logging
 import pprint
 from typing import Any, Optional
@@ -56,12 +57,15 @@ def run(self, command: str, *args: str, **kwargs: Any) -> base.CommandResult:
             if host is not None:
                 return host.run(command)
         out = self.run_ansible("shell", module_args=command, check=False)
-        return self.result(
-            out["rc"],
-            self.encode(command),
-            out["stdout"],
-            out["stderr"],
-        )
+        if "module_stdout" in out:
+            data = json.loads(out["module_stdout"])
+            stdout = data["stdout"]
+            stderr = data["stderr"]
+        else:
+            # bw compat
+            stdout = out["stdout"]
+            stderr = out["stderr"]
+        return self.result(out["rc"], self.encode(command), stdout, stderr)
 
     def run_ansible(
         self, module_name: str, module_args: Optional[str] = None, **kwargs: Any