1 files changed, 40 insertions, 2 deletions
diff --git a/tests/unit/test_executor.py b/tests/unit/test_executor.py
index d18cf4448..31e3b74c5 100644
--- a/tests/unit/test_executor.py
+++ b/tests/unit/test_executor.py
@@ -838,8 +838,10 @@ class TestLineMapping(AnsibleZuulTestCase):
         )
 
 
-class TestExecutorFacts(AnsibleZuulTestCase):
+class ExecutorFactsMixin:
+    # These should be overridden in child classes.
     tenant_config_file = 'config/executor-facts/main.yaml'
+    ansible_major_minor = 'X.Y'
 
     def _get_file(self, build, path):
         p = os.path.join(build.jobdir.root, path)
@@ -861,12 +863,29 @@ class TestExecutorFacts(AnsibleZuulTestCase):
         date_time = \
             j[0]['plays'][0]['tasks'][0]['hosts']['localhost']['date_time']
         self.assertEqual(18, len(date_time))
+        build = self.getJobFromHistory('datetime-fact', result='SUCCESS')
+        with open(build.jobdir.job_output_file) as f:
+            output = f.read()
+            self.assertIn(f'Ansible version={self.ansible_major_minor}',
+                          output)
 
 
-class TestAnsibleCallbackConfigs(AnsibleZuulTestCase):
+class TestExecutorFacts5(AnsibleZuulTestCase, ExecutorFactsMixin):
+    tenant_config_file = 'config/executor-facts/main5.yaml'
+    ansible_major_minor = '2.12'
 
+
+class TestExecutorFacts6(AnsibleZuulTestCase, ExecutorFactsMixin):
+    tenant_config_file = 'config/executor-facts/main6.yaml'
+    ansible_major_minor = '2.13'
+
+
+class AnsibleCallbackConfigsMixin:
     config_file = 'zuul-executor-ansible-callback.conf'
+
+    # These should be overridden in child classes.
     tenant_config_file = 'config/ansible-callbacks/main.yaml'
+    ansible_major_minor = 'X.Y'
 
     def test_ansible_callback_config(self):
         self.executor_server.keep_jobdir = True
@@ -905,6 +924,25 @@ class TestAnsibleCallbackConfigs(AnsibleZuulTestCase):
             'common-config/playbooks/callback_plugins/',
             c['callback_test_callback']['file_name'])
         self.assertTrue(os.path.isfile(callback_result_file))
+        build = self.getJobFromHistory('callback-test', result='SUCCESS')
+        with open(build.jobdir.job_output_file) as f:
+            output = f.read()
+            self.assertIn(f'Ansible version={self.ansible_major_minor}',
+                          output)
+
+
+class TestAnsibleCallbackConfigs5(AnsibleZuulTestCase,
+                                  AnsibleCallbackConfigsMixin):
+    config_file = 'zuul-executor-ansible-callback.conf'
+    tenant_config_file = 'config/ansible-callbacks/main5.yaml'
+    ansible_major_minor = '2.12'
+
+
+class TestAnsibleCallbackConfigs6(AnsibleZuulTestCase,
+                                  AnsibleCallbackConfigsMixin):
+    config_file = 'zuul-executor-ansible-callback.conf'
+    tenant_config_file = 'config/ansible-callbacks/main6.yaml'
+    ansible_major_minor = '2.13'
 
 
 class TestExecutorEnvironment(AnsibleZuulTestCase):