diff --git a/tests/unit/plugins/callback/test_elastic.py b/tests/unit/plugins/callback/test_elastic.py index 936fdd83b7..224cf27412 100644 --- a/tests/unit/plugins/callback/test_elastic.py +++ b/tests/unit/plugins/callback/test_elastic.py @@ -4,13 +4,14 @@ from __future__ import annotations +import sys +import unittest +from collections import OrderedDict +from unittest.mock import patch, MagicMock, Mock + from ansible.playbook.task import Task from ansible.executor.task_result import TaskResult -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 ELASTIC_MINIMUM_PYTHON_VERSION = (3, 6) diff --git a/tests/unit/plugins/callback/test_loganalytics.py b/tests/unit/plugins/callback/test_loganalytics.py index 570aed8d0f..e435b272ad 100644 --- a/tests/unit/plugins/callback/test_loganalytics.py +++ b/tests/unit/plugins/callback/test_loganalytics.py @@ -4,13 +4,13 @@ from __future__ import annotations -from ansible.executor.task_result import TaskResult -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 - -from datetime import datetime import json +import unittest +from datetime import datetime +from unittest.mock import patch, Mock + +from ansible.executor.task_result import TaskResult +from ansible_collections.community.general.plugins.callback.loganalytics import AzureLogAnalyticsSource class TestAzureLogAnalytics(unittest.TestCase): diff --git a/tests/unit/plugins/callback/test_opentelemetry.py b/tests/unit/plugins/callback/test_opentelemetry.py index dd6380d680..af4fc55660 100644 --- a/tests/unit/plugins/callback/test_opentelemetry.py +++ b/tests/unit/plugins/callback/test_opentelemetry.py @@ -4,13 +4,14 @@ from __future__ import annotations +import sys +import unittest +from collections import OrderedDict +from unittest.mock import patch, MagicMock, Mock + from ansible.playbook.task import Task from ansible.executor.task_result import TaskResult -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 OPENTELEMETRY_MINIMUM_PYTHON_VERSION = (3, 7) diff --git a/tests/unit/plugins/callback/test_splunk.py b/tests/unit/plugins/callback/test_splunk.py index 6eb8cd011d..719870fbcf 100644 --- a/tests/unit/plugins/callback/test_splunk.py +++ b/tests/unit/plugins/callback/test_splunk.py @@ -4,9 +4,9 @@ from __future__ import annotations +import unittest +from unittest.mock import patch, Mock from ansible.executor.task_result import TaskResult -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 from datetime import datetime diff --git a/tests/unit/plugins/connection/test_lxc.py b/tests/unit/plugins/connection/test_lxc.py index 3807594283..8bf2fb6780 100644 --- a/tests/unit/plugins/connection/test_lxc.py +++ b/tests/unit/plugins/connection/test_lxc.py @@ -9,11 +9,11 @@ import pytest import sys from io import StringIO +from unittest import mock from ansible.errors import AnsibleError from ansible.playbook.play_context import PlayContext from ansible.plugins.loader import connection_loader -from ansible_collections.community.internal_test_tools.tests.unit.compat import mock @pytest.fixture(autouse=True) diff --git a/tests/unit/plugins/connection/test_wsl.py b/tests/unit/plugins/connection/test_wsl.py index e59e35b21e..caad0ce440 100644 --- a/tests/unit/plugins/connection/test_wsl.py +++ b/tests/unit/plugins/connection/test_wsl.py @@ -15,7 +15,7 @@ from ansible.playbook.play_context import PlayContext from ansible.plugins.loader import connection_loader from io import StringIO from pathlib import Path -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch, MagicMock, mock_open +from unittest.mock import patch, MagicMock, mock_open paramiko = pytest.importorskip('paramiko') diff --git a/tests/unit/plugins/filter/test_crc32.py b/tests/unit/plugins/filter/test_crc32.py index d0cc3959e1..542be68c96 100644 --- a/tests/unit/plugins/filter/test_crc32.py +++ b/tests/unit/plugins/filter/test_crc32.py @@ -4,7 +4,8 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +import unittest + from ansible_collections.community.general.plugins.filter.crc32 import crc32s diff --git a/tests/unit/plugins/lookup/test_bitwarden.py b/tests/unit/plugins/lookup/test_bitwarden.py index 75c7cd3ca2..a038405418 100644 --- a/tests/unit/plugins/lookup/test_bitwarden.py +++ b/tests/unit/plugins/lookup/test_bitwarden.py @@ -5,8 +5,8 @@ from __future__ import annotations import re -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 +import unittest +from unittest.mock import patch from ansible.errors import AnsibleError from ansible.plugins.loader import lookup_loader diff --git a/tests/unit/plugins/lookup/test_bitwarden_secrets_manager.py b/tests/unit/plugins/lookup/test_bitwarden_secrets_manager.py index d5a04fbf50..9469223a6f 100644 --- a/tests/unit/plugins/lookup/test_bitwarden_secrets_manager.py +++ b/tests/unit/plugins/lookup/test_bitwarden_secrets_manager.py @@ -4,10 +4,9 @@ from __future__ import annotations - import json -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 +import unittest +from unittest.mock import patch from ansible.errors import AnsibleLookupError from ansible.plugins.loader import lookup_loader diff --git a/tests/unit/plugins/lookup/test_dependent.py b/tests/unit/plugins/lookup/test_dependent.py index 9ed9da8bbd..0934feb2c6 100644 --- a/tests/unit/plugins/lookup/test_dependent.py +++ b/tests/unit/plugins/lookup/test_dependent.py @@ -5,12 +5,12 @@ # Make coding more python3-ish from __future__ import annotations -from ansible.template import Templar - -from ansible_collections.community.internal_test_tools.tests.unit.compat.unittest import TestCase -from ansible_collections.community.internal_test_tools.tests.unit.utils.trust import make_trusted +from unittest import TestCase from ansible.plugins.loader import lookup_loader +from ansible.template import Templar + +from ansible_collections.community.internal_test_tools.tests.unit.utils.trust import make_trusted class TestLookupModule(TestCase): diff --git a/tests/unit/plugins/lookup/test_dsv.py b/tests/unit/plugins/lookup/test_dsv.py index 6f704be491..965f830720 100644 --- a/tests/unit/plugins/lookup/test_dsv.py +++ b/tests/unit/plugins/lookup/test_dsv.py @@ -5,12 +5,12 @@ # Make coding more python3-ish from __future__ import annotations - -from ansible_collections.community.internal_test_tools.tests.unit.compat.unittest import TestCase -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import ( +from unittest import TestCase +from unittest.mock import ( patch, MagicMock, ) + from ansible_collections.community.general.plugins.lookup import dsv from ansible.plugins.loader import lookup_loader diff --git a/tests/unit/plugins/lookup/test_etcd3.py b/tests/unit/plugins/lookup/test_etcd3.py index 2a065f9633..88910b2a34 100644 --- a/tests/unit/plugins/lookup/test_etcd3.py +++ b/tests/unit/plugins/lookup/test_etcd3.py @@ -5,9 +5,9 @@ from __future__ import annotations +import unittest +from unittest.mock import patch, MagicMock -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 from ansible_collections.community.general.plugins.lookup import etcd3 from ansible.plugins.loader import lookup_loader diff --git a/tests/unit/plugins/lookup/test_github_app_access_token.py b/tests/unit/plugins/lookup/test_github_app_access_token.py index 599efacf42..8516c30555 100644 --- a/tests/unit/plugins/lookup/test_github_app_access_token.py +++ b/tests/unit/plugins/lookup/test_github_app_access_token.py @@ -3,16 +3,17 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations -import json -import types -import sys -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import ( +import json +import sys +import types +import unittest +from unittest.mock import ( patch, MagicMock, mock_open, ) + from ansible.plugins.loader import lookup_loader ENCODE_RESULT = 'Foobar' diff --git a/tests/unit/plugins/lookup/test_lastpass.py b/tests/unit/plugins/lookup/test_lastpass.py index 5be71a11bc..8df4a8134c 100644 --- a/tests/unit/plugins/lookup/test_lastpass.py +++ b/tests/unit/plugins/lookup/test_lastpass.py @@ -5,10 +5,9 @@ # Make coding more python3-ish from __future__ import annotations +import unittest from argparse import ArgumentParser - -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 +from unittest.mock import patch from ansible.errors import AnsibleError from ansible.plugins.loader import lookup_loader diff --git a/tests/unit/plugins/lookup/test_merge_variables.py b/tests/unit/plugins/lookup/test_merge_variables.py index ea9940074f..ffa587642e 100644 --- a/tests/unit/plugins/lookup/test_merge_variables.py +++ b/tests/unit/plugins/lookup/test_merge_variables.py @@ -4,8 +4,9 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations -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 +import unittest +from unittest.mock import patch + from ansible_collections.community.internal_test_tools.tests.unit.mock.loader import DictDataLoader from ansible.plugins import AnsiblePlugin diff --git a/tests/unit/plugins/lookup/test_revbitspss.py b/tests/unit/plugins/lookup/test_revbitspss.py index 7b28904a6c..1d88ad147c 100644 --- a/tests/unit/plugins/lookup/test_revbitspss.py +++ b/tests/unit/plugins/lookup/test_revbitspss.py @@ -3,12 +3,12 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations - -from ansible_collections.community.internal_test_tools.tests.unit.compat.unittest import TestCase -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import ( +from unittest import TestCase +from unittest.mock import ( patch, MagicMock, ) + from ansible_collections.community.general.plugins.lookup import revbitspss from ansible.plugins.loader import lookup_loader diff --git a/tests/unit/plugins/lookup/test_tss.py b/tests/unit/plugins/lookup/test_tss.py index 9f244ac351..cf8273ef70 100644 --- a/tests/unit/plugins/lookup/test_tss.py +++ b/tests/unit/plugins/lookup/test_tss.py @@ -5,13 +5,13 @@ # Make coding more python3-ish from __future__ import annotations - -from ansible_collections.community.internal_test_tools.tests.unit.compat.unittest import TestCase -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import ( +from unittest import TestCase +from unittest.mock import ( patch, DEFAULT, MagicMock, ) + from ansible_collections.community.general.plugins.lookup import tss from ansible.plugins.loader import lookup_loader diff --git a/tests/unit/plugins/module_utils/cloud/test_backoff.py b/tests/unit/plugins/module_utils/cloud/test_backoff.py index 9afc0b2a95..5871071c39 100644 --- a/tests/unit/plugins/module_utils/cloud/test_backoff.py +++ b/tests/unit/plugins/module_utils/cloud/test_backoff.py @@ -5,8 +5,8 @@ from __future__ import annotations import random +import unittest -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest from ansible_collections.community.general.plugins.module_utils.cloud import _exponential_backoff, \ _full_jitter_backoff diff --git a/tests/unit/plugins/module_utils/cloud/test_scaleway.py b/tests/unit/plugins/module_utils/cloud/test_scaleway.py index 04e8f6e0be..b5f97f5b95 100644 --- a/tests/unit/plugins/module_utils/cloud/test_scaleway.py +++ b/tests/unit/plugins/module_utils/cloud/test_scaleway.py @@ -4,7 +4,8 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +import unittest + from ansible_collections.community.general.plugins.module_utils.scaleway import SecretVariables, argon2 diff --git a/tests/unit/plugins/module_utils/hwc/test_dict_comparison.py b/tests/unit/plugins/module_utils/hwc/test_dict_comparison.py index fa5ab542b4..784bcca29d 100644 --- a/tests/unit/plugins/module_utils/hwc/test_dict_comparison.py +++ b/tests/unit/plugins/module_utils/hwc/test_dict_comparison.py @@ -7,7 +7,8 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +import unittest + from ansible_collections.community.general.plugins.module_utils.hwc_utils import are_different_dicts diff --git a/tests/unit/plugins/module_utils/hwc/test_hwc_utils.py b/tests/unit/plugins/module_utils/hwc/test_hwc_utils.py index b1dd72c547..e9a6151e9d 100644 --- a/tests/unit/plugins/module_utils/hwc/test_hwc_utils.py +++ b/tests/unit/plugins/module_utils/hwc/test_hwc_utils.py @@ -5,8 +5,8 @@ from __future__ import annotations import sys +import unittest -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest from ansible_collections.community.general.plugins.module_utils.hwc_utils import (HwcModuleException, navigate_value) diff --git a/tests/unit/plugins/module_utils/net_tools/pritunl/test_api.py b/tests/unit/plugins/module_utils/net_tools/pritunl/test_api.py index 6b40edf4a8..491d07b86a 100644 --- a/tests/unit/plugins/module_utils/net_tools/pritunl/test_api.py +++ b/tests/unit/plugins/module_utils/net_tools/pritunl/test_api.py @@ -5,13 +5,14 @@ from __future__ import annotations import json +from unittest.mock import MagicMock import pytest + from ansible.module_utils.common.dict_transformations import dict_merge from ansible_collections.community.general.plugins.module_utils.net_tools.pritunl import ( api, ) -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import MagicMock # Pritunl Mocks diff --git a/tests/unit/plugins/module_utils/test_cmd_runner.py b/tests/unit/plugins/module_utils/test_cmd_runner.py index 477f41b222..8152d1e6b0 100644 --- a/tests/unit/plugins/module_utils/test_cmd_runner.py +++ b/tests/unit/plugins/module_utils/test_cmd_runner.py @@ -5,10 +5,10 @@ from __future__ import annotations from functools import partial +from unittest.mock import MagicMock, PropertyMock import pytest -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import MagicMock, PropertyMock from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt diff --git a/tests/unit/plugins/module_utils/test_deps.py b/tests/unit/plugins/module_utils/test_deps.py index 31dda11e01..e16e1a3f7d 100644 --- a/tests/unit/plugins/module_utils/test_deps.py +++ b/tests/unit/plugins/module_utils/test_deps.py @@ -5,7 +5,7 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import MagicMock +from unittest.mock import MagicMock import pytest diff --git a/tests/unit/plugins/module_utils/test_ocapi_utils.py b/tests/unit/plugins/module_utils/test_ocapi_utils.py index ffdae529f0..919af35f99 100644 --- a/tests/unit/plugins/module_utils/test_ocapi_utils.py +++ b/tests/unit/plugins/module_utils/test_ocapi_utils.py @@ -8,8 +8,8 @@ import os import re import shutil import tempfile +import unittest -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest from ansible_collections.community.general.plugins.module_utils.ocapi_utils import OcapiUtils diff --git a/tests/unit/plugins/module_utils/test_python_runner.py b/tests/unit/plugins/module_utils/test_python_runner.py index 4ac11bc784..760b3a42de 100644 --- a/tests/unit/plugins/module_utils/test_python_runner.py +++ b/tests/unit/plugins/module_utils/test_python_runner.py @@ -5,10 +5,10 @@ from __future__ import annotations import os +from unittest.mock import MagicMock, PropertyMock import pytest -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import MagicMock, PropertyMock from ansible_collections.community.general.plugins.module_utils.cmd_runner import cmd_runner_fmt from ansible_collections.community.general.plugins.module_utils.python_runner import PythonRunner diff --git a/tests/unit/plugins/module_utils/xenserver/conftest.py b/tests/unit/plugins/module_utils/xenserver/conftest.py index 92dfdee1ff..96c5ba47d6 100644 --- a/tests/unit/plugins/module_utils/xenserver/conftest.py +++ b/tests/unit/plugins/module_utils/xenserver/conftest.py @@ -10,10 +10,11 @@ import sys import importlib import os import json +from unittest.mock import MagicMock + import pytest from .FakeAnsibleModule import FakeAnsibleModule -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import MagicMock @pytest.fixture diff --git a/tests/unit/plugins/modules/gitlab.py b/tests/unit/plugins/modules/gitlab.py index e2c0b75844..2bd4cd46bc 100644 --- a/tests/unit/plugins/modules/gitlab.py +++ b/tests/unit/plugins/modules/gitlab.py @@ -6,12 +6,11 @@ from __future__ import annotations import sys +import unittest from httmock import response # noqa from httmock import urlmatch # noqa -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest - import gitlab diff --git a/tests/unit/plugins/modules/hpe_test_utils.py b/tests/unit/plugins/modules/hpe_test_utils.py index 47e719ba7d..fa54ee2988 100644 --- a/tests/unit/plugins/modules/hpe_test_utils.py +++ b/tests/unit/plugins/modules/hpe_test_utils.py @@ -9,7 +9,7 @@ import pytest import re import yaml -from mock import Mock, patch +from unittest.mock import Mock, patch from .oneview_module_loader import ONEVIEW_MODULE_UTILS_PATH from hpOneView.oneview_client import OneViewClient diff --git a/tests/unit/plugins/modules/interfaces_file/test_interfaces_file.py b/tests/unit/plugins/modules/interfaces_file/test_interfaces_file.py index 9204d0325e..d4c6707a2c 100644 --- a/tests/unit/plugins/modules/interfaces_file/test_interfaces_file.py +++ b/tests/unit/plugins/modules/interfaces_file/test_interfaces_file.py @@ -7,7 +7,6 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest from ansible_collections.community.general.plugins.modules import interfaces_file from shutil import copyfile, move import difflib @@ -18,6 +17,7 @@ import os import re import shutil import tempfile +import unittest class AnsibleFailJson(Exception): diff --git a/tests/unit/plugins/modules/oneview_conftest.py b/tests/unit/plugins/modules/oneview_conftest.py index 2febe0d8d8..c1d863108b 100644 --- a/tests/unit/plugins/modules/oneview_conftest.py +++ b/tests/unit/plugins/modules/oneview_conftest.py @@ -6,7 +6,7 @@ from __future__ import annotations import pytest -from mock import Mock, patch +from unittest.mock import Mock, patch from .oneview_module_loader import ONEVIEW_MODULE_UTILS_PATH from hpOneView.oneview_client import OneViewClient diff --git a/tests/unit/plugins/modules/oneview_module_loader.py b/tests/unit/plugins/modules/oneview_module_loader.py index c1f7968359..c46306ede4 100644 --- a/tests/unit/plugins/modules/oneview_module_loader.py +++ b/tests/unit/plugins/modules/oneview_module_loader.py @@ -5,7 +5,7 @@ from __future__ import annotations import sys -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import Mock +from unittest.mock import Mock # FIXME: These should be done inside of a fixture so that they're only mocked during # these unittests diff --git a/tests/unit/plugins/modules/test_alerta_customer.py b/tests/unit/plugins/modules/test_alerta_customer.py index dc9276bc46..abe649304c 100644 --- a/tests/unit/plugins/modules/test_alerta_customer.py +++ b/tests/unit/plugins/modules/test_alerta_customer.py @@ -5,8 +5,9 @@ from __future__ import annotations import json +from unittest.mock import patch + import pytest -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch from ansible_collections.community.general.plugins.modules import alerta_customer from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args diff --git a/tests/unit/plugins/modules/test_apk.py b/tests/unit/plugins/modules/test_apk.py index 45c445cd46..89bc166bb6 100644 --- a/tests/unit/plugins/modules/test_apk.py +++ b/tests/unit/plugins/modules/test_apk.py @@ -4,8 +4,8 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat import mock -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +from unittest import mock +import unittest from ansible_collections.community.general.plugins.modules import apk diff --git a/tests/unit/plugins/modules/test_archive.py b/tests/unit/plugins/modules/test_archive.py index 5d93501c43..e14d6e9af9 100644 --- a/tests/unit/plugins/modules/test_archive.py +++ b/tests/unit/plugins/modules/test_archive.py @@ -5,9 +5,9 @@ from __future__ import annotations import pytest +from unittest.mock import Mock, patch from ansible.module_utils.basic import AnsibleModule -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import Mock, patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ModuleTestCase, set_module_args from ansible_collections.community.general.plugins.modules.archive import get_archive, common_path diff --git a/tests/unit/plugins/modules/test_bitbucket_access_key.py b/tests/unit/plugins/modules/test_bitbucket_access_key.py index c9615bcafa..698c362d0c 100644 --- a/tests/unit/plugins/modules/test_bitbucket_access_key.py +++ b/tests/unit/plugins/modules/test_bitbucket_access_key.py @@ -4,10 +4,11 @@ from __future__ import annotations +import unittest +from unittest.mock import patch + from ansible_collections.community.general.plugins.module_utils.source_control.bitbucket import BitbucketHelper from ansible_collections.community.general.plugins.modules import bitbucket_access_key -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 from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleFailJson, AnsibleExitJson, ModuleTestCase, set_module_args diff --git a/tests/unit/plugins/modules/test_bitbucket_pipeline_key_pair.py b/tests/unit/plugins/modules/test_bitbucket_pipeline_key_pair.py index 52f9f59127..d03edcf25b 100644 --- a/tests/unit/plugins/modules/test_bitbucket_pipeline_key_pair.py +++ b/tests/unit/plugins/modules/test_bitbucket_pipeline_key_pair.py @@ -4,10 +4,11 @@ from __future__ import annotations +import unittest +from unittest.mock import patch + from ansible_collections.community.general.plugins.module_utils.source_control.bitbucket import BitbucketHelper from ansible_collections.community.general.plugins.modules import bitbucket_pipeline_key_pair -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 from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleFailJson, AnsibleExitJson, ModuleTestCase, set_module_args diff --git a/tests/unit/plugins/modules/test_bitbucket_pipeline_known_host.py b/tests/unit/plugins/modules/test_bitbucket_pipeline_known_host.py index c2e63cb525..973918c295 100644 --- a/tests/unit/plugins/modules/test_bitbucket_pipeline_known_host.py +++ b/tests/unit/plugins/modules/test_bitbucket_pipeline_known_host.py @@ -4,13 +4,14 @@ from __future__ import annotations +import unittest +from unittest.mock import patch + import pytest from ansible_collections.community.general.plugins.module_utils.source_control.bitbucket import BitbucketHelper from ansible_collections.community.general.plugins.modules import bitbucket_pipeline_known_host from ansible_collections.community.general.plugins.modules.bitbucket_pipeline_known_host import HAS_PARAMIKO -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 from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, ModuleTestCase, set_module_args diff --git a/tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py b/tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py index 55a0edf9d5..1a90dc5db4 100644 --- a/tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py +++ b/tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py @@ -4,10 +4,11 @@ from __future__ import annotations +import unittest +from unittest.mock import patch + from ansible_collections.community.general.plugins.module_utils.source_control.bitbucket import BitbucketHelper from ansible_collections.community.general.plugins.modules import bitbucket_pipeline_variable -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 from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleFailJson, AnsibleExitJson, ModuleTestCase, set_module_args diff --git a/tests/unit/plugins/modules/test_bootc_manage.py b/tests/unit/plugins/modules/test_bootc_manage.py index 4ecab03fa4..bd7240c2f9 100644 --- a/tests/unit/plugins/modules/test_bootc_manage.py +++ b/tests/unit/plugins/modules/test_bootc_manage.py @@ -4,7 +4,7 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch +from unittest.mock import patch from ansible_collections.community.general.plugins.modules import bootc_manage from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args diff --git a/tests/unit/plugins/modules/test_campfire.py b/tests/unit/plugins/modules/test_campfire.py index 0418a55db9..4a9e03e78b 100644 --- a/tests/unit/plugins/modules/test_campfire.py +++ b/tests/unit/plugins/modules/test_campfire.py @@ -5,7 +5,7 @@ from __future__ import annotations import pytest -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch +from unittest.mock import patch from ansible_collections.community.general.plugins.modules import campfire from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args diff --git a/tests/unit/plugins/modules/test_circonus_annotation.py b/tests/unit/plugins/modules/test_circonus_annotation.py index 8dc3840471..3cdaec8ac8 100644 --- a/tests/unit/plugins/modules/test_circonus_annotation.py +++ b/tests/unit/plugins/modules/test_circonus_annotation.py @@ -8,9 +8,9 @@ import io import json import re import uuid +from unittest.mock import patch from urllib3.response import HTTPResponse -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch from ansible.module_utils.common.text.converters import to_bytes from ansible_collections.community.general.plugins.modules import circonus_annotation from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args diff --git a/tests/unit/plugins/modules/test_datadog_downtime.py b/tests/unit/plugins/modules/test_datadog_downtime.py index 0cfb5a8b87..eb819bdcf8 100644 --- a/tests/unit/plugins/modules/test_datadog_downtime.py +++ b/tests/unit/plugins/modules/test_datadog_downtime.py @@ -6,7 +6,7 @@ from __future__ import annotations from ansible_collections.community.general.plugins.modules import datadog_downtime -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import MagicMock, patch +from unittest.mock import MagicMock, patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args ) diff --git a/tests/unit/plugins/modules/test_discord.py b/tests/unit/plugins/modules/test_discord.py index 77fd3eb16b..8f4deb6ee1 100644 --- a/tests/unit/plugins/modules/test_discord.py +++ b/tests/unit/plugins/modules/test_discord.py @@ -5,8 +5,10 @@ from __future__ import annotations import json +from unittest.mock import patch + import pytest -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch + from ansible_collections.community.general.plugins.modules import discord from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args diff --git a/tests/unit/plugins/modules/test_dnf_config_manager.py b/tests/unit/plugins/modules/test_dnf_config_manager.py index 44d9a3668c..ca97e68502 100644 --- a/tests/unit/plugins/modules/test_dnf_config_manager.py +++ b/tests/unit/plugins/modules/test_dnf_config_manager.py @@ -4,8 +4,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later from __future__ import annotations - -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch, call +from unittest.mock import patch, call from ansible_collections.community.general.plugins.modules import dnf_config_manager as dnf_config_manager_module from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, \ ModuleTestCase, set_module_args diff --git a/tests/unit/plugins/modules/test_dnsimple.py b/tests/unit/plugins/modules/test_dnsimple.py index a3fca6a3cb..c0f8a798b5 100644 --- a/tests/unit/plugins/modules/test_dnsimple.py +++ b/tests/unit/plugins/modules/test_dnsimple.py @@ -5,10 +5,9 @@ from __future__ import annotations - from ansible_collections.community.general.plugins.modules import dnsimple as dnsimple_module from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleFailJson, ModuleTestCase, set_module_args -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch +from unittest.mock import patch import pytest import sys diff --git a/tests/unit/plugins/modules/test_github_repo.py b/tests/unit/plugins/modules/test_github_repo.py index 0f0ede89a8..d74d486599 100644 --- a/tests/unit/plugins/modules/test_github_repo.py +++ b/tests/unit/plugins/modules/test_github_repo.py @@ -6,9 +6,9 @@ from __future__ import annotations import re import json +import unittest import pytest from httmock import with_httmock, urlmatch, response -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest from ansible_collections.community.general.plugins.modules import github_repo diff --git a/tests/unit/plugins/modules/test_homebrew.py b/tests/unit/plugins/modules/test_homebrew.py index 8619c1cb67..e96bf6bce1 100644 --- a/tests/unit/plugins/modules/test_homebrew.py +++ b/tests/unit/plugins/modules/test_homebrew.py @@ -4,8 +4,7 @@ from __future__ import annotations - -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +import unittest from ansible_collections.community.general.plugins.module_utils.homebrew import HomebrewValidate diff --git a/tests/unit/plugins/modules/test_icinga2_feature.py b/tests/unit/plugins/modules/test_icinga2_feature.py index 2e6c869d91..12ab2c8592 100644 --- a/tests/unit/plugins/modules/test_icinga2_feature.py +++ b/tests/unit/plugins/modules/test_icinga2_feature.py @@ -7,9 +7,9 @@ from __future__ import annotations +from unittest.mock import patch from ansible_collections.community.general.plugins.modules import icinga2_feature from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch from ansible.module_utils import basic diff --git a/tests/unit/plugins/modules/test_ipa_getkeytab.py b/tests/unit/plugins/modules/test_ipa_getkeytab.py index fbb91cee53..86f6e8cb35 100644 --- a/tests/unit/plugins/modules/test_ipa_getkeytab.py +++ b/tests/unit/plugins/modules/test_ipa_getkeytab.py @@ -5,7 +5,7 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import call, patch +from unittest.mock import call, patch from ansible_collections.community.general.plugins.modules import ipa_getkeytab from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, ModuleTestCase, set_module_args diff --git a/tests/unit/plugins/modules/test_ipa_otpconfig.py b/tests/unit/plugins/modules/test_ipa_otpconfig.py index c586ec574c..0f510aee28 100644 --- a/tests/unit/plugins/modules/test_ipa_otpconfig.py +++ b/tests/unit/plugins/modules/test_ipa_otpconfig.py @@ -5,10 +5,10 @@ from __future__ import annotations +import unittest from contextlib import contextmanager +from unittest.mock import call, patch -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import call, patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args from ansible_collections.community.general.plugins.modules import ipa_otpconfig diff --git a/tests/unit/plugins/modules/test_ipa_otptoken.py b/tests/unit/plugins/modules/test_ipa_otptoken.py index 72019c3abe..90a11258dc 100644 --- a/tests/unit/plugins/modules/test_ipa_otptoken.py +++ b/tests/unit/plugins/modules/test_ipa_otptoken.py @@ -5,10 +5,10 @@ from __future__ import annotations +import unittest from contextlib import contextmanager +from unittest.mock import call, patch -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import call, patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args from ansible_collections.community.general.plugins.modules import ipa_otptoken diff --git a/tests/unit/plugins/modules/test_ipa_pwpolicy.py b/tests/unit/plugins/modules/test_ipa_pwpolicy.py index 0c1fdb81cb..4b74938447 100644 --- a/tests/unit/plugins/modules/test_ipa_pwpolicy.py +++ b/tests/unit/plugins/modules/test_ipa_pwpolicy.py @@ -5,10 +5,10 @@ from __future__ import annotations +import unittest from contextlib import contextmanager +from unittest.mock import call, patch -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import call, patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args from ansible_collections.community.general.plugins.modules import ipa_pwpolicy diff --git a/tests/unit/plugins/modules/test_ipbase.py b/tests/unit/plugins/modules/test_ipbase.py index 48fb56e810..65eb249f67 100644 --- a/tests/unit/plugins/modules/test_ipbase.py +++ b/tests/unit/plugins/modules/test_ipbase.py @@ -7,8 +7,8 @@ from __future__ import annotations import json from ansible_collections.community.general.plugins.modules.ipbase_info import IpbaseInfo -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import Mock +import unittest +from unittest.mock import Mock IPBASE_DATA = { diff --git a/tests/unit/plugins/modules/test_java_keystore.py b/tests/unit/plugins/modules/test_java_keystore.py index 6117660443..c85f0967b7 100644 --- a/tests/unit/plugins/modules/test_java_keystore.py +++ b/tests/unit/plugins/modules/test_java_keystore.py @@ -8,10 +8,9 @@ from __future__ import annotations import os +from unittest.mock import patch, Mock from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ModuleTestCase, set_module_args -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import Mock from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.modules.java_keystore import JavaKeystore diff --git a/tests/unit/plugins/modules/test_jenkins_build.py b/tests/unit/plugins/modules/test_jenkins_build.py index 1ea3551f93..210f5b5f1e 100644 --- a/tests/unit/plugins/modules/test_jenkins_build.py +++ b/tests/unit/plugins/modules/test_jenkins_build.py @@ -4,8 +4,9 @@ from __future__ import annotations -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 +import unittest +from unittest.mock import patch + from ansible.module_utils import basic from ansible_collections.community.general.plugins.modules import jenkins_build from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( diff --git a/tests/unit/plugins/modules/test_jenkins_build_info.py b/tests/unit/plugins/modules/test_jenkins_build_info.py index 03674401d0..a43dfdec2b 100644 --- a/tests/unit/plugins/modules/test_jenkins_build_info.py +++ b/tests/unit/plugins/modules/test_jenkins_build_info.py @@ -4,8 +4,9 @@ from __future__ import annotations -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 +import unittest +from unittest.mock import patch + from ansible.module_utils import basic from ansible_collections.community.general.plugins.modules import jenkins_build_info from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( diff --git a/tests/unit/plugins/modules/test_jenkins_credential.py b/tests/unit/plugins/modules/test_jenkins_credential.py index bad6b67e0c..fe4e2f3919 100644 --- a/tests/unit/plugins/modules/test_jenkins_credential.py +++ b/tests/unit/plugins/modules/test_jenkins_credential.py @@ -6,7 +6,7 @@ from __future__ import annotations from ansible_collections.community.general.plugins.modules import jenkins_credential -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import ( +from unittest.mock import ( MagicMock, patch, mock_open, diff --git a/tests/unit/plugins/modules/test_jenkins_node.py b/tests/unit/plugins/modules/test_jenkins_node.py index 8e65328a72..88f9058050 100644 --- a/tests/unit/plugins/modules/test_jenkins_node.py +++ b/tests/unit/plugins/modules/test_jenkins_node.py @@ -6,11 +6,11 @@ from __future__ import annotations import jenkins +from unittest.mock import patch, call from xml.etree import ElementTree as et import pytest -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch, call from ansible_collections.community.general.plugins.modules import jenkins_node from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, diff --git a/tests/unit/plugins/modules/test_jenkins_plugin.py b/tests/unit/plugins/modules/test_jenkins_plugin.py index e451aa56d1..39c087bbdd 100644 --- a/tests/unit/plugins/modules/test_jenkins_plugin.py +++ b/tests/unit/plugins/modules/test_jenkins_plugin.py @@ -8,12 +8,12 @@ from io import BytesIO import json from collections import OrderedDict from collections.abc import Mapping - -from ansible_collections.community.general.plugins.modules.jenkins_plugin import JenkinsPlugin -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import ( +from unittest.mock import ( MagicMock, patch, ) + +from ansible_collections.community.general.plugins.modules.jenkins_plugin import JenkinsPlugin from ansible.module_utils.urls import basic_auth_header diff --git a/tests/unit/plugins/modules/test_keycloak_authentication.py b/tests/unit/plugins/modules/test_keycloak_authentication.py index 7402a2a029..f5906a8104 100644 --- a/tests/unit/plugins/modules/test_keycloak_authentication.py +++ b/tests/unit/plugins/modules/test_keycloak_authentication.py @@ -7,8 +7,8 @@ from __future__ import annotations from contextlib import contextmanager -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 +import unittest +from unittest.mock import patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, ModuleTestCase, set_module_args from ansible_collections.community.general.plugins.modules import keycloak_authentication diff --git a/tests/unit/plugins/modules/test_keycloak_authentication_required_actions.py b/tests/unit/plugins/modules/test_keycloak_authentication_required_actions.py index 8bdf666cb0..fb800e3147 100644 --- a/tests/unit/plugins/modules/test_keycloak_authentication_required_actions.py +++ b/tests/unit/plugins/modules/test_keycloak_authentication_required_actions.py @@ -5,10 +5,10 @@ from __future__ import annotations +import unittest from contextlib import contextmanager +from unittest.mock import patch -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 from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, ModuleTestCase, set_module_args from ansible_collections.community.general.plugins.modules import keycloak_authentication_required_actions diff --git a/tests/unit/plugins/modules/test_keycloak_client.py b/tests/unit/plugins/modules/test_keycloak_client.py index 480b7334fb..c66c6a6fdd 100644 --- a/tests/unit/plugins/modules/test_keycloak_client.py +++ b/tests/unit/plugins/modules/test_keycloak_client.py @@ -8,8 +8,8 @@ from __future__ import annotations from contextlib import contextmanager -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 +import unittest +from unittest.mock import patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, ModuleTestCase, set_module_args from ansible_collections.community.general.plugins.modules import keycloak_client diff --git a/tests/unit/plugins/modules/test_keycloak_client_rolemapping.py b/tests/unit/plugins/modules/test_keycloak_client_rolemapping.py index 71923c048a..4d5c7465b5 100644 --- a/tests/unit/plugins/modules/test_keycloak_client_rolemapping.py +++ b/tests/unit/plugins/modules/test_keycloak_client_rolemapping.py @@ -5,10 +5,10 @@ from __future__ import annotations +import unittest from contextlib import contextmanager +from unittest.mock import patch -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 from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, ModuleTestCase, set_module_args from ansible_collections.community.general.plugins.modules import keycloak_client_rolemapping diff --git a/tests/unit/plugins/modules/test_keycloak_clientscope.py b/tests/unit/plugins/modules/test_keycloak_clientscope.py index 041a0dbdc5..1a5c9e1cd5 100644 --- a/tests/unit/plugins/modules/test_keycloak_clientscope.py +++ b/tests/unit/plugins/modules/test_keycloak_clientscope.py @@ -5,11 +5,10 @@ from __future__ import annotations - +import unittest from contextlib import contextmanager +from unittest.mock import patch -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 from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, ModuleTestCase, set_module_args from ansible_collections.community.general.plugins.modules import keycloak_clientscope diff --git a/tests/unit/plugins/modules/test_keycloak_component.py b/tests/unit/plugins/modules/test_keycloak_component.py index 437064ea8c..2b247be146 100644 --- a/tests/unit/plugins/modules/test_keycloak_component.py +++ b/tests/unit/plugins/modules/test_keycloak_component.py @@ -5,14 +5,13 @@ from __future__ import annotations - +import unittest from contextlib import contextmanager from io import StringIO from itertools import count +from unittest.mock import patch from ansible_collections.community.general.plugins.modules import keycloak_realm_key -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 from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, ModuleTestCase, set_module_args from ansible_collections.community.general.plugins.modules import keycloak_component diff --git a/tests/unit/plugins/modules/test_keycloak_identity_provider.py b/tests/unit/plugins/modules/test_keycloak_identity_provider.py index 92316edfc0..9cf252a8c7 100644 --- a/tests/unit/plugins/modules/test_keycloak_identity_provider.py +++ b/tests/unit/plugins/modules/test_keycloak_identity_provider.py @@ -7,8 +7,8 @@ from __future__ import annotations from contextlib import contextmanager -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 +import unittest +from unittest.mock import patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, ModuleTestCase, set_module_args from ansible_collections.community.general.plugins.modules import keycloak_identity_provider diff --git a/tests/unit/plugins/modules/test_keycloak_realm.py b/tests/unit/plugins/modules/test_keycloak_realm.py index 2766e45552..0deef16365 100644 --- a/tests/unit/plugins/modules/test_keycloak_realm.py +++ b/tests/unit/plugins/modules/test_keycloak_realm.py @@ -5,10 +5,10 @@ from __future__ import annotations +import unittest from contextlib import contextmanager +from unittest.mock import patch -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 from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, ModuleTestCase, set_module_args from ansible_collections.community.general.plugins.modules import keycloak_realm diff --git a/tests/unit/plugins/modules/test_keycloak_realm_info.py b/tests/unit/plugins/modules/test_keycloak_realm_info.py index 358849e8db..eb76e74640 100644 --- a/tests/unit/plugins/modules/test_keycloak_realm_info.py +++ b/tests/unit/plugins/modules/test_keycloak_realm_info.py @@ -5,10 +5,10 @@ from __future__ import annotations +import unittest from contextlib import contextmanager +from unittest.mock import patch -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 from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, ModuleTestCase, set_module_args from ansible_collections.community.general.plugins.modules import keycloak_realm_info diff --git a/tests/unit/plugins/modules/test_keycloak_realm_keys.py b/tests/unit/plugins/modules/test_keycloak_realm_keys.py index 0fd2240d4e..d566b1b34d 100644 --- a/tests/unit/plugins/modules/test_keycloak_realm_keys.py +++ b/tests/unit/plugins/modules/test_keycloak_realm_keys.py @@ -5,10 +5,10 @@ from __future__ import annotations +import unittest from contextlib import contextmanager +from unittest.mock import patch -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 from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, ModuleTestCase, set_module_args from ansible_collections.community.general.plugins.modules import keycloak_realm_key diff --git a/tests/unit/plugins/modules/test_keycloak_realm_keys_metadata_info.py b/tests/unit/plugins/modules/test_keycloak_realm_keys_metadata_info.py index 1a15c20dbc..2db2ee2543 100644 --- a/tests/unit/plugins/modules/test_keycloak_realm_keys_metadata_info.py +++ b/tests/unit/plugins/modules/test_keycloak_realm_keys_metadata_info.py @@ -5,15 +5,14 @@ from __future__ import annotations - +import unittest from contextlib import contextmanager from io import StringIO from itertools import count +from unittest.mock import patch from ansible_collections.community.general.plugins.modules import \ keycloak_realm_keys_metadata_info -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 from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, ModuleTestCase, set_module_args) diff --git a/tests/unit/plugins/modules/test_keycloak_role.py b/tests/unit/plugins/modules/test_keycloak_role.py index 6d59dd3c6c..51f4283588 100644 --- a/tests/unit/plugins/modules/test_keycloak_role.py +++ b/tests/unit/plugins/modules/test_keycloak_role.py @@ -5,10 +5,10 @@ from __future__ import annotations +import unittest from contextlib import contextmanager +from unittest.mock import patch -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 from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, ModuleTestCase, set_module_args from ansible_collections.community.general.plugins.modules import keycloak_role diff --git a/tests/unit/plugins/modules/test_keycloak_user.py b/tests/unit/plugins/modules/test_keycloak_user.py index 447d8eb490..02b457d8f7 100644 --- a/tests/unit/plugins/modules/test_keycloak_user.py +++ b/tests/unit/plugins/modules/test_keycloak_user.py @@ -8,8 +8,8 @@ from __future__ import annotations from contextlib import contextmanager -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 +import unittest +from unittest.mock import patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, ModuleTestCase, set_module_args from ansible_collections.community.general.plugins.modules import keycloak_user diff --git a/tests/unit/plugins/modules/test_keycloak_user_federation.py b/tests/unit/plugins/modules/test_keycloak_user_federation.py index f8ba6733f7..1fd9da6f2c 100644 --- a/tests/unit/plugins/modules/test_keycloak_user_federation.py +++ b/tests/unit/plugins/modules/test_keycloak_user_federation.py @@ -5,10 +5,10 @@ from __future__ import annotations +import unittest from contextlib import contextmanager +from unittest.mock import patch -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 from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, ModuleTestCase, set_module_args from ansible_collections.community.general.plugins.modules import keycloak_user_federation diff --git a/tests/unit/plugins/modules/test_keycloak_userprofile.py b/tests/unit/plugins/modules/test_keycloak_userprofile.py index c29c1a8eae..9b6ac80310 100644 --- a/tests/unit/plugins/modules/test_keycloak_userprofile.py +++ b/tests/unit/plugins/modules/test_keycloak_userprofile.py @@ -5,10 +5,10 @@ from __future__ import annotations +import unittest from contextlib import contextmanager +from unittest.mock import patch -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 from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, ModuleTestCase, set_module_args from ansible_collections.community.general.plugins.modules import keycloak_userprofile diff --git a/tests/unit/plugins/modules/test_linode_v4.py b/tests/unit/plugins/modules/test_linode_v4.py index 33107f049d..2a7b13ba3c 100644 --- a/tests/unit/plugins/modules/test_linode_v4.py +++ b/tests/unit/plugins/modules/test_linode_v4.py @@ -6,6 +6,7 @@ from __future__ import annotations import json import os +from unittest import mock import pytest @@ -17,7 +18,6 @@ from linode_api4 import LinodeClient from ansible_collections.community.general.plugins.modules import linode_v4 from ansible_collections.community.general.plugins.module_utils.linode import get_user_agent from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import set_module_args -from ansible_collections.community.internal_test_tools.tests.unit.compat import mock from .linode_conftest import access_token, no_access_token_in_env, default_args, mock_linode # noqa: F401, pylint: disable=unused-import diff --git a/tests/unit/plugins/modules/test_lvg_rename.py b/tests/unit/plugins/modules/test_lvg_rename.py index 6d7498f27f..e6d4d6eda2 100644 --- a/tests/unit/plugins/modules/test_lvg_rename.py +++ b/tests/unit/plugins/modules/test_lvg_rename.py @@ -4,8 +4,8 @@ from __future__ import annotations +from unittest.mock import patch from ansible_collections.community.general.plugins.modules import lvg_rename -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleFailJson, AnsibleExitJson, ModuleTestCase, set_module_args) diff --git a/tests/unit/plugins/modules/test_lxca_cmms.py b/tests/unit/plugins/modules/test_lxca_cmms.py index ac6b618713..0dbf39c17f 100644 --- a/tests/unit/plugins/modules/test_lxca_cmms.py +++ b/tests/unit/plugins/modules/test_lxca_cmms.py @@ -5,9 +5,9 @@ from __future__ import annotations import json +from unittest import mock import pytest -from ansible_collections.community.internal_test_tools.tests.unit.compat import mock from ansible_collections.community.general.plugins.modules import lxca_cmms diff --git a/tests/unit/plugins/modules/test_lxca_nodes.py b/tests/unit/plugins/modules/test_lxca_nodes.py index 986d11c89a..4253886204 100644 --- a/tests/unit/plugins/modules/test_lxca_nodes.py +++ b/tests/unit/plugins/modules/test_lxca_nodes.py @@ -5,9 +5,9 @@ from __future__ import annotations import json +from unittest import mock import pytest -from ansible_collections.community.internal_test_tools.tests.unit.compat import mock from ansible_collections.community.general.plugins.modules import lxca_nodes diff --git a/tests/unit/plugins/modules/test_modprobe.py b/tests/unit/plugins/modules/test_modprobe.py index 99f7e81a80..337dbc3813 100644 --- a/tests/unit/plugins/modules/test_modprobe.py +++ b/tests/unit/plugins/modules/test_modprobe.py @@ -5,10 +5,8 @@ from __future__ import annotations import sys +from unittest.mock import patch, Mock, mock_open from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ModuleTestCase, set_module_args -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import Mock -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import mock_open from ansible_collections.community.general.plugins.modules.modprobe import Modprobe, build_module diff --git a/tests/unit/plugins/modules/test_monit.py b/tests/unit/plugins/modules/test_monit.py index 2965b88f7d..1c26983235 100644 --- a/tests/unit/plugins/modules/test_monit.py +++ b/tests/unit/plugins/modules/test_monit.py @@ -4,10 +4,11 @@ from __future__ import annotations -import mock +import unittest +from unittest import mock + import pytest -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest from ansible_collections.community.general.plugins.modules import monit from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson diff --git a/tests/unit/plugins/modules/test_nomad_token.py b/tests/unit/plugins/modules/test_nomad_token.py index 2fb353da7f..afe96bc88c 100644 --- a/tests/unit/plugins/modules/test_nomad_token.py +++ b/tests/unit/plugins/modules/test_nomad_token.py @@ -5,10 +5,10 @@ from __future__ import annotations +from unittest.mock import patch import nomad from ansible_collections.community.general.plugins.modules import nomad_token -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args diff --git a/tests/unit/plugins/modules/test_npm.py b/tests/unit/plugins/modules/test_npm.py index d8cc9152a1..2d763ec619 100644 --- a/tests/unit/plugins/modules/test_npm.py +++ b/tests/unit/plugins/modules/test_npm.py @@ -5,7 +5,8 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import call, patch +from unittest.mock import call, patch + from ansible_collections.community.general.plugins.modules import npm from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, ModuleTestCase, set_module_args diff --git a/tests/unit/plugins/modules/test_ocapi_command.py b/tests/unit/plugins/modules/test_ocapi_command.py index 4c5217f882..bbab1fc33c 100644 --- a/tests/unit/plugins/modules/test_ocapi_command.py +++ b/tests/unit/plugins/modules/test_ocapi_command.py @@ -7,10 +7,10 @@ from __future__ import annotations import os import shutil import tempfile +import unittest +from unittest.mock import patch from urllib.parse import urljoin -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest from ansible.module_utils import basic import ansible_collections.community.general.plugins.modules.ocapi_command as module from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson diff --git a/tests/unit/plugins/modules/test_ocapi_info.py b/tests/unit/plugins/modules/test_ocapi_info.py index 124f3bf42b..06f3dfc5ab 100644 --- a/tests/unit/plugins/modules/test_ocapi_info.py +++ b/tests/unit/plugins/modules/test_ocapi_info.py @@ -4,8 +4,9 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +import unittest +from unittest.mock import patch + from ansible.module_utils import basic import ansible_collections.community.general.plugins.modules.ocapi_info as module from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson diff --git a/tests/unit/plugins/modules/test_oneview_enclosure_info.py b/tests/unit/plugins/modules/test_oneview_enclosure_info.py index 72f7ee7e00..6cfa302325 100644 --- a/tests/unit/plugins/modules/test_oneview_enclosure_info.py +++ b/tests/unit/plugins/modules/test_oneview_enclosure_info.py @@ -6,7 +6,7 @@ from __future__ import annotations from .hpe_test_utils import FactsParamsTestCase -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +import unittest from ansible_collections.community.general.plugins.modules.oneview_enclosure_info import EnclosureInfoModule diff --git a/tests/unit/plugins/modules/test_oneview_ethernet_network.py b/tests/unit/plugins/modules/test_oneview_ethernet_network.py index 60fe0add21..a4ac106b2b 100644 --- a/tests/unit/plugins/modules/test_oneview_ethernet_network.py +++ b/tests/unit/plugins/modules/test_oneview_ethernet_network.py @@ -5,9 +5,11 @@ from __future__ import annotations +import unittest +from unittest import mock + import yaml -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest, mock from .oneview_module_loader import EthernetNetworkModule from .hpe_test_utils import OneViewBaseTestCase diff --git a/tests/unit/plugins/modules/test_oneview_ethernet_network_info.py b/tests/unit/plugins/modules/test_oneview_ethernet_network_info.py index b5ae551876..ca0553244e 100644 --- a/tests/unit/plugins/modules/test_oneview_ethernet_network_info.py +++ b/tests/unit/plugins/modules/test_oneview_ethernet_network_info.py @@ -4,7 +4,7 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +import unittest from .oneview_module_loader import EthernetNetworkInfoModule from .hpe_test_utils import FactsParamsTestCase diff --git a/tests/unit/plugins/modules/test_oneview_fc_network.py b/tests/unit/plugins/modules/test_oneview_fc_network.py index 6cbaf754ba..9a0d9cf05c 100644 --- a/tests/unit/plugins/modules/test_oneview_fc_network.py +++ b/tests/unit/plugins/modules/test_oneview_fc_network.py @@ -5,7 +5,7 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +import unittest from .oneview_module_loader import FcNetworkModule from .hpe_test_utils import OneViewBaseTestCase diff --git a/tests/unit/plugins/modules/test_oneview_fc_network_info.py b/tests/unit/plugins/modules/test_oneview_fc_network_info.py index 0d11853173..faecfdaa09 100644 --- a/tests/unit/plugins/modules/test_oneview_fc_network_info.py +++ b/tests/unit/plugins/modules/test_oneview_fc_network_info.py @@ -4,7 +4,7 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +import unittest from .oneview_module_loader import FcNetworkInfoModule from .hpe_test_utils import FactsParamsTestCase diff --git a/tests/unit/plugins/modules/test_oneview_fcoe_network.py b/tests/unit/plugins/modules/test_oneview_fcoe_network.py index c96aeb13a2..85df7ec12e 100644 --- a/tests/unit/plugins/modules/test_oneview_fcoe_network.py +++ b/tests/unit/plugins/modules/test_oneview_fcoe_network.py @@ -5,7 +5,7 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +import unittest from .oneview_module_loader import FcoeNetworkModule from .hpe_test_utils import OneViewBaseTestCase diff --git a/tests/unit/plugins/modules/test_oneview_fcoe_network_info.py b/tests/unit/plugins/modules/test_oneview_fcoe_network_info.py index a826199406..351f101385 100644 --- a/tests/unit/plugins/modules/test_oneview_fcoe_network_info.py +++ b/tests/unit/plugins/modules/test_oneview_fcoe_network_info.py @@ -4,7 +4,7 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +import unittest from .oneview_module_loader import FcoeNetworkInfoModule from .hpe_test_utils import FactsParamsTestCase diff --git a/tests/unit/plugins/modules/test_oneview_logical_interconnect_group.py b/tests/unit/plugins/modules/test_oneview_logical_interconnect_group.py index 98a6647e5f..08ffa17931 100644 --- a/tests/unit/plugins/modules/test_oneview_logical_interconnect_group.py +++ b/tests/unit/plugins/modules/test_oneview_logical_interconnect_group.py @@ -4,9 +4,10 @@ from __future__ import annotations +import unittest from copy import deepcopy +from unittest import mock -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest, mock from .hpe_test_utils import OneViewBaseTestCase from ansible_collections.community.general.plugins.modules.oneview_logical_interconnect_group import LogicalInterconnectGroupModule diff --git a/tests/unit/plugins/modules/test_oneview_logical_interconnect_group_info.py b/tests/unit/plugins/modules/test_oneview_logical_interconnect_group_info.py index 807f26bf73..1a1f655b21 100644 --- a/tests/unit/plugins/modules/test_oneview_logical_interconnect_group_info.py +++ b/tests/unit/plugins/modules/test_oneview_logical_interconnect_group_info.py @@ -4,7 +4,7 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +import unittest from .hpe_test_utils import FactsParamsTestCase from ansible_collections.community.general.plugins.modules.oneview_logical_interconnect_group_info import ( LogicalInterconnectGroupInfoModule diff --git a/tests/unit/plugins/modules/test_oneview_network_set.py b/tests/unit/plugins/modules/test_oneview_network_set.py index 231b8cf686..5607eb5426 100644 --- a/tests/unit/plugins/modules/test_oneview_network_set.py +++ b/tests/unit/plugins/modules/test_oneview_network_set.py @@ -4,7 +4,8 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest, mock +import unittest +from unittest import mock from .hpe_test_utils import OneViewBaseTestCase from .oneview_module_loader import NetworkSetModule diff --git a/tests/unit/plugins/modules/test_oneview_network_set_info.py b/tests/unit/plugins/modules/test_oneview_network_set_info.py index 73321457d3..89ce0f2320 100644 --- a/tests/unit/plugins/modules/test_oneview_network_set_info.py +++ b/tests/unit/plugins/modules/test_oneview_network_set_info.py @@ -4,7 +4,7 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +import unittest from .oneview_module_loader import NetworkSetInfoModule from .hpe_test_utils import FactsParamsTestCase diff --git a/tests/unit/plugins/modules/test_oneview_san_manager.py b/tests/unit/plugins/modules/test_oneview_san_manager.py index 63ce658b09..cf3ec44b96 100644 --- a/tests/unit/plugins/modules/test_oneview_san_manager.py +++ b/tests/unit/plugins/modules/test_oneview_san_manager.py @@ -4,10 +4,12 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest, mock +import unittest +from copy import deepcopy +from unittest import mock + from .oneview_module_loader import SanManagerModule from .hpe_test_utils import OneViewBaseTestCase -from copy import deepcopy FAKE_MSG_ERROR = 'Fake message error' diff --git a/tests/unit/plugins/modules/test_oneview_san_manager_info.py b/tests/unit/plugins/modules/test_oneview_san_manager_info.py index d01aa291a0..e3287d11ea 100644 --- a/tests/unit/plugins/modules/test_oneview_san_manager_info.py +++ b/tests/unit/plugins/modules/test_oneview_san_manager_info.py @@ -4,7 +4,7 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +import unittest from .oneview_module_loader import SanManagerInfoModule from .hpe_test_utils import FactsParamsTestCase diff --git a/tests/unit/plugins/modules/test_pacman.py b/tests/unit/plugins/modules/test_pacman.py index 16b30014ec..b1ca5e9cf5 100644 --- a/tests/unit/plugins/modules/test_pacman.py +++ b/tests/unit/plugins/modules/test_pacman.py @@ -4,8 +4,8 @@ from __future__ import annotations +from unittest import mock from ansible.module_utils import basic -from ansible_collections.community.internal_test_tools.tests.unit.compat import mock from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, diff --git a/tests/unit/plugins/modules/test_pagerduty.py b/tests/unit/plugins/modules/test_pagerduty.py index 8cccbe4d60..0fa8ed5c86 100644 --- a/tests/unit/plugins/modules/test_pagerduty.py +++ b/tests/unit/plugins/modules/test_pagerduty.py @@ -4,7 +4,7 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +import unittest from ansible_collections.community.general.plugins.modules import pagerduty import json diff --git a/tests/unit/plugins/modules/test_pagerduty_alert.py b/tests/unit/plugins/modules/test_pagerduty_alert.py index cc6f39d4a2..ff5cf75198 100644 --- a/tests/unit/plugins/modules/test_pagerduty_alert.py +++ b/tests/unit/plugins/modules/test_pagerduty_alert.py @@ -4,11 +4,13 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest -from ansible_collections.community.general.plugins.modules import pagerduty_alert import json +import unittest +from unittest.mock import patch + import pytest -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch + +from ansible_collections.community.general.plugins.modules import pagerduty_alert from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args diff --git a/tests/unit/plugins/modules/test_pagerduty_change.py b/tests/unit/plugins/modules/test_pagerduty_change.py index 4a793afa07..9cab573f61 100644 --- a/tests/unit/plugins/modules/test_pagerduty_change.py +++ b/tests/unit/plugins/modules/test_pagerduty_change.py @@ -5,8 +5,10 @@ from __future__ import annotations import json +from unittest.mock import patch + import pytest -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch + from ansible_collections.community.general.plugins.modules import pagerduty_change from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args diff --git a/tests/unit/plugins/modules/test_pamd.py b/tests/unit/plugins/modules/test_pamd.py index 7c4cf0aebf..18a56b6854 100644 --- a/tests/unit/plugins/modules/test_pamd.py +++ b/tests/unit/plugins/modules/test_pamd.py @@ -4,7 +4,7 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +import unittest from ansible_collections.community.general.plugins.modules.pamd import PamdRule from ansible_collections.community.general.plugins.modules.pamd import PamdLine diff --git a/tests/unit/plugins/modules/test_parted.py b/tests/unit/plugins/modules/test_parted.py index f43c09f15d..4e71a8d845 100644 --- a/tests/unit/plugins/modules/test_parted.py +++ b/tests/unit/plugins/modules/test_parted.py @@ -4,7 +4,8 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch, call +from unittest.mock import patch, call + from ansible_collections.community.general.plugins.modules import parted as parted_module from ansible_collections.community.general.plugins.modules.parted import parse_parted_version from ansible_collections.community.general.plugins.modules.parted import parse_partition_info diff --git a/tests/unit/plugins/modules/test_pkgin.py b/tests/unit/plugins/modules/test_pkgin.py index 3e99708b0d..6de9a2e4b6 100644 --- a/tests/unit/plugins/modules/test_pkgin.py +++ b/tests/unit/plugins/modules/test_pkgin.py @@ -4,8 +4,8 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat import mock -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +import unittest +from unittest import mock from ansible_collections.community.general.plugins.modules import pkgin diff --git a/tests/unit/plugins/modules/test_pmem.py b/tests/unit/plugins/modules/test_pmem.py index 9a9a2782d3..64c193fc22 100644 --- a/tests/unit/plugins/modules/test_pmem.py +++ b/tests/unit/plugins/modules/test_pmem.py @@ -6,11 +6,11 @@ from __future__ import annotations import pytest import json +from unittest.mock import patch pytest.importorskip('xmltodict') from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ModuleTestCase, set_module_args, AnsibleFailJson, AnsibleExitJson -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch from ansible_collections.community.general.plugins.modules import pmem as pmem_module diff --git a/tests/unit/plugins/modules/test_pritunl_org.py b/tests/unit/plugins/modules/test_pritunl_org.py index ed3618d147..b5b3884532 100644 --- a/tests/unit/plugins/modules/test_pritunl_org.py +++ b/tests/unit/plugins/modules/test_pritunl_org.py @@ -5,12 +5,12 @@ from __future__ import annotations import sys +from unittest.mock import patch from ansible.module_utils.common.dict_transformations import dict_merge from ansible_collections.community.general.plugins.modules import ( pritunl_org, ) -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch from ansible_collections.community.general.tests.unit.plugins.module_utils.net_tools.pritunl.test_api import ( PritunlDeleteOrganizationMock, PritunlListOrganizationMock, diff --git a/tests/unit/plugins/modules/test_pritunl_org_info.py b/tests/unit/plugins/modules/test_pritunl_org_info.py index d1bd444ab4..bc809903e2 100644 --- a/tests/unit/plugins/modules/test_pritunl_org_info.py +++ b/tests/unit/plugins/modules/test_pritunl_org_info.py @@ -5,11 +5,11 @@ from __future__ import annotations import sys +from unittest.mock import patch from ansible_collections.community.general.plugins.modules import ( pritunl_org_info, ) -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch from ansible_collections.community.general.tests.unit.plugins.module_utils.net_tools.pritunl.test_api import ( PritunlListOrganizationMock, PritunlEmptyOrganizationMock, diff --git a/tests/unit/plugins/modules/test_pritunl_user.py b/tests/unit/plugins/modules/test_pritunl_user.py index 1c3c428cba..b11a234824 100644 --- a/tests/unit/plugins/modules/test_pritunl_user.py +++ b/tests/unit/plugins/modules/test_pritunl_user.py @@ -5,12 +5,12 @@ from __future__ import annotations import sys +from unittest.mock import patch from ansible.module_utils.common.dict_transformations import dict_merge from ansible_collections.community.general.plugins.modules import ( pritunl_user, ) -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch from ansible_collections.community.general.tests.unit.plugins.module_utils.net_tools.pritunl.test_api import ( PritunlDeleteUserMock, PritunlListOrganizationMock, diff --git a/tests/unit/plugins/modules/test_pritunl_user_info.py b/tests/unit/plugins/modules/test_pritunl_user_info.py index badf0dc23c..6b1865874c 100644 --- a/tests/unit/plugins/modules/test_pritunl_user_info.py +++ b/tests/unit/plugins/modules/test_pritunl_user_info.py @@ -5,11 +5,11 @@ from __future__ import annotations import sys +from unittest.mock import patch from ansible_collections.community.general.plugins.modules import ( pritunl_user_info, ) -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch from ansible_collections.community.general.tests.unit.plugins.module_utils.net_tools.pritunl.test_api import ( PritunlListOrganizationMock, PritunlListUserMock, diff --git a/tests/unit/plugins/modules/test_redis_info.py b/tests/unit/plugins/modules/test_redis_info.py index 5fbadc6617..ba6b0bb930 100644 --- a/tests/unit/plugins/modules/test_redis_info.py +++ b/tests/unit/plugins/modules/test_redis_info.py @@ -5,7 +5,7 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch, MagicMock +from unittest.mock import patch, MagicMock from ansible_collections.community.general.plugins.modules import redis_info from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args diff --git a/tests/unit/plugins/modules/test_rhsm_release.py b/tests/unit/plugins/modules/test_rhsm_release.py index 5023c20d4b..5b4a54afa8 100644 --- a/tests/unit/plugins/modules/test_rhsm_release.py +++ b/tests/unit/plugins/modules/test_rhsm_release.py @@ -4,7 +4,7 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import call, patch +from unittest.mock import call, patch from ansible_collections.community.general.plugins.modules import rhsm_release from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args) diff --git a/tests/unit/plugins/modules/test_rpm_ostree_pkg.py b/tests/unit/plugins/modules/test_rpm_ostree_pkg.py index 068b83ae3b..6b7e3aaebf 100644 --- a/tests/unit/plugins/modules/test_rpm_ostree_pkg.py +++ b/tests/unit/plugins/modules/test_rpm_ostree_pkg.py @@ -5,7 +5,7 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import call, patch +from unittest.mock import call, patch from ansible_collections.community.general.plugins.modules import rpm_ostree_pkg from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args) diff --git a/tests/unit/plugins/modules/test_rundeck_acl_policy.py b/tests/unit/plugins/modules/test_rundeck_acl_policy.py index 2f2db41881..2597d97dc9 100644 --- a/tests/unit/plugins/modules/test_rundeck_acl_policy.py +++ b/tests/unit/plugins/modules/test_rundeck_acl_policy.py @@ -6,8 +6,9 @@ from __future__ import annotations import pytest +from unittest.mock import patch + from ansible_collections.community.general.plugins.modules import rundeck_acl_policy -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( set_module_args, AnsibleExitJson, diff --git a/tests/unit/plugins/modules/test_scaleway_compute_private_network.py b/tests/unit/plugins/modules/test_scaleway_compute_private_network.py index c19aeb2878..0f048ceec3 100644 --- a/tests/unit/plugins/modules/test_scaleway_compute_private_network.py +++ b/tests/unit/plugins/modules/test_scaleway_compute_private_network.py @@ -5,13 +5,13 @@ from __future__ import annotations import os import json -import pytest +from unittest.mock import patch +import pytest from ansible_collections.community.general.plugins.modules import scaleway_compute_private_network from ansible_collections.community.general.plugins.module_utils.scaleway import Scaleway, Response from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import set_module_args -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch def response_without_nics(): diff --git a/tests/unit/plugins/modules/test_scaleway_private_network.py b/tests/unit/plugins/modules/test_scaleway_private_network.py index 560e02eef2..0d8089c0cc 100644 --- a/tests/unit/plugins/modules/test_scaleway_private_network.py +++ b/tests/unit/plugins/modules/test_scaleway_private_network.py @@ -6,13 +6,13 @@ from __future__ import annotations import os import json -import pytest +from unittest.mock import patch +import pytest from ansible_collections.community.general.plugins.modules import scaleway_private_network from ansible_collections.community.general.plugins.module_utils.scaleway import Scaleway, Response from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import set_module_args -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch def response_with_zero_network(): diff --git a/tests/unit/plugins/modules/test_simpleinit_msb.py b/tests/unit/plugins/modules/test_simpleinit_msb.py index d8df5e6d4c..743f7c9e61 100644 --- a/tests/unit/plugins/modules/test_simpleinit_msb.py +++ b/tests/unit/plugins/modules/test_simpleinit_msb.py @@ -4,8 +4,8 @@ from __future__ import annotations +from unittest.mock import patch -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleFailJson, ModuleTestCase, set_module_args from ansible_collections.community.general.plugins.modules.simpleinit_msb import SimpleinitMSB, build_module diff --git a/tests/unit/plugins/modules/test_slack.py b/tests/unit/plugins/modules/test_slack.py index c5b2c5027d..fa1c9c5935 100644 --- a/tests/unit/plugins/modules/test_slack.py +++ b/tests/unit/plugins/modules/test_slack.py @@ -6,7 +6,7 @@ from __future__ import annotations import json import pytest -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import Mock, patch +from unittest.mock import Mock, patch from ansible_collections.community.general.plugins.modules import slack from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args diff --git a/tests/unit/plugins/modules/test_ss_3par_cpg.py b/tests/unit/plugins/modules/test_ss_3par_cpg.py index b24841a9c2..1510347fb1 100644 --- a/tests/unit/plugins/modules/test_ss_3par_cpg.py +++ b/tests/unit/plugins/modules/test_ss_3par_cpg.py @@ -4,8 +4,8 @@ from __future__ import annotations -import mock import sys +from unittest import mock sys.modules['hpe3par_sdk'] = mock.Mock() sys.modules['hpe3par_sdk.client'] = mock.Mock() sys.modules['hpe3parclient'] = mock.Mock() diff --git a/tests/unit/plugins/modules/test_statsd.py b/tests/unit/plugins/modules/test_statsd.py index c8cb123977..9365669174 100644 --- a/tests/unit/plugins/modules/test_statsd.py +++ b/tests/unit/plugins/modules/test_statsd.py @@ -4,8 +4,9 @@ from __future__ import annotations +from unittest.mock import patch, MagicMock + from ansible_collections.community.general.plugins.modules import statsd -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch, MagicMock from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args diff --git a/tests/unit/plugins/modules/test_sysupgrade.py b/tests/unit/plugins/modules/test_sysupgrade.py index 174f50ad4b..79e882f930 100644 --- a/tests/unit/plugins/modules/test_sysupgrade.py +++ b/tests/unit/plugins/modules/test_sysupgrade.py @@ -4,8 +4,8 @@ from __future__ import annotations +from unittest.mock import patch from ansible.module_utils import basic -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import set_module_args, AnsibleExitJson, AnsibleFailJson, ModuleTestCase from ansible_collections.community.general.plugins.modules import sysupgrade diff --git a/tests/unit/plugins/modules/test_ufw.py b/tests/unit/plugins/modules/test_ufw.py index 326439d091..9c796adb1a 100644 --- a/tests/unit/plugins/modules/test_ufw.py +++ b/tests/unit/plugins/modules/test_ufw.py @@ -3,8 +3,9 @@ from __future__ import annotations -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 +import unittest +from unittest.mock import patch + from ansible.module_utils import basic import ansible_collections.community.general.plugins.modules.ufw as module from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import ( diff --git a/tests/unit/plugins/modules/test_usb_facts.py b/tests/unit/plugins/modules/test_usb_facts.py index 88a76df0a1..bb44103e97 100644 --- a/tests/unit/plugins/modules/test_usb_facts.py +++ b/tests/unit/plugins/modules/test_usb_facts.py @@ -4,8 +4,8 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat import mock -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +import unittest +from unittest import mock from ansible.module_utils import basic from ansible_collections.community.general.plugins.modules import usb_facts from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, set_module_args, exit_json, fail_json diff --git a/tests/unit/plugins/modules/test_wdc_redfish_command.py b/tests/unit/plugins/modules/test_wdc_redfish_command.py index 2793c289df..02b9c1ca35 100644 --- a/tests/unit/plugins/modules/test_wdc_redfish_command.py +++ b/tests/unit/plugins/modules/test_wdc_redfish_command.py @@ -9,9 +9,9 @@ import uuid import tarfile import tempfile import os +import unittest +from unittest.mock import patch -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest from ansible.module_utils import basic import ansible_collections.community.general.plugins.modules.wdc_redfish_command as module from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson diff --git a/tests/unit/plugins/modules/test_wdc_redfish_info.py b/tests/unit/plugins/modules/test_wdc_redfish_info.py index 0d28d55a32..82cf9103b7 100644 --- a/tests/unit/plugins/modules/test_wdc_redfish_info.py +++ b/tests/unit/plugins/modules/test_wdc_redfish_info.py @@ -4,8 +4,9 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +import unittest +from unittest.mock import patch + from ansible.module_utils import basic import ansible_collections.community.general.plugins.modules.wdc_redfish_info as module from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson diff --git a/tests/unit/plugins/modules/test_xcc_redfish_command.py b/tests/unit/plugins/modules/test_xcc_redfish_command.py index 4afc7aa85d..83eb2a0110 100644 --- a/tests/unit/plugins/modules/test_xcc_redfish_command.py +++ b/tests/unit/plugins/modules/test_xcc_redfish_command.py @@ -4,8 +4,9 @@ from __future__ import annotations -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch -from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest +import unittest +from unittest.mock import patch + from ansible.module_utils import basic import ansible_collections.community.general.plugins.modules.xcc_redfish_command as module from ansible_collections.community.internal_test_tools.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson diff --git a/tests/unit/plugins/modules/utils.py b/tests/unit/plugins/modules/utils.py index 64810b561c..d0c2a1d245 100644 --- a/tests/unit/plugins/modules/utils.py +++ b/tests/unit/plugins/modules/utils.py @@ -6,9 +6,9 @@ from __future__ import annotations import contextlib as _contextlib import json +import unittest +from unittest.mock import patch -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 from ansible.module_utils import basic from ansible.module_utils.common.text.converters import to_bytes