Adjust to Data Tagging.

tests/integration/targets/callback_log_plays/runme.sh

@@ -17,5 +17,5 @@ ansible-playbook ping_log.yml -v "$@"
 # now force it to fail
 export ANSIBLE_LOG_FOLDER="logit.file"
 touch "${ANSIBLE_LOG_FOLDER}"
-ansible-playbook ping_log.yml -v "$@" 2>&1| grep 'Failure using method (v2_runner_on_ok) in callback plugin'
+ansible-playbook ping_log.yml -v "$@" 2>&1| grep -E "(Failure using method \(v2_runner_on_ok\) in callback plugin|Callback dispatch 'v2_runner_on_ok' failed for plugin)"
 [[ ! -f "${ANSIBLE_LOG_FOLDER}/localhost" ]]

tests/integration/targets/cmd_runner/action_plugins/_unsafe_assert.py

@@ -9,6 +9,12 @@ from ansible.errors import AnsibleError
 from ansible.playbook.conditional import Conditional
 from ansible.plugins.action import ActionBase
 
+try:
+    from ansible.utils.datatag import trust_value as _trust_value
+except ImportError:
+    def _trust_value(input):
+        return input
+
 
 class ActionModule(ActionBase):
     ''' Fail with custom message '''
@@ -36,12 +42,16 @@ class ActionModule(ActionBase):
 
         thats = self._task.args['that']
 
-        cond = Conditional(loader=self._loader)
         result['_ansible_verbose_always'] = True
 
         for that in thats:
-            cond.when = [str(self._make_safe(that))]
+            if hasattr(self._templar, 'evaluate_conditional'):
-            test_result = cond.evaluate_conditional(templar=self._templar, all_vars=task_vars)
+                trusted_that = _trust_value(that) if _trust_value else that
+                test_result = self._templar.evaluate_conditional(conditional=trusted_that)
+            else:
+                cond = Conditional(loader=self._loader)
+                cond.when = [str(self._make_safe(that))]
+                test_result = cond.evaluate_conditional(templar=self._templar, all_vars=task_vars)
             if not test_result:
                 result['failed'] = True
                 result['evaluated_to'] = test_result

tests/integration/targets/module_helper/tasks/mdepfail.yml

@@ -8,11 +8,15 @@
   ignore_errors: true
   register: result
 
+- name: Show results
+  debug:
+    var: result
+
 - name: assert failing dependency
   assert:
     that:
       - result is failed
       - '"Failed to import" in result.msg'
       - '"nopackagewiththisname" in result.msg'
-      - '"ModuleNotFoundError:" in result.exception or "ImportError:" in result.exception'
+      - '"ModuleNotFoundError:" in result.exception or "ImportError:" in result.exception or "(traceback unavailable)" in result.exception'
-      - '"nopackagewiththisname" in result.exception'
+      - '"nopackagewiththisname" in result.exception or "(traceback unavailable)" in result.exception'

tests/integration/targets/module_helper/tasks/msimpleda.yml

@@ -3,15 +3,19 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 - set_fact:
-    attr2_d:
+    attr2_depr_dict:
       msg: Attribute attr2 is deprecated
       version: 9.9.9
       collection_name: community.general
-    attr2_d_29:
+    # With Data Tagging, the deprecation dict looks a bit different:
+    attr2_depr_dict_dt:
       msg: Attribute attr2 is deprecated
       version: 9.9.9
-- set_fact:
+      plugin:
-    attr2_depr_dict: "{{ ((ansible_version.major, ansible_version.minor) < (2, 10))|ternary(attr2_d_29, attr2_d) }}"
+        requested_name: msimpleda
+        resolved_name: msimpleda
+        type: module
+      collection_name: null  # should be "community.general"; this will hopefully change back because this seriously sucks
 
 - name: test msimpleda 1
   msimpleda:
@@ -23,17 +27,21 @@
     that:
       - simple1.a == 1
       - simple1.attr1 == "abc"
-      - ("deprecations" not in simple1) or attr2_depr_dict not in simple1.deprecations
+      - ("deprecations" not in simple1) or (attr2_depr_dict not in simple1.deprecations and attr2_depr_dict_dt not in simple1.deprecations)
 
 - name: test msimpleda 2
   msimpleda:
     a: 2
   register: simple2
 
+- name: Show results
+  debug:
+    var: simple2
+
 - name: assert simple2
   assert:
     that:
       - simple2.a == 2
       - simple2.attr2 == "def"
       - '"deprecations" in simple2'
-      - attr2_depr_dict in simple2.deprecations
+      - attr2_depr_dict in simple2.deprecations or attr2_depr_dict_dt in simple2.deprecations