diff --git a/tests/unit/plugins/callback/test_elastic.py b/tests/unit/plugins/callback/test_elastic.py index e90186789b..9cd68d0b15 100644 --- a/tests/unit/plugins/callback/test_elastic.py +++ b/tests/unit/plugins/callback/test_elastic.py @@ -7,14 +7,20 @@ __metaclass__ = type from ansible.playbook.task import Task from ansible.executor.task_result import TaskResult +from ansible.release import __version__ as ansible_release from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch, MagicMock, Mock from ansible_collections.community.general.plugins.callback.elastic import ElasticSource, TaskData from collections import OrderedDict import sys +import pytest ELASTIC_MINIMUM_PYTHON_VERSION = (3, 6) +if tuple(int(x) for x in ansible_release.split(".")[:2]) >= (2, 21): + # https://github.com/ansible/ansible/issues/86761 + pytest.skip("Temporarily skipping callback tests for ansible-core >= 2.21", allow_module_level=True) + class TestOpentelemetry(unittest.TestCase): @patch('ansible_collections.community.general.plugins.callback.elastic.socket') diff --git a/tests/unit/plugins/callback/test_loganalytics.py b/tests/unit/plugins/callback/test_loganalytics.py index 8cc5c941d7..04ad45a8b4 100644 --- a/tests/unit/plugins/callback/test_loganalytics.py +++ b/tests/unit/plugins/callback/test_loganalytics.py @@ -5,7 +5,9 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type +import pytest from ansible.executor.task_result import TaskResult +from ansible.release import __version__ as ansible_release from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch, Mock from ansible_collections.community.general.plugins.callback.loganalytics import AzureLogAnalyticsSource @@ -13,6 +15,10 @@ from ansible_collections.community.general.plugins.callback.loganalytics import from datetime import datetime import json +if tuple(int(x) for x in ansible_release.split(".")[:2]) >= (2, 21): + # https://github.com/ansible/ansible/issues/86761 + pytest.skip("Temporarily skipping callback tests for ansible-core >= 2.21", allow_module_level=True) + class TestAzureLogAnalytics(unittest.TestCase): @patch('ansible_collections.community.general.plugins.callback.loganalytics.socket') diff --git a/tests/unit/plugins/callback/test_opentelemetry.py b/tests/unit/plugins/callback/test_opentelemetry.py index 1da506c262..ee04989f68 100644 --- a/tests/unit/plugins/callback/test_opentelemetry.py +++ b/tests/unit/plugins/callback/test_opentelemetry.py @@ -8,14 +8,20 @@ __metaclass__ = type from ansible.playbook.task import Task from ansible.executor.task_result import TaskResult +from ansible.release import __version__ as ansible_release from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch, MagicMock, Mock from ansible_collections.community.general.plugins.callback.opentelemetry import OpenTelemetrySource, TaskData from collections import OrderedDict import sys +import pytest OPENTELEMETRY_MINIMUM_PYTHON_VERSION = (3, 7) +if tuple(int(x) for x in ansible_release.split(".")[:2]) >= (2, 21): + # https://github.com/ansible/ansible/issues/86761 + pytest.skip("Temporarily skipping callback tests for ansible-core >= 2.21", allow_module_level=True) + class TestOpentelemetry(unittest.TestCase): @patch('ansible_collections.community.general.plugins.callback.opentelemetry.socket') diff --git a/tests/unit/plugins/callback/test_splunk.py b/tests/unit/plugins/callback/test_splunk.py index 09c56930f7..63239b3d27 100644 --- a/tests/unit/plugins/callback/test_splunk.py +++ b/tests/unit/plugins/callback/test_splunk.py @@ -5,7 +5,9 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type +import pytest from ansible.executor.task_result import TaskResult +from ansible.release import __version__ as ansible_release from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch, Mock from ansible_collections.community.general.plugins.callback.splunk import SplunkHTTPCollectorSource @@ -13,6 +15,10 @@ from datetime import datetime import json +if tuple(int(x) for x in ansible_release.split(".")[:2]) >= (2, 21): + # https://github.com/ansible/ansible/issues/86761 + pytest.skip("Temporarily skipping callback tests for ansible-core >= 2.21", allow_module_level=True) + class TestSplunkClient(unittest.TestCase): @patch('ansible_collections.community.general.plugins.callback.splunk.socket')