From 0b8f3306c79ee4a580d3bfeed564ab31aab62d3a Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Fri, 2 May 2025 15:39:03 +0200 Subject: [PATCH] Use unittest.mock. (#881) --- changelogs/fragments/refactoring.yml | 1 + .../plugins/module_utils/acme/test_backend_cryptography.py | 6 +++--- .../plugins/module_utils/acme/test_backend_openssl_cli.py | 6 +++--- tests/unit/plugins/module_utils/acme/test_challenges.py | 7 ++++--- tests/unit/plugins/module_utils/acme/test_errors.py | 7 ++++--- tests/unit/plugins/module_utils/acme/test_io.py | 7 ++++--- tests/unit/plugins/module_utils/acme/test_orders.py | 7 ++++--- 7 files changed, 23 insertions(+), 18 deletions(-) diff --git a/changelogs/fragments/refactoring.yml b/changelogs/fragments/refactoring.yml index 95ff48ab..6db0ade2 100644 --- a/changelogs/fragments/refactoring.yml +++ b/changelogs/fragments/refactoring.yml @@ -1,4 +1,5 @@ minor_changes: - "Python code modernization: use f-strings instead of ``%`` and ``str.format()`` (https://github.com/ansible-collections/community.crypto/pull/875)." - "Python code modernization: update ``__future__`` imports, remove Python 2 specific boilerplates (https://github.com/ansible-collections/community.crypto/pull/876)." + - "Python code modernization: use ``unittest.mock`` instead of ``ansible_collections.community.internal_test_tools.tests.unit.compat.mock`` (https://github.com/ansible-collections/community.crypto/pull/881)." - "Python code modernization: remove Python 3 specific code (https://github.com/ansible-collections/community.crypto/pull/877)." diff --git a/tests/unit/plugins/module_utils/acme/test_backend_cryptography.py b/tests/unit/plugins/module_utils/acme/test_backend_cryptography.py index 4ad1a456..37c273fe 100644 --- a/tests/unit/plugins/module_utils/acme/test_backend_cryptography.py +++ b/tests/unit/plugins/module_utils/acme/test_backend_cryptography.py @@ -5,6 +5,9 @@ from __future__ import annotations import datetime +from unittest.mock import ( + MagicMock, +) import pytest from ansible_collections.community.crypto.plugins.module_utils.acme.backend_cryptography import ( @@ -18,9 +21,6 @@ from ansible_collections.community.crypto.plugins.module_utils.time import ( UTC, ensure_utc_timezone, ) -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import ( - MagicMock, -) from freezegun import freeze_time from ..test_time import TIMEZONES diff --git a/tests/unit/plugins/module_utils/acme/test_backend_openssl_cli.py b/tests/unit/plugins/module_utils/acme/test_backend_openssl_cli.py index 68b0337d..690a0a8e 100644 --- a/tests/unit/plugins/module_utils/acme/test_backend_openssl_cli.py +++ b/tests/unit/plugins/module_utils/acme/test_backend_openssl_cli.py @@ -5,6 +5,9 @@ from __future__ import annotations import datetime +from unittest.mock import ( + MagicMock, +) import pytest from ansible_collections.community.crypto.plugins.module_utils.acme.backend_openssl_cli import ( @@ -14,9 +17,6 @@ from ansible_collections.community.crypto.plugins.module_utils.time import ( UTC, ensure_utc_timezone, ) -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import ( - MagicMock, -) from freezegun import freeze_time from .backend_data import ( diff --git a/tests/unit/plugins/module_utils/acme/test_challenges.py b/tests/unit/plugins/module_utils/acme/test_challenges.py index 7a070775..6d1acd6e 100644 --- a/tests/unit/plugins/module_utils/acme/test_challenges.py +++ b/tests/unit/plugins/module_utils/acme/test_challenges.py @@ -4,6 +4,10 @@ from __future__ import annotations +from unittest.mock import ( + MagicMock, +) + import pytest from ansible_collections.community.crypto.plugins.module_utils.acme.challenges import ( Authorization, @@ -15,9 +19,6 @@ from ansible_collections.community.crypto.plugins.module_utils.acme.errors impor ACMEProtocolException, ModuleFailException, ) -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import ( - MagicMock, -) def test_combine_identifier(): diff --git a/tests/unit/plugins/module_utils/acme/test_errors.py b/tests/unit/plugins/module_utils/acme/test_errors.py index f7ada949..be496073 100644 --- a/tests/unit/plugins/module_utils/acme/test_errors.py +++ b/tests/unit/plugins/module_utils/acme/test_errors.py @@ -4,14 +4,15 @@ from __future__ import annotations +from unittest.mock import ( + MagicMock, +) + import pytest from ansible_collections.community.crypto.plugins.module_utils.acme.errors import ( ACMEProtocolException, format_error_problem, ) -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import ( - MagicMock, -) TEST_FORMAT_ERROR_PROBLEM = [ diff --git a/tests/unit/plugins/module_utils/acme/test_io.py b/tests/unit/plugins/module_utils/acme/test_io.py index c5e980c2..7cace31f 100644 --- a/tests/unit/plugins/module_utils/acme/test_io.py +++ b/tests/unit/plugins/module_utils/acme/test_io.py @@ -4,13 +4,14 @@ from __future__ import annotations +from unittest.mock import ( + MagicMock, +) + from ansible_collections.community.crypto.plugins.module_utils.acme.io import ( read_file, write_file, ) -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import ( - MagicMock, -) TEST_TEXT = r"""1234 diff --git a/tests/unit/plugins/module_utils/acme/test_orders.py b/tests/unit/plugins/module_utils/acme/test_orders.py index b780c745..8f6a72a7 100644 --- a/tests/unit/plugins/module_utils/acme/test_orders.py +++ b/tests/unit/plugins/module_utils/acme/test_orders.py @@ -4,14 +4,15 @@ from __future__ import annotations +from unittest.mock import ( + MagicMock, +) + import pytest from ansible_collections.community.crypto.plugins.module_utils.acme.errors import ( ACMEProtocolException, ) from ansible_collections.community.crypto.plugins.module_utils.acme.orders import Order -from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import ( - MagicMock, -) def test_order_from_json():