diff --git a/tests/unit/plugins/connection/test_docker.py b/tests/unit/plugins/connection/test_docker.py index 2090e468..e9a804af 100644 --- a/tests/unit/plugins/connection/test_docker.py +++ b/tests/unit/plugins/connection/test_docker.py @@ -4,15 +4,13 @@ from __future__ import annotations +import unittest 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, - unittest, -) class TestDockerConnectionClass(unittest.TestCase): diff --git a/tests/unit/plugins/inventory/test_docker_containers.py b/tests/unit/plugins/inventory/test_docker_containers.py index 2ed7f63f..ca96b81e 100644 --- a/tests/unit/plugins/inventory/test_docker_containers.py +++ b/tests/unit/plugins/inventory/test_docker_containers.py @@ -4,13 +4,12 @@ from __future__ import annotations +from unittest.mock import create_autospec + import pytest from ansible.inventory.data import InventoryData from ansible.parsing.dataloader import DataLoader from ansible.template import Templar -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import ( - create_autospec, -) from ansible_collections.community.internal_test_tools.tests.unit.utils.trust import ( make_trusted, ) diff --git a/tests/unit/plugins/module_utils/_api/api/test_client.py b/tests/unit/plugins/module_utils/_api/api/test_client.py index e5ee57df..20ce3cbe 100644 --- a/tests/unit/plugins/module_utils/_api/api/test_client.py +++ b/tests/unit/plugins/module_utils/_api/api/test_client.py @@ -22,6 +22,7 @@ import time import unittest from http.server import BaseHTTPRequestHandler from socketserver import ThreadingTCPServer +from unittest import mock import pytest import requests @@ -41,12 +42,6 @@ from ansible_collections.community.docker.tests.unit.plugins.module_utils._api.c from .. import fake_api -try: - from unittest import mock -except ImportError: - import mock - - DEFAULT_TIMEOUT_SECONDS = constants.DEFAULT_TIMEOUT_SECONDS diff --git a/tests/unit/plugins/module_utils/_api/test_auth.py b/tests/unit/plugins/module_utils/_api/test_auth.py index 217618c7..f2fbe4c2 100644 --- a/tests/unit/plugins/module_utils/_api/test_auth.py +++ b/tests/unit/plugins/module_utils/_api/test_auth.py @@ -16,6 +16,7 @@ import random import shutil import tempfile import unittest +from unittest import mock import pytest @@ -28,12 +29,6 @@ from ansible_collections.community.docker.plugins.module_utils._api.credentials. ) -try: - from unittest import mock -except ImportError: - import mock - - class RegressionTest(unittest.TestCase): def test_803_urlsafe_encode(self): auth_data = {"username": "root", "password": "GR?XGR?XGR?XGR?X"} diff --git a/tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py b/tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py index 355f8217..e2b71763 100644 --- a/tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py +++ b/tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py @@ -9,6 +9,7 @@ from __future__ import annotations import unittest +from ssl import OP_NO_SSLv2, OP_NO_SSLv3, OP_NO_TLSv1 import pytest @@ -24,13 +25,6 @@ except ImportError: else: HAS_MATCH_HOSTNAME = True # pylint: disable=invalid-name -try: - from ssl import OP_NO_SSLv2, OP_NO_SSLv3, OP_NO_TLSv1 -except ImportError: - OP_NO_SSLv2 = 0x1000000 - OP_NO_SSLv3 = 0x2000000 - OP_NO_TLSv1 = 0x4000000 - class SSLAdapterTest(unittest.TestCase): def test_only_uses_tls(self): diff --git a/tests/unit/plugins/module_utils/_api/utils/test_config.py b/tests/unit/plugins/module_utils/_api/utils/test_config.py index 324e81b9..93378402 100644 --- a/tests/unit/plugins/module_utils/_api/utils/test_config.py +++ b/tests/unit/plugins/module_utils/_api/utils/test_config.py @@ -14,18 +14,13 @@ import shutil import tempfile import typing as t import unittest +from unittest import mock from pytest import fixture, mark from ansible_collections.community.docker.plugins.module_utils._api.utils import config -try: - from unittest import mock -except ImportError: - import mock - - class FindConfigFileTest(unittest.TestCase): mkdir: t.Callable[[str], os.PathLike[str]]