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 1efea750..d12936fe 100644 --- a/tests/unit/plugins/module_utils/acme/test_backend_cryptography.py +++ b/tests/unit/plugins/module_utils/acme/test_backend_cryptography.py @@ -10,6 +10,11 @@ __metaclass__ = type import datetime import pytest +from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import ( + MagicMock, +) +from freezegun import freeze_time + from ansible_collections.community.crypto.plugins.module_utils.acme.backend_cryptography import ( HAS_CURRENT_CRYPTOGRAPHY, CryptographyBackend, @@ -21,10 +26,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 from .backend_data import ( 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 67a9aae7..3a02ad40 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 @@ -10,6 +10,11 @@ __metaclass__ = type import datetime import pytest +from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import ( + MagicMock, +) +from freezegun import freeze_time + from ansible_collections.community.crypto.plugins.module_utils.acme.backend_openssl_cli import ( OpenSSLCLIBackend, ) @@ -17,10 +22,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 ( TEST_CERT, diff --git a/tests/unit/plugins/module_utils/acme/test_challenges.py b/tests/unit/plugins/module_utils/acme/test_challenges.py index 224e96a2..f0c46a6c 100644 --- a/tests/unit/plugins/module_utils/acme/test_challenges.py +++ b/tests/unit/plugins/module_utils/acme/test_challenges.py @@ -9,6 +9,10 @@ __metaclass__ = type import pytest +from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import ( + MagicMock, +) + from ansible_collections.community.crypto.plugins.module_utils.acme.challenges import ( Authorization, Challenge, @@ -19,9 +23,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 f54ebbfc..3a055004 100644 --- a/tests/unit/plugins/module_utils/acme/test_errors.py +++ b/tests/unit/plugins/module_utils/acme/test_errors.py @@ -9,13 +9,14 @@ __metaclass__ = type import pytest +from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import ( + MagicMock, +) + 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 46c8a317..4f2d399e 100644 --- a/tests/unit/plugins/module_utils/acme/test_io.py +++ b/tests/unit/plugins/module_utils/acme/test_io.py @@ -8,13 +8,14 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type +from ansible_collections.community.internal_test_tools.tests.unit.compat.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 733e7c92..4eb8d793 100644 --- a/tests/unit/plugins/module_utils/acme/test_orders.py +++ b/tests/unit/plugins/module_utils/acme/test_orders.py @@ -9,13 +9,14 @@ __metaclass__ = type import pytest +from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import ( + MagicMock, +) + 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(): diff --git a/tests/unit/plugins/module_utils/acme/test_utils.py b/tests/unit/plugins/module_utils/acme/test_utils.py index dc29bdbd..699f4036 100644 --- a/tests/unit/plugins/module_utils/acme/test_utils.py +++ b/tests/unit/plugins/module_utils/acme/test_utils.py @@ -11,6 +11,7 @@ __metaclass__ = type import datetime import pytest + from ansible_collections.community.crypto.plugins.module_utils.acme.backends import ( CertificateInformation, ) diff --git a/tests/unit/plugins/module_utils/crypto/test_asn1.py b/tests/unit/plugins/module_utils/crypto/test_asn1.py index 064c41b1..89f4253a 100644 --- a/tests/unit/plugins/module_utils/crypto/test_asn1.py +++ b/tests/unit/plugins/module_utils/crypto/test_asn1.py @@ -14,6 +14,7 @@ import re import subprocess import pytest + from ansible_collections.community.crypto.plugins.module_utils.crypto._asn1 import ( pack_asn1, serialize_asn1_string_as_der, diff --git a/tests/unit/plugins/module_utils/crypto/test_cryptography_support.py b/tests/unit/plugins/module_utils/crypto/test_cryptography_support.py index e33752b4..99f58019 100644 --- a/tests/unit/plugins/module_utils/crypto/test_cryptography_support.py +++ b/tests/unit/plugins/module_utils/crypto/test_cryptography_support.py @@ -13,6 +13,8 @@ import re import cryptography import pytest +from cryptography.x509 import NameAttribute, oid + from ansible_collections.community.crypto.plugins.module_utils.crypto.basic import ( OpenSSLObjectError, ) @@ -25,7 +27,6 @@ from ansible_collections.community.crypto.plugins.module_utils.crypto.cryptograp from ansible_collections.community.crypto.plugins.module_utils.version import ( LooseVersion, ) -from cryptography.x509 import NameAttribute, oid @pytest.mark.parametrize( diff --git a/tests/unit/plugins/module_utils/crypto/test_math.py b/tests/unit/plugins/module_utils/crypto/test_math.py index d5200c59..a5fba302 100644 --- a/tests/unit/plugins/module_utils/crypto/test_math.py +++ b/tests/unit/plugins/module_utils/crypto/test_math.py @@ -10,6 +10,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type import pytest + from ansible_collections.community.crypto.plugins.module_utils.crypto.math import ( binary_exp_mod, convert_bytes_to_int, diff --git a/tests/unit/plugins/module_utils/crypto/test_pem.py b/tests/unit/plugins/module_utils/crypto/test_pem.py index 8f7f29b8..b9413ba0 100644 --- a/tests/unit/plugins/module_utils/crypto/test_pem.py +++ b/tests/unit/plugins/module_utils/crypto/test_pem.py @@ -10,6 +10,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type import pytest + from ansible_collections.community.crypto.plugins.module_utils.crypto.pem import ( extract_first_pem, identify_pem_format, diff --git a/tests/unit/plugins/module_utils/openssh/test_certificate.py b/tests/unit/plugins/module_utils/openssh/test_certificate.py index ef0f9591..4c4a881e 100644 --- a/tests/unit/plugins/module_utils/openssh/test_certificate.py +++ b/tests/unit/plugins/module_utils/openssh/test_certificate.py @@ -10,6 +10,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type import pytest + from ansible_collections.community.crypto.plugins.module_utils.openssh.certificate import ( OpensshCertificate, OpensshCertificateOption, diff --git a/tests/unit/plugins/module_utils/openssh/test_cryptography.py b/tests/unit/plugins/module_utils/openssh/test_cryptography.py index 62813388..4945b126 100644 --- a/tests/unit/plugins/module_utils/openssh/test_cryptography.py +++ b/tests/unit/plugins/module_utils/openssh/test_cryptography.py @@ -16,6 +16,7 @@ from socket import gethostname from tempfile import mkdtemp import pytest + from ansible_collections.community.crypto.plugins.module_utils.openssh.cryptography import ( HAS_OPENSSH_SUPPORT, InvalidCommentError, diff --git a/tests/unit/plugins/module_utils/openssh/test_utils.py b/tests/unit/plugins/module_utils/openssh/test_utils.py index c1b71202..8d7a18e7 100644 --- a/tests/unit/plugins/module_utils/openssh/test_utils.py +++ b/tests/unit/plugins/module_utils/openssh/test_utils.py @@ -10,6 +10,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type import pytest + from ansible_collections.community.crypto.plugins.module_utils.openssh.utils import ( OpensshParser, _OpensshWriter, diff --git a/tests/unit/plugins/module_utils/test_time.py b/tests/unit/plugins/module_utils/test_time.py index 3bf33813..4081633f 100644 --- a/tests/unit/plugins/module_utils/test_time.py +++ b/tests/unit/plugins/module_utils/test_time.py @@ -13,6 +13,8 @@ import sys import pytest from ansible.module_utils.common.collections import is_sequence +from freezegun import freeze_time + from ansible_collections.community.crypto.plugins.module_utils.time import ( UTC, add_or_remove_timezone, @@ -24,7 +26,6 @@ from ansible_collections.community.crypto.plugins.module_utils.time import ( get_relative_time_option, remove_timezone, ) -from freezegun import freeze_time TIMEZONES = [ diff --git a/tests/unit/plugins/modules/test_luks_device.py b/tests/unit/plugins/modules/test_luks_device.py index 89bcd294..dc23eb68 100644 --- a/tests/unit/plugins/modules/test_luks_device.py +++ b/tests/unit/plugins/modules/test_luks_device.py @@ -8,6 +8,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type import pytest + from ansible_collections.community.crypto.plugins.modules import luks_device