From d72567b15bc5efabfe5d4600606c5623200f3aec Mon Sep 17 00:00:00 2001
From: David Wilson <dw@botanicus.net>
Date: Mon, 21 Jan 2019 20:29:37 +0000
Subject: [PATCH] tests: make assert_equal work on newer Ansibles.

---
 tests/ansible/lib/action/assert_equal.py | 29 ++++++++++++++++--------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/tests/ansible/lib/action/assert_equal.py b/tests/ansible/lib/action/assert_equal.py
index b36e6e55..84ec7606 100644
--- a/tests/ansible/lib/action/assert_equal.py
+++ b/tests/ansible/lib/action/assert_equal.py
@@ -6,13 +6,23 @@
 
 __metaclass__ = type
 
+import inspect
 import unittest2
 
+import ansible.template
+
 from ansible.errors import AnsibleError
 from ansible.plugins.action import ActionBase
 from ansible.module_utils.six import string_types
 
 
+TEMPLATE_KWARGS = {}
+
+_argspec = inspect.getargspec(ansible.template.Templar.template)
+if 'bare_deprecated' in _argspec.args:
+    TEMPLATE_KWARGS['bare_deprecated'] = False
+
+
 class TestCase(unittest2.TestCase):
     def runTest(self):
         pass
@@ -34,19 +44,18 @@ class ActionModule(ActionBase):
     TRANSFERS_FILES = False
     _VALID_ARGS = frozenset(('left', 'right'))
 
-    def run(self, tmp=None, task_vars=None):
-        result = super(ActionModule, self).run(tmp, task_vars or {})
-
-        left = self._templar.template(
-            self._task.args['left'],
-            convert_bare=True,
-            bare_deprecated=False,
-        )
-        right = self._templar.template(self._task.args['right'],
+    def template(self, obj):
+        return self._templar.template(
+            obj,
             convert_bare=True,
-            bare_deprecated=False,
+            **TEMPLATE_KWARGS
         )
 
+    def run(self, tmp=None, task_vars=None):
+        result = super(ActionModule, self).run(tmp, task_vars or {})
+        left = self.template(self._task.args['left'])
+        right = self.template(self._task.args['right'])
+
         diff = text_diff(left, right)
         if diff is None:
             return {