diff --git a/tests/unit/plugins/callback/test_elastic.py b/tests/unit/plugins/callback/test_elastic.py index 23aab39b2d..ac32f8c06e 100644 --- a/tests/unit/plugins/callback/test_elastic.py +++ b/tests/unit/plugins/callback/test_elastic.py @@ -8,11 +8,17 @@ import unittest from collections import OrderedDict from unittest.mock import MagicMock, Mock, patch +import pytest from ansible.executor.task_result import TaskResult from ansible.playbook.task import Task +from ansible.release import __version__ as ansible_release from ansible_collections.community.general.plugins.callback.elastic import ElasticSource, TaskData +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 7637b53312..59388cb4f9 100644 --- a/tests/unit/plugins/callback/test_loganalytics.py +++ b/tests/unit/plugins/callback/test_loganalytics.py @@ -9,10 +9,16 @@ import unittest from datetime import datetime from unittest.mock import Mock, patch +import pytest from ansible.executor.task_result import TaskResult +from ansible.release import __version__ as ansible_release from ansible_collections.community.general.plugins.callback.loganalytics import AzureLogAnalyticsSource +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_loganalytics_ingestion.py b/tests/unit/plugins/callback/test_loganalytics_ingestion.py index da21b2207b..61ae36a426 100644 --- a/tests/unit/plugins/callback/test_loganalytics_ingestion.py +++ b/tests/unit/plugins/callback/test_loganalytics_ingestion.py @@ -10,12 +10,18 @@ import unittest import unittest.mock import urllib +import pytest from ansible.executor.task_result import TaskResult +from ansible.release import __version__ as ansible_release from ansible_collections.community.general.plugins.callback.loganalytics_ingestion import ( AzureLogAnalyticsIngestionSource, ) +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 TestAzureLogAnalyticsIngestion(unittest.TestCase): dce_url = "https://fake.dce_url.ansible.com" diff --git a/tests/unit/plugins/callback/test_opentelemetry.py b/tests/unit/plugins/callback/test_opentelemetry.py index 9fb566ef88..11dc2c5a7e 100644 --- a/tests/unit/plugins/callback/test_opentelemetry.py +++ b/tests/unit/plugins/callback/test_opentelemetry.py @@ -8,11 +8,17 @@ import unittest from collections import OrderedDict from unittest.mock import MagicMock, Mock, patch +import pytest from ansible.executor.task_result import TaskResult from ansible.playbook.task import Task +from ansible.release import __version__ as ansible_release from ansible_collections.community.general.plugins.callback.opentelemetry import OpenTelemetrySource, TaskData +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 e5d747dfee..b3db52478b 100644 --- a/tests/unit/plugins/callback/test_splunk.py +++ b/tests/unit/plugins/callback/test_splunk.py @@ -9,10 +9,16 @@ import unittest from datetime import datetime from unittest.mock import Mock, patch +import pytest from ansible.executor.task_result import TaskResult +from ansible.release import __version__ as ansible_release from ansible_collections.community.general.plugins.callback.splunk import SplunkHTTPCollectorSource +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")