From 18e8401edd5357d1d9995ab6b44d7ff8d1702957 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Wed, 1 Nov 2023 16:37:08 -0700 Subject: [PATCH] Remove Python 2.x compat from unit tests (#82109) --- .../_internal/classification/__init__.py | 5 ---- .../_internal/commands/units/__init__.py | 2 +- test/units/cli/test_cli.py | 2 +- test/units/cli/test_console.py | 2 +- test/units/cli/test_galaxy.py | 2 +- test/units/cli/test_playbook.py | 2 +- test/units/cli/test_vault.py | 2 +- test/units/compat/__init__.py | 0 test/units/compat/mock.py | 22 --------------- test/units/compat/unittest.py | 27 ------------------- test/units/errors/test_errors.py | 2 +- test/units/executor/test_play_iterator.py | 2 +- test/units/executor/test_playbook_executor.py | 2 +- test/units/executor/test_task_executor.py | 2 +- .../test_task_queue_manager_callbacks.py | 2 +- test/units/executor/test_task_result.py | 2 +- test/units/inventory/test_group.py | 2 +- test/units/inventory/test_host.py | 2 +- test/units/mock/procenv.py | 2 +- .../module_utils/basic/test_argument_spec.py | 2 +- .../module_utils/basic/test_filesystem.py | 2 +- .../basic/test_get_module_path.py | 2 +- .../basic/test_heuristic_log_sanitize.py | 2 +- test/units/module_utils/basic/test_imports.py | 2 +- test/units/module_utils/basic/test_no_log.py | 2 +- .../basic/test_platform_distribution.py | 2 +- test/units/module_utils/basic/test_selinux.py | 2 +- test/units/module_utils/basic/test_set_cwd.py | 2 +- test/units/module_utils/basic/test_tmpdir.py | 2 +- test/units/module_utils/common/test_locale.py | 2 +- .../module_utils/common/test_sys_info.py | 2 +- test/units/module_utils/facts/base.py | 4 +-- .../module_utils/facts/hardware/test_linux.py | 4 +-- .../module_utils/facts/network/test_fc_wwn.py | 2 +- .../facts/network/test_generic_bsd.py | 4 +-- .../facts/network/test_iscsi_get_initiator.py | 2 +- .../network/test_locally_reachable_ips.py | 4 +-- .../module_utils/facts/other/test_facter.py | 2 +- .../module_utils/facts/other/test_ohai.py | 2 +- .../facts/system/distribution/conftest.py | 2 +- .../module_utils/facts/system/test_lsb.py | 2 +- .../facts/test_ansible_collector.py | 4 +-- .../module_utils/facts/test_collector.py | 2 +- .../module_utils/facts/test_collectors.py | 2 +- test/units/module_utils/facts/test_facts.py | 4 +-- test/units/module_utils/facts/test_sysctl.py | 4 +-- test/units/module_utils/facts/test_utils.py | 4 +-- .../json_utils/test_filter_non_json_lines.py | 2 +- test/units/module_utils/urls/test_Request.py | 2 +- .../units/module_utils/urls/test_fetch_url.py | 2 +- test/units/modules/test_apt.py | 4 +-- test/units/modules/test_apt_key.py | 4 +-- test/units/modules/test_hostname.py | 2 +- test/units/modules/test_iptables.py | 2 +- test/units/modules/test_known_hosts.py | 2 +- test/units/modules/test_service_facts.py | 4 +-- test/units/modules/test_systemd.py | 2 +- test/units/modules/test_yum.py | 2 +- test/units/modules/utils.py | 4 +-- test/units/parsing/test_dataloader.py | 2 +- test/units/parsing/utils/test_jsonify.py | 2 +- test/units/parsing/vault/test_vault.py | 2 +- test/units/parsing/vault/test_vault_editor.py | 2 +- test/units/parsing/yaml/test_dumper.py | 2 +- test/units/parsing/yaml/test_loader.py | 2 +- test/units/parsing/yaml/test_objects.py | 2 +- test/units/playbook/role/test_include_role.py | 2 +- test/units/playbook/role/test_role.py | 2 +- test/units/playbook/test_attribute.py | 2 +- test/units/playbook/test_base.py | 2 +- test/units/playbook/test_block.py | 2 +- test/units/playbook/test_conditional.py | 2 +- test/units/playbook/test_helpers.py | 2 +- test/units/playbook/test_playbook.py | 2 +- test/units/playbook/test_taggable.py | 2 +- test/units/playbook/test_task.py | 2 +- test/units/plugins/action/test_action.py | 2 +- .../units/plugins/action/test_gather_facts.py | 2 +- test/units/plugins/action/test_raw.py | 2 +- test/units/plugins/cache/test_cache.py | 2 +- test/units/plugins/callback/test_callback.py | 2 +- .../plugins/connection/test_connection.py | 2 +- test/units/plugins/connection/test_local.py | 2 +- test/units/plugins/connection/test_ssh.py | 2 +- .../units/plugins/inventory/test_inventory.py | 2 +- test/units/plugins/inventory/test_script.py | 2 +- test/units/plugins/lookup/test_ini.py | 2 +- test/units/plugins/lookup/test_password.py | 2 +- test/units/plugins/strategy/test_linear.py | 2 +- test/units/plugins/test_plugins.py | 2 +- test/units/regex/test_invalid_var_names.py | 2 +- test/units/template/test_templar.py | 2 +- .../units/template/test_template_utilities.py | 2 +- test/units/utils/test_vars.py | 2 +- test/units/vars/test_variable_manager.py | 2 +- 95 files changed, 103 insertions(+), 157 deletions(-) delete mode 100644 test/units/compat/__init__.py delete mode 100644 test/units/compat/mock.py delete mode 100644 test/units/compat/unittest.py diff --git a/test/lib/ansible_test/_internal/classification/__init__.py b/test/lib/ansible_test/_internal/classification/__init__.py index deda27ee71f..b51228495c1 100644 --- a/test/lib/ansible_test/_internal/classification/__init__.py +++ b/test/lib/ansible_test/_internal/classification/__init__.py @@ -674,11 +674,6 @@ class PathMapper: # Early classification that needs to occur before common classification belongs here. - if path.startswith('test/units/compat/'): - return { - 'units': 'test/units/', - } - if dirname == '.azure-pipelines/commands': test_map = { 'cloud.sh': 'integration:cloud/', diff --git a/test/lib/ansible_test/_internal/commands/units/__init__.py b/test/lib/ansible_test/_internal/commands/units/__init__.py index 78dd8498156..7656eebf5b4 100644 --- a/test/lib/ansible_test/_internal/commands/units/__init__.py +++ b/test/lib/ansible_test/_internal/commands/units/__init__.py @@ -245,7 +245,7 @@ def command_units(args: UnitsConfig) -> None: # # NOTE: This only affects use of pytest-mock. # Collection unit tests may directly import mock, which will be provided by ansible-test when it installs requirements using pip. - # Although mock is available for ansible-core unit tests, they should import units.compat.mock instead. + # Although mock is available for ansible-core unit tests, they should import unittest.mock instead. if str_to_version(python.version) < (3, 8): config_name = 'legacy.ini' else: diff --git a/test/units/cli/test_cli.py b/test/units/cli/test_cli.py index 988a4d9b549..93bbfe2dad0 100644 --- a/test/units/cli/test_cli.py +++ b/test/units/cli/test_cli.py @@ -17,7 +17,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from unittest.mock import patch, MagicMock from units.mock.loader import DictDataLoader diff --git a/test/units/cli/test_console.py b/test/units/cli/test_console.py index 81ea20966b2..ce375728f78 100644 --- a/test/units/cli/test_console.py +++ b/test/units/cli/test_console.py @@ -17,7 +17,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from unittest.mock import patch from ansible.cli.console import ConsoleCLI diff --git a/test/units/cli/test_galaxy.py b/test/units/cli/test_galaxy.py index e73f86b6cab..47d87f508a6 100644 --- a/test/units/cli/test_galaxy.py +++ b/test/units/cli/test_galaxy.py @@ -40,7 +40,7 @@ from ansible.errors import AnsibleError from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text from ansible.utils import context_objects as co from ansible.utils.display import Display -from units.compat import unittest +import unittest from unittest.mock import patch, MagicMock diff --git a/test/units/cli/test_playbook.py b/test/units/cli/test_playbook.py index b2521a58e19..dfa140e77b5 100644 --- a/test/units/cli/test_playbook.py +++ b/test/units/cli/test_playbook.py @@ -17,7 +17,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from units.mock.loader import DictDataLoader from ansible import context diff --git a/test/units/cli/test_vault.py b/test/units/cli/test_vault.py index 703e283ae37..a049610f2f6 100644 --- a/test/units/cli/test_vault.py +++ b/test/units/cli/test_vault.py @@ -21,7 +21,7 @@ from __future__ import annotations import os import pytest -from units.compat import unittest +import unittest from unittest.mock import patch, MagicMock from units.mock.vault_helper import TextVaultSecret diff --git a/test/units/compat/__init__.py b/test/units/compat/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/units/compat/mock.py b/test/units/compat/mock.py deleted file mode 100644 index fc296b90815..00000000000 --- a/test/units/compat/mock.py +++ /dev/null @@ -1,22 +0,0 @@ -""" -Compatibility shim for mock imports in modules and module_utils. -This can be removed once support for Python 2.7 is dropped. -""" -from __future__ import annotations - -try: - from unittest.mock import ( # pylint: disable=unused-import - call, - patch, - mock_open, - MagicMock, - Mock, - ) -except ImportError: - from mock import ( - call, - patch, - mock_open, - MagicMock, - Mock, - ) diff --git a/test/units/compat/unittest.py b/test/units/compat/unittest.py deleted file mode 100644 index 5295a91e820..00000000000 --- a/test/units/compat/unittest.py +++ /dev/null @@ -1,27 +0,0 @@ -# (c) 2014, Toshio Kuratomi -# -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . - -from __future__ import annotations - -# Allow wildcard import because we really do want to import all of -# unittests's symbols into this compat shim -# pylint: disable=wildcard-import,unused-wildcard-import -from unittest import * - -if not hasattr(TestCase, 'assertRaisesRegex'): - # added in Python 3.2 - TestCase.assertRaisesRegex = TestCase.assertRaisesRegexp diff --git a/test/units/errors/test_errors.py b/test/units/errors/test_errors.py index d9ac668adcd..94c905bcf79 100644 --- a/test/units/errors/test_errors.py +++ b/test/units/errors/test_errors.py @@ -18,7 +18,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from unittest.mock import mock_open, patch from ansible.errors import AnsibleError from ansible.parsing.yaml.objects import AnsibleBaseYAMLObject diff --git a/test/units/executor/test_play_iterator.py b/test/units/executor/test_play_iterator.py index a5325238a63..14a9cc4ae57 100644 --- a/test/units/executor/test_play_iterator.py +++ b/test/units/executor/test_play_iterator.py @@ -17,7 +17,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from unittest.mock import patch, MagicMock from ansible.executor.play_iterator import HostState, PlayIterator, IteratingStates, FailedStates diff --git a/test/units/executor/test_playbook_executor.py b/test/units/executor/test_playbook_executor.py index 30abb444792..62fa1a36e16 100644 --- a/test/units/executor/test_playbook_executor.py +++ b/test/units/executor/test_playbook_executor.py @@ -17,7 +17,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from unittest.mock import MagicMock from ansible.executor.playbook_executor import PlaybookExecutor diff --git a/test/units/executor/test_task_executor.py b/test/units/executor/test_task_executor.py index de4eacc2661..c9922430d23 100644 --- a/test/units/executor/test_task_executor.py +++ b/test/units/executor/test_task_executor.py @@ -19,7 +19,7 @@ from __future__ import annotations from unittest import mock -from units.compat import unittest +import unittest from unittest.mock import patch, MagicMock from ansible.errors import AnsibleError from ansible.executor.task_executor import TaskExecutor, remove_omit diff --git a/test/units/executor/test_task_queue_manager_callbacks.py b/test/units/executor/test_task_queue_manager_callbacks.py index fd304534c97..c53a42d81f8 100644 --- a/test/units/executor/test_task_queue_manager_callbacks.py +++ b/test/units/executor/test_task_queue_manager_callbacks.py @@ -17,7 +17,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from unittest.mock import MagicMock from ansible.executor.task_queue_manager import TaskQueueManager diff --git a/test/units/executor/test_task_result.py b/test/units/executor/test_task_result.py index 0bcf04896c3..54b86133afd 100644 --- a/test/units/executor/test_task_result.py +++ b/test/units/executor/test_task_result.py @@ -17,7 +17,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from unittest.mock import patch, MagicMock from ansible.executor.task_result import TaskResult diff --git a/test/units/inventory/test_group.py b/test/units/inventory/test_group.py index 7fb5f96f44b..5a9d540d908 100644 --- a/test/units/inventory/test_group.py +++ b/test/units/inventory/test_group.py @@ -17,7 +17,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from ansible.inventory.group import Group from ansible.inventory.host import Host diff --git a/test/units/inventory/test_host.py b/test/units/inventory/test_host.py index a7dacda9f5d..5d4ddc3b01f 100644 --- a/test/units/inventory/test_host.py +++ b/test/units/inventory/test_host.py @@ -21,7 +21,7 @@ from __future__ import annotations import pickle -from units.compat import unittest +import unittest from ansible.inventory.group import Group from ansible.inventory.host import Host diff --git a/test/units/mock/procenv.py b/test/units/mock/procenv.py index 5618e7b6c71..4d0b5e12501 100644 --- a/test/units/mock/procenv.py +++ b/test/units/mock/procenv.py @@ -23,7 +23,7 @@ import json from contextlib import contextmanager from io import BytesIO, StringIO -from units.compat import unittest +import unittest from ansible.module_utils.six import PY3 from ansible.module_utils.common.text.converters import to_bytes diff --git a/test/units/module_utils/basic/test_argument_spec.py b/test/units/module_utils/basic/test_argument_spec.py index 28568b80af5..e651ad6e2a2 100644 --- a/test/units/module_utils/basic/test_argument_spec.py +++ b/test/units/module_utils/basic/test_argument_spec.py @@ -11,7 +11,7 @@ import os import pytest -from units.compat.mock import MagicMock +from unittest.mock import MagicMock from ansible.module_utils import basic from ansible.module_utils.api import basic_auth_argument_spec, rate_limit_argument_spec, retry_argument_spec from ansible.module_utils.common import warnings diff --git a/test/units/module_utils/basic/test_filesystem.py b/test/units/module_utils/basic/test_filesystem.py index c08b493f70c..109ba623980 100644 --- a/test/units/module_utils/basic/test_filesystem.py +++ b/test/units/module_utils/basic/test_filesystem.py @@ -8,7 +8,7 @@ from __future__ import annotations from units.mock.procenv import ModuleTestCase -from units.compat.mock import patch, MagicMock +from unittest.mock import patch, MagicMock from ansible.module_utils.six.moves import builtins realimport = builtins.__import__ diff --git a/test/units/module_utils/basic/test_get_module_path.py b/test/units/module_utils/basic/test_get_module_path.py index 864030c5fa5..5ba40c40958 100644 --- a/test/units/module_utils/basic/test_get_module_path.py +++ b/test/units/module_utils/basic/test_get_module_path.py @@ -8,7 +8,7 @@ from __future__ import annotations from units.mock.procenv import ModuleTestCase -from units.compat.mock import patch +from unittest.mock import patch from ansible.module_utils.six.moves import builtins realimport = builtins.__import__ diff --git a/test/units/module_utils/basic/test_heuristic_log_sanitize.py b/test/units/module_utils/basic/test_heuristic_log_sanitize.py index debbda73d49..2c4eefba4a0 100644 --- a/test/units/module_utils/basic/test_heuristic_log_sanitize.py +++ b/test/units/module_utils/basic/test_heuristic_log_sanitize.py @@ -18,7 +18,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from ansible.module_utils.basic import heuristic_log_sanitize diff --git a/test/units/module_utils/basic/test_imports.py b/test/units/module_utils/basic/test_imports.py index 0d4f0027b8a..282a8d45f40 100644 --- a/test/units/module_utils/basic/test_imports.py +++ b/test/units/module_utils/basic/test_imports.py @@ -10,7 +10,7 @@ import sys from units.mock.procenv import ModuleTestCase -from units.compat.mock import patch +from unittest.mock import patch from ansible.module_utils.six.moves import builtins realimport = builtins.__import__ diff --git a/test/units/module_utils/basic/test_no_log.py b/test/units/module_utils/basic/test_no_log.py index 698c38eed6a..0b04a74e38c 100644 --- a/test/units/module_utils/basic/test_no_log.py +++ b/test/units/module_utils/basic/test_no_log.py @@ -5,7 +5,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from ansible.module_utils.basic import remove_values from ansible.module_utils.common.parameters import _return_datastructure_name diff --git a/test/units/module_utils/basic/test_platform_distribution.py b/test/units/module_utils/basic/test_platform_distribution.py index a9b623cece1..00c0e49692b 100644 --- a/test/units/module_utils/basic/test_platform_distribution.py +++ b/test/units/module_utils/basic/test_platform_distribution.py @@ -8,7 +8,7 @@ from __future__ import annotations import pytest -from units.compat.mock import patch +from unittest.mock import patch from ansible.module_utils.six.moves import builtins diff --git a/test/units/module_utils/basic/test_selinux.py b/test/units/module_utils/basic/test_selinux.py index 57598e20794..1851616b3e6 100644 --- a/test/units/module_utils/basic/test_selinux.py +++ b/test/units/module_utils/basic/test_selinux.py @@ -10,7 +10,7 @@ import errno import json import pytest -from units.compat.mock import mock_open, patch +from unittest.mock import mock_open, patch from ansible.module_utils import basic from ansible.module_utils.common.text.converters import to_bytes diff --git a/test/units/module_utils/basic/test_set_cwd.py b/test/units/module_utils/basic/test_set_cwd.py index 4542b2eb91b..b060b50b1ff 100644 --- a/test/units/module_utils/basic/test_set_cwd.py +++ b/test/units/module_utils/basic/test_set_cwd.py @@ -8,7 +8,7 @@ import json import os import tempfile -from units.compat.mock import patch +from unittest.mock import patch from ansible.module_utils.common.text.converters import to_bytes from ansible.module_utils import basic diff --git a/test/units/module_utils/basic/test_tmpdir.py b/test/units/module_utils/basic/test_tmpdir.py index 3f51f56f492..0e4f53d7115 100644 --- a/test/units/module_utils/basic/test_tmpdir.py +++ b/test/units/module_utils/basic/test_tmpdir.py @@ -11,7 +11,7 @@ import tempfile import pytest -from units.compat.mock import patch, MagicMock +from unittest.mock import patch, MagicMock from ansible.module_utils.common.text.converters import to_bytes from ansible.module_utils import basic diff --git a/test/units/module_utils/common/test_locale.py b/test/units/module_utils/common/test_locale.py index 25625bdc87a..80e28de0272 100644 --- a/test/units/module_utils/common/test_locale.py +++ b/test/units/module_utils/common/test_locale.py @@ -4,7 +4,7 @@ from __future__ import annotations -from units.compat.mock import MagicMock +from unittest.mock import MagicMock from ansible.module_utils.common.locale import get_best_parsable_locale diff --git a/test/units/module_utils/common/test_sys_info.py b/test/units/module_utils/common/test_sys_info.py index 4dfc59ac21b..1878fafb8ed 100644 --- a/test/units/module_utils/common/test_sys_info.py +++ b/test/units/module_utils/common/test_sys_info.py @@ -8,7 +8,7 @@ from __future__ import annotations import pytest -from units.compat.mock import patch +from unittest.mock import patch from ansible.module_utils.six.moves import builtins diff --git a/test/units/module_utils/facts/base.py b/test/units/module_utils/facts/base.py index f180ec65ba7..4a19e67d5fc 100644 --- a/test/units/module_utils/facts/base.py +++ b/test/units/module_utils/facts/base.py @@ -17,8 +17,8 @@ from __future__ import annotations -from units.compat import unittest -from units.compat.mock import Mock, patch +import unittest +from unittest.mock import Mock, patch class BaseFactsTest(unittest.TestCase): diff --git a/test/units/module_utils/facts/hardware/test_linux.py b/test/units/module_utils/facts/hardware/test_linux.py index 2745d9e535c..0a546f1516b 100644 --- a/test/units/module_utils/facts/hardware/test_linux.py +++ b/test/units/module_utils/facts/hardware/test_linux.py @@ -17,8 +17,8 @@ from __future__ import annotations import os -from units.compat import unittest -from units.compat.mock import Mock, patch +import unittest +from unittest.mock import Mock, patch from ansible.module_utils.facts import timeout diff --git a/test/units/module_utils/facts/network/test_fc_wwn.py b/test/units/module_utils/facts/network/test_fc_wwn.py index 9a883710440..3f91654fec4 100644 --- a/test/units/module_utils/facts/network/test_fc_wwn.py +++ b/test/units/module_utils/facts/network/test_fc_wwn.py @@ -5,7 +5,7 @@ from __future__ import annotations from ansible.module_utils.facts.network import fc_wwn -from units.compat.mock import Mock +from unittest.mock import Mock # AIX lsdev diff --git a/test/units/module_utils/facts/network/test_generic_bsd.py b/test/units/module_utils/facts/network/test_generic_bsd.py index d1e94714b67..4e4061dbb74 100644 --- a/test/units/module_utils/facts/network/test_generic_bsd.py +++ b/test/units/module_utils/facts/network/test_generic_bsd.py @@ -16,8 +16,8 @@ from __future__ import annotations -from units.compat.mock import Mock -from units.compat import unittest +from unittest.mock import Mock +import unittest from ansible.module_utils.facts.network import generic_bsd diff --git a/test/units/module_utils/facts/network/test_iscsi_get_initiator.py b/test/units/module_utils/facts/network/test_iscsi_get_initiator.py index 9e9eec7e9c6..48f97b38fad 100644 --- a/test/units/module_utils/facts/network/test_iscsi_get_initiator.py +++ b/test/units/module_utils/facts/network/test_iscsi_get_initiator.py @@ -5,7 +5,7 @@ from __future__ import annotations from ansible.module_utils.facts.network import iscsi -from units.compat.mock import Mock +from unittest.mock import Mock # AIX # lsattr -E -l iscsi0 diff --git a/test/units/module_utils/facts/network/test_locally_reachable_ips.py b/test/units/module_utils/facts/network/test_locally_reachable_ips.py index 116d86e1ddd..4c3643ae23f 100644 --- a/test/units/module_utils/facts/network/test_locally_reachable_ips.py +++ b/test/units/module_utils/facts/network/test_locally_reachable_ips.py @@ -18,8 +18,8 @@ from __future__ import annotations -from units.compat.mock import Mock -from units.compat import unittest +from unittest.mock import Mock +import unittest from ansible.module_utils.facts.network import linux # ip -4 route show table local diff --git a/test/units/module_utils/facts/other/test_facter.py b/test/units/module_utils/facts/other/test_facter.py index 706bbaf99bf..62ff5196cc0 100644 --- a/test/units/module_utils/facts/other/test_facter.py +++ b/test/units/module_utils/facts/other/test_facter.py @@ -17,7 +17,7 @@ from __future__ import annotations -from units.compat.mock import Mock, patch +from unittest.mock import Mock, patch from .. base import BaseFactsTest diff --git a/test/units/module_utils/facts/other/test_ohai.py b/test/units/module_utils/facts/other/test_ohai.py index 0093166dff9..f5084c5d451 100644 --- a/test/units/module_utils/facts/other/test_ohai.py +++ b/test/units/module_utils/facts/other/test_ohai.py @@ -17,7 +17,7 @@ from __future__ import annotations -from units.compat.mock import Mock, patch +from unittest.mock import Mock, patch from .. base import BaseFactsTest diff --git a/test/units/module_utils/facts/system/distribution/conftest.py b/test/units/module_utils/facts/system/distribution/conftest.py index 580467bd4b6..9f84822d5f6 100644 --- a/test/units/module_utils/facts/system/distribution/conftest.py +++ b/test/units/module_utils/facts/system/distribution/conftest.py @@ -7,7 +7,7 @@ from __future__ import annotations import pytest -from units.compat.mock import Mock +from unittest.mock import Mock @pytest.fixture diff --git a/test/units/module_utils/facts/system/test_lsb.py b/test/units/module_utils/facts/system/test_lsb.py index 4049aa08369..385a7540793 100644 --- a/test/units/module_utils/facts/system/test_lsb.py +++ b/test/units/module_utils/facts/system/test_lsb.py @@ -17,7 +17,7 @@ from __future__ import annotations -from units.compat.mock import Mock, patch +from unittest.mock import Mock, patch from .. base import BaseFactsTest diff --git a/test/units/module_utils/facts/test_ansible_collector.py b/test/units/module_utils/facts/test_ansible_collector.py index be44a670cfa..3316464c47b 100644 --- a/test/units/module_utils/facts/test_ansible_collector.py +++ b/test/units/module_utils/facts/test_ansible_collector.py @@ -18,8 +18,8 @@ from __future__ import annotations # for testing -from units.compat import unittest -from units.compat.mock import Mock, patch +import unittest +from unittest.mock import Mock, patch from ansible.module_utils.facts import collector from ansible.module_utils.facts import ansible_collector diff --git a/test/units/module_utils/facts/test_collector.py b/test/units/module_utils/facts/test_collector.py index 21e2400141f..852273c3669 100644 --- a/test/units/module_utils/facts/test_collector.py +++ b/test/units/module_utils/facts/test_collector.py @@ -22,7 +22,7 @@ from collections import defaultdict import pprint # for testing -from units.compat import unittest +import unittest from ansible.module_utils.facts import collector diff --git a/test/units/module_utils/facts/test_collectors.py b/test/units/module_utils/facts/test_collectors.py index a889a070089..8ad0025787f 100644 --- a/test/units/module_utils/facts/test_collectors.py +++ b/test/units/module_utils/facts/test_collectors.py @@ -19,7 +19,7 @@ from __future__ import annotations import pytest -from units.compat.mock import Mock, patch +from unittest.mock import Mock, patch from . base import BaseFactsTest diff --git a/test/units/module_utils/facts/test_facts.py b/test/units/module_utils/facts/test_facts.py index 06cee74b5c7..d0381a1ef4f 100644 --- a/test/units/module_utils/facts/test_facts.py +++ b/test/units/module_utils/facts/test_facts.py @@ -23,8 +23,8 @@ import os import pytest # for testing -from units.compat import unittest -from units.compat.mock import Mock, patch +import unittest +from unittest.mock import Mock, patch from ansible.module_utils import facts from ansible.module_utils.facts import hardware diff --git a/test/units/module_utils/facts/test_sysctl.py b/test/units/module_utils/facts/test_sysctl.py index 39c6a89d434..4fed2dbddac 100644 --- a/test/units/module_utils/facts/test_sysctl.py +++ b/test/units/module_utils/facts/test_sysctl.py @@ -19,8 +19,8 @@ from __future__ import annotations # for testing -from units.compat import unittest -from units.compat.mock import MagicMock +import unittest +from unittest.mock import MagicMock from ansible.module_utils.facts.sysctl import get_sysctl diff --git a/test/units/module_utils/facts/test_utils.py b/test/units/module_utils/facts/test_utils.py index 07921409c6e..5accfe9e5ac 100644 --- a/test/units/module_utils/facts/test_utils.py +++ b/test/units/module_utils/facts/test_utils.py @@ -15,8 +15,8 @@ from __future__ import annotations -from units.compat import unittest -from units.compat.mock import patch +import unittest +from unittest.mock import patch from ansible.module_utils.facts import utils diff --git a/test/units/module_utils/json_utils/test_filter_non_json_lines.py b/test/units/module_utils/json_utils/test_filter_non_json_lines.py index 9dad631f70f..53582cc5e65 100644 --- a/test/units/module_utils/json_utils/test_filter_non_json_lines.py +++ b/test/units/module_utils/json_utils/test_filter_non_json_lines.py @@ -18,7 +18,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from ansible.module_utils.json_utils import _filter_non_json_lines diff --git a/test/units/module_utils/urls/test_Request.py b/test/units/module_utils/urls/test_Request.py index 9bf04020b00..b827dd5bcb0 100644 --- a/test/units/module_utils/urls/test_Request.py +++ b/test/units/module_utils/urls/test_Request.py @@ -14,7 +14,7 @@ from ansible.module_utils.urls import (Request, open_url, cookiejar, from ansible.module_utils.urls import HTTPRedirectHandler import pytest -from units.compat.mock import call +from unittest.mock import call import ssl diff --git a/test/units/module_utils/urls/test_fetch_url.py b/test/units/module_utils/urls/test_fetch_url.py index d29a3999f61..9df410263f4 100644 --- a/test/units/module_utils/urls/test_fetch_url.py +++ b/test/units/module_utils/urls/test_fetch_url.py @@ -14,7 +14,7 @@ from http.cookiejar import Cookie from ansible.module_utils.urls import fetch_url, ConnectionError import pytest -from units.compat.mock import MagicMock +from unittest.mock import MagicMock class AnsibleModuleExit(Exception): diff --git a/test/units/modules/test_apt.py b/test/units/modules/test_apt.py index f6b8fec50a7..16cbee32deb 100644 --- a/test/units/modules/test_apt.py +++ b/test/units/modules/test_apt.py @@ -2,8 +2,8 @@ from __future__ import annotations import collections -from units.compat.mock import Mock -from units.compat import unittest +from unittest.mock import Mock +import unittest from ansible.modules.apt import ( expand_pkgspec_from_fnmatches, diff --git a/test/units/modules/test_apt_key.py b/test/units/modules/test_apt_key.py index c14d1e612f9..051dc2ebbae 100644 --- a/test/units/modules/test_apt_key.py +++ b/test/units/modules/test_apt_key.py @@ -2,8 +2,8 @@ from __future__ import annotations import os -from units.compat.mock import patch, Mock -from units.compat import unittest +from unittest.mock import patch, Mock +import unittest from ansible.modules import apt_key diff --git a/test/units/modules/test_hostname.py b/test/units/modules/test_hostname.py index c34d22697e6..ff5f789aa2b 100644 --- a/test/units/modules/test_hostname.py +++ b/test/units/modules/test_hostname.py @@ -4,7 +4,7 @@ import os import shutil import tempfile -from units.compat.mock import patch, MagicMock, mock_open +from unittest.mock import patch, MagicMock, mock_open from ansible.module_utils.common._utils import get_all_subclasses from ansible.modules import hostname from units.modules.utils import ModuleTestCase, set_module_args diff --git a/test/units/modules/test_iptables.py b/test/units/modules/test_iptables.py index 6b1fa52aa70..78062c17f91 100644 --- a/test/units/modules/test_iptables.py +++ b/test/units/modules/test_iptables.py @@ -1,6 +1,6 @@ from __future__ import annotations -from units.compat.mock import patch +from unittest.mock import patch from ansible.module_utils import basic from ansible.modules import iptables from units.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args diff --git a/test/units/modules/test_known_hosts.py b/test/units/modules/test_known_hosts.py index e2467559183..f98c998bcd7 100644 --- a/test/units/modules/test_known_hosts.py +++ b/test/units/modules/test_known_hosts.py @@ -4,7 +4,7 @@ import os import tempfile from ansible.module_utils import basic -from units.compat import unittest +import unittest from ansible.module_utils.common.text.converters import to_bytes from ansible.module_utils.basic import AnsibleModule diff --git a/test/units/modules/test_service_facts.py b/test/units/modules/test_service_facts.py index fec5086fa54..6917b8be764 100644 --- a/test/units/modules/test_service_facts.py +++ b/test/units/modules/test_service_facts.py @@ -4,8 +4,8 @@ from __future__ import annotations -from units.compat import unittest -from units.compat.mock import patch +import unittest +from unittest.mock import patch from ansible.module_utils import basic from ansible.modules.service_facts import AIXScanService diff --git a/test/units/modules/test_systemd.py b/test/units/modules/test_systemd.py index ac7c1d0e602..1c5339c1ffb 100644 --- a/test/units/modules/test_systemd.py +++ b/test/units/modules/test_systemd.py @@ -1,6 +1,6 @@ from __future__ import annotations -from units.compat import unittest +import unittest from ansible.modules.systemd import parse_systemctl_show diff --git a/test/units/modules/test_yum.py b/test/units/modules/test_yum.py index 8723e14aced..21a7edcdb55 100644 --- a/test/units/modules/test_yum.py +++ b/test/units/modules/test_yum.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import annotations -from units.compat import unittest +import unittest from ansible.modules.yum import YumModule diff --git a/test/units/modules/utils.py b/test/units/modules/utils.py index 5d1c025df7e..4e83d1fe408 100644 --- a/test/units/modules/utils.py +++ b/test/units/modules/utils.py @@ -2,8 +2,8 @@ from __future__ import annotations import json -from units.compat import unittest -from units.compat.mock import patch +import unittest +from unittest.mock import patch from ansible.module_utils import basic from ansible.module_utils.common.text.converters import to_bytes diff --git a/test/units/parsing/test_dataloader.py b/test/units/parsing/test_dataloader.py index 62c2d346166..188d149e409 100644 --- a/test/units/parsing/test_dataloader.py +++ b/test/units/parsing/test_dataloader.py @@ -19,7 +19,7 @@ from __future__ import annotations import os -from units.compat import unittest +import unittest from unittest.mock import patch, mock_open from ansible.errors import AnsibleParserError, yaml_strings, AnsibleFileNotFound from ansible.parsing.vault import AnsibleVaultError diff --git a/test/units/parsing/utils/test_jsonify.py b/test/units/parsing/utils/test_jsonify.py index 55b0c91044f..bb71a028663 100644 --- a/test/units/parsing/utils/test_jsonify.py +++ b/test/units/parsing/utils/test_jsonify.py @@ -18,7 +18,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from ansible.parsing.utils.jsonify import jsonify diff --git a/test/units/parsing/vault/test_vault.py b/test/units/parsing/vault/test_vault.py index 2a64e675f38..56fb3323750 100644 --- a/test/units/parsing/vault/test_vault.py +++ b/test/units/parsing/vault/test_vault.py @@ -26,7 +26,7 @@ import tempfile from binascii import hexlify import pytest -from units.compat import unittest +import unittest from unittest.mock import patch, MagicMock from ansible import errors diff --git a/test/units/parsing/vault/test_vault_editor.py b/test/units/parsing/vault/test_vault_editor.py index 959582d890c..d191cf86482 100644 --- a/test/units/parsing/vault/test_vault_editor.py +++ b/test/units/parsing/vault/test_vault_editor.py @@ -24,7 +24,7 @@ from io import BytesIO, StringIO import pytest -from units.compat import unittest +import unittest from unittest.mock import patch from ansible import errors diff --git a/test/units/parsing/yaml/test_dumper.py b/test/units/parsing/yaml/test_dumper.py index 84fab1e4deb..d71207c11c0 100644 --- a/test/units/parsing/yaml/test_dumper.py +++ b/test/units/parsing/yaml/test_dumper.py @@ -20,7 +20,7 @@ import io from jinja2.exceptions import UndefinedError -from units.compat import unittest +import unittest from ansible.parsing import vault from ansible.parsing.yaml import dumper, objects from ansible.parsing.yaml.loader import AnsibleLoader diff --git a/test/units/parsing/yaml/test_loader.py b/test/units/parsing/yaml/test_loader.py index b63e1a69d11..0477a0c29c2 100644 --- a/test/units/parsing/yaml/test_loader.py +++ b/test/units/parsing/yaml/test_loader.py @@ -21,7 +21,7 @@ from __future__ import annotations from collections.abc import Sequence, Set, Mapping from io import StringIO -from units.compat import unittest +import unittest from ansible import errors from ansible.module_utils.six import text_type, binary_type diff --git a/test/units/parsing/yaml/test_objects.py b/test/units/parsing/yaml/test_objects.py index ca041aedc96..32aca1c05fa 100644 --- a/test/units/parsing/yaml/test_objects.py +++ b/test/units/parsing/yaml/test_objects.py @@ -18,7 +18,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from ansible.errors import AnsibleError diff --git a/test/units/playbook/role/test_include_role.py b/test/units/playbook/role/test_include_role.py index cce119589a6..34bf0a538fc 100644 --- a/test/units/playbook/role/test_include_role.py +++ b/test/units/playbook/role/test_include_role.py @@ -17,7 +17,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from unittest.mock import patch from ansible.playbook import Play diff --git a/test/units/playbook/role/test_role.py b/test/units/playbook/role/test_role.py index 0fe1c35df98..cbfe776357e 100644 --- a/test/units/playbook/role/test_role.py +++ b/test/units/playbook/role/test_role.py @@ -21,7 +21,7 @@ from collections.abc import Container import pytest -from units.compat import unittest +import unittest from unittest.mock import patch, MagicMock from ansible.errors import AnsibleParserError diff --git a/test/units/playbook/test_attribute.py b/test/units/playbook/test_attribute.py index c246e9a15df..14c4807dd03 100644 --- a/test/units/playbook/test_attribute.py +++ b/test/units/playbook/test_attribute.py @@ -17,7 +17,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from ansible.playbook.attribute import Attribute diff --git a/test/units/playbook/test_base.py b/test/units/playbook/test_base.py index 7750063d017..d7eeea60639 100644 --- a/test/units/playbook/test_base.py +++ b/test/units/playbook/test_base.py @@ -17,7 +17,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from ansible.errors import AnsibleParserError, AnsibleAssertionError from ansible.module_utils.six import string_types diff --git a/test/units/playbook/test_block.py b/test/units/playbook/test_block.py index 82179f30f0e..aac5f718c31 100644 --- a/test/units/playbook/test_block.py +++ b/test/units/playbook/test_block.py @@ -17,7 +17,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from ansible.playbook.block import Block from ansible.playbook.task import Task diff --git a/test/units/playbook/test_conditional.py b/test/units/playbook/test_conditional.py index 501c40b1c63..e0f08579f73 100644 --- a/test/units/playbook/test_conditional.py +++ b/test/units/playbook/test_conditional.py @@ -1,6 +1,6 @@ from __future__ import annotations -from units.compat import unittest +import unittest from units.mock.loader import DictDataLoader from unittest.mock import MagicMock diff --git a/test/units/playbook/test_helpers.py b/test/units/playbook/test_helpers.py index 5fd6a6ee305..2977b0d6d5c 100644 --- a/test/units/playbook/test_helpers.py +++ b/test/units/playbook/test_helpers.py @@ -19,7 +19,7 @@ from __future__ import annotations import os -from units.compat import unittest +import unittest from unittest.mock import MagicMock from units.mock.loader import DictDataLoader diff --git a/test/units/playbook/test_playbook.py b/test/units/playbook/test_playbook.py index efe6900a7ee..c04479bf3cb 100644 --- a/test/units/playbook/test_playbook.py +++ b/test/units/playbook/test_playbook.py @@ -17,7 +17,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from ansible.errors import AnsibleParserError from ansible.playbook import Playbook from ansible.vars.manager import VariableManager diff --git a/test/units/playbook/test_taggable.py b/test/units/playbook/test_taggable.py index c0557b3f719..7076f98066d 100644 --- a/test/units/playbook/test_taggable.py +++ b/test/units/playbook/test_taggable.py @@ -17,7 +17,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from ansible.playbook.taggable import Taggable from units.mock.loader import DictDataLoader diff --git a/test/units/playbook/test_task.py b/test/units/playbook/test_task.py index 72a4d639a00..6eb3bf22107 100644 --- a/test/units/playbook/test_task.py +++ b/test/units/playbook/test_task.py @@ -17,7 +17,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from unittest.mock import patch from ansible.playbook.task import Task from ansible.plugins.loader import init_plugin_loader diff --git a/test/units/plugins/action/test_action.py b/test/units/plugins/action/test_action.py index 51e28725db9..5f3acf2c95b 100644 --- a/test/units/plugins/action/test_action.py +++ b/test/units/plugins/action/test_action.py @@ -23,7 +23,7 @@ import re from importlib import import_module from ansible import constants as C -from units.compat import unittest +import unittest from unittest.mock import patch, MagicMock, mock_open from ansible.errors import AnsibleError, AnsibleAuthenticationFailure diff --git a/test/units/plugins/action/test_gather_facts.py b/test/units/plugins/action/test_gather_facts.py index 44e55d3f348..5bacb635233 100644 --- a/test/units/plugins/action/test_gather_facts.py +++ b/test/units/plugins/action/test_gather_facts.py @@ -17,7 +17,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from unittest.mock import MagicMock, patch from ansible import constants as C diff --git a/test/units/plugins/action/test_raw.py b/test/units/plugins/action/test_raw.py index 488bae81555..ebbfdfcac76 100644 --- a/test/units/plugins/action/test_raw.py +++ b/test/units/plugins/action/test_raw.py @@ -19,7 +19,7 @@ from __future__ import annotations import os -from units.compat import unittest +import unittest from unittest.mock import MagicMock, Mock from ansible.plugins.action.raw import ActionModule from ansible.playbook.task import Task diff --git a/test/units/plugins/cache/test_cache.py b/test/units/plugins/cache/test_cache.py index 025be992548..edd50486b68 100644 --- a/test/units/plugins/cache/test_cache.py +++ b/test/units/plugins/cache/test_cache.py @@ -23,7 +23,7 @@ import tempfile from unittest import mock -from units.compat import unittest +import unittest from ansible.errors import AnsibleError from ansible.plugins.cache import CachePluginAdjudicator from ansible.plugins.cache.memory import CacheModule as MemoryCache diff --git a/test/units/plugins/callback/test_callback.py b/test/units/plugins/callback/test_callback.py index cab1e935d44..dd83820e1ba 100644 --- a/test/units/plugins/callback/test_callback.py +++ b/test/units/plugins/callback/test_callback.py @@ -22,7 +22,7 @@ import re import textwrap import types -from units.compat import unittest +import unittest from unittest.mock import MagicMock from ansible.executor.task_result import TaskResult diff --git a/test/units/plugins/connection/test_connection.py b/test/units/plugins/connection/test_connection.py index 65e6f988c97..da140ea24ec 100644 --- a/test/units/plugins/connection/test_connection.py +++ b/test/units/plugins/connection/test_connection.py @@ -19,7 +19,7 @@ from __future__ import annotations from io import StringIO -from units.compat import unittest +import unittest from ansible.playbook.play_context import PlayContext from ansible.plugins.connection import ConnectionBase from ansible.plugins.loader import become_loader diff --git a/test/units/plugins/connection/test_local.py b/test/units/plugins/connection/test_local.py index 57e6f7f0373..06a1ba3725f 100644 --- a/test/units/plugins/connection/test_local.py +++ b/test/units/plugins/connection/test_local.py @@ -20,7 +20,7 @@ from __future__ import annotations from io import StringIO -from units.compat import unittest +import unittest from ansible.plugins.connection import local from ansible.playbook.play_context import PlayContext diff --git a/test/units/plugins/connection/test_ssh.py b/test/units/plugins/connection/test_ssh.py index 62d72713e21..943778a3ac0 100644 --- a/test/units/plugins/connection/test_ssh.py +++ b/test/units/plugins/connection/test_ssh.py @@ -24,7 +24,7 @@ import pytest from ansible.errors import AnsibleAuthenticationFailure -from units.compat import unittest +import unittest from unittest.mock import patch, MagicMock, PropertyMock from ansible.errors import AnsibleError, AnsibleConnectionFailure, AnsibleFileNotFound from ansible.module_utils.six.moves import shlex_quote diff --git a/test/units/plugins/inventory/test_inventory.py b/test/units/plugins/inventory/test_inventory.py index 76ab91f8819..3d704cabf7d 100644 --- a/test/units/plugins/inventory/test_inventory.py +++ b/test/units/plugins/inventory/test_inventory.py @@ -23,7 +23,7 @@ import textwrap from unittest import mock from ansible import constants as C -from units.compat import unittest +import unittest from ansible.module_utils.six import string_types from ansible.module_utils.common.text.converters import to_text from units.mock.path import mock_unfrackpath_noop diff --git a/test/units/plugins/inventory/test_script.py b/test/units/plugins/inventory/test_script.py index 952af27b3c5..875f830d581 100644 --- a/test/units/plugins/inventory/test_script.py +++ b/test/units/plugins/inventory/test_script.py @@ -25,7 +25,7 @@ from unittest import mock from ansible import constants as C from ansible.errors import AnsibleError from ansible.plugins.loader import PluginLoader -from units.compat import unittest +import unittest from ansible.module_utils.common.text.converters import to_bytes, to_native diff --git a/test/units/plugins/lookup/test_ini.py b/test/units/plugins/lookup/test_ini.py index 21f45aa3bc8..212cf087ce7 100644 --- a/test/units/plugins/lookup/test_ini.py +++ b/test/units/plugins/lookup/test_ini.py @@ -18,7 +18,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from ansible.plugins.lookup.ini import _parse_params diff --git a/test/units/plugins/lookup/test_password.py b/test/units/plugins/lookup/test_password.py index a3075622732..93524f39f48 100644 --- a/test/units/plugins/lookup/test_password.py +++ b/test/units/plugins/lookup/test_password.py @@ -29,7 +29,7 @@ import pytest from units.mock.loader import DictDataLoader -from units.compat import unittest +import unittest from unittest.mock import mock_open, patch from ansible.errors import AnsibleError from ansible.module_utils.six import text_type diff --git a/test/units/plugins/strategy/test_linear.py b/test/units/plugins/strategy/test_linear.py index 8f1a11675b2..6f4ea926275 100644 --- a/test/units/plugins/strategy/test_linear.py +++ b/test/units/plugins/strategy/test_linear.py @@ -4,7 +4,7 @@ from __future__ import annotations -from units.compat import unittest +import unittest from unittest.mock import patch, MagicMock from ansible.executor.play_iterator import PlayIterator diff --git a/test/units/plugins/test_plugins.py b/test/units/plugins/test_plugins.py index d2791726a27..4bd96a1756e 100644 --- a/test/units/plugins/test_plugins.py +++ b/test/units/plugins/test_plugins.py @@ -20,7 +20,7 @@ from __future__ import annotations import os -from units.compat import unittest +import unittest from unittest.mock import patch, MagicMock from ansible.plugins.loader import PluginLoader, PluginPathContext diff --git a/test/units/regex/test_invalid_var_names.py b/test/units/regex/test_invalid_var_names.py index 5d6a8a7fdef..8aed871a4a2 100644 --- a/test/units/regex/test_invalid_var_names.py +++ b/test/units/regex/test_invalid_var_names.py @@ -1,6 +1,6 @@ from __future__ import annotations -from units.compat import unittest +import unittest from ansible import constants as C diff --git a/test/units/template/test_templar.py b/test/units/template/test_templar.py index 81f605dc410..e57f5913cd3 100644 --- a/test/units/template/test_templar.py +++ b/test/units/template/test_templar.py @@ -19,7 +19,7 @@ from __future__ import annotations from jinja2.runtime import Context -from units.compat import unittest +import unittest from ansible import constants as C from ansible.errors import AnsibleError, AnsibleUndefinedVariable diff --git a/test/units/template/test_template_utilities.py b/test/units/template/test_template_utilities.py index fa2335771fb..5f934d93884 100644 --- a/test/units/template/test_template_utilities.py +++ b/test/units/template/test_template_utilities.py @@ -18,7 +18,7 @@ from __future__ import annotations import jinja2 -from units.compat import unittest +import unittest from ansible.template import AnsibleUndefined, _escape_backslashes, _count_newlines_from_end diff --git a/test/units/utils/test_vars.py b/test/units/utils/test_vars.py index 2a0f9d1dbb8..11b01d13e3f 100644 --- a/test/units/utils/test_vars.py +++ b/test/units/utils/test_vars.py @@ -22,7 +22,7 @@ from collections import defaultdict from unittest import mock -from units.compat import unittest +import unittest from ansible.errors import AnsibleError from ansible.utils.vars import combine_vars, merge_hash from ansible.vars.manager import VarsWithSources diff --git a/test/units/vars/test_variable_manager.py b/test/units/vars/test_variable_manager.py index c2649539fc6..a6feb82bd21 100644 --- a/test/units/vars/test_variable_manager.py +++ b/test/units/vars/test_variable_manager.py @@ -19,7 +19,7 @@ from __future__ import annotations import os -from units.compat import unittest +import unittest from unittest.mock import MagicMock, patch from ansible.inventory.manager import InventoryManager from ansible.module_utils.six import iteritems