use difflib

Author: simonLeary42

tests/integration/targets/callback/filter_plugins/helper.py

@@ -5,6 +5,8 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
+import difflib
+
 from ansible.module_utils.six import string_types
 
 
@@ -14,33 +16,16 @@ def callback_results_extractor(outputs_results):
         differences = []
         expected_output = result['test']['expected_output']
         stdout_lines = result['stdout_lines']
-        for i in range(max(len(expected_output), len(stdout_lines))):
-            line = "line_%s" % (i + 1)
-            test_line = stdout_lines[i] if i < len(stdout_lines) else None
-            expected_lines = expected_output[i] if i < len(expected_output) else None
-            if not isinstance(expected_lines, string_types) and expected_lines is not None:
-                if test_line not in expected_lines:
-                    differences.append({
-                        'line': {
-                            'expected_one_of': expected_lines,
-                            'got': test_line,
-                        }
-                    })
-            else:
-                if test_line != expected_lines:
-                    differences.append({
-                        'line': {
-                            'expected': expected_lines,
-                            'got': test_line,
-                        }
-                    })
         results.append({
             'name': result['test']['name'],
-            'output': {
-                'differences': differences,
-                'expected': expected_output,
-                'got': stdout_lines,
-            },
+            'diff': list(
+                difflib.unified_diff(
+                    expected_output,
+                    stdout_lines,
+                    fromfile="expected",
+                    tofile="found",
+                )
+            )
         })
     return results
 

tests/integration/targets/callback/tasks/main.yml

@@ -49,7 +49,7 @@
 
     - name: Assert test output equals expected output
       assert:
-        that: result.output.differences | length == 0
+        that: result.diff | length == 0
       loop: "{{ outputs.results | callback_results_extractor }}"
       loop_control:
         loop_var: result