Remove Python 2.x compat from unit tests (#82109)

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/',

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:

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

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

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
 
 

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

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
 

test/units/compat/mock.py

@@ -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,
-    )

test/units/compat/unittest.py

@@ -1,27 +0,0 @@
-# (c) 2014, Toshio Kuratomi <tkuratomi@ansible.com>
-#
-# 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 <http://www.gnu.org/licenses/>.
-
-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

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

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

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

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

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

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

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

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

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
 

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

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__

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__

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
 
 

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__

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

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
 

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

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

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

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
 

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
 

test/units/module_utils/facts/base.py

@@ -17,8 +17,8 @@
 
 from __future__ import annotations
 
-from units.compat import unittest
+import unittest
-from units.compat.mock import Mock, patch
+from unittest.mock import Mock, patch
 
 
 class BaseFactsTest(unittest.TestCase):

test/units/module_utils/facts/hardware/test_linux.py

@@ -17,8 +17,8 @@ from __future__ import annotations
 
 import os
 
-from units.compat import unittest
+import unittest
-from units.compat.mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from ansible.module_utils.facts import timeout
 

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

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 unittest.mock import Mock
-from units.compat import unittest
+import unittest
 
 from ansible.module_utils.facts.network import generic_bsd
 

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

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 unittest.mock import Mock
-from units.compat import unittest
+import unittest
 from ansible.module_utils.facts.network import linux
 
 # ip -4 route show table local

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
 

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
 

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

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
 

test/units/module_utils/facts/test_ansible_collector.py

@@ -18,8 +18,8 @@
 from __future__ import annotations
 
 # for testing
-from units.compat import unittest
+import unittest
-from units.compat.mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from ansible.module_utils.facts import collector
 from ansible.module_utils.facts import ansible_collector

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
 

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
 

test/units/module_utils/facts/test_facts.py

@@ -23,8 +23,8 @@ import os
 import pytest
 
 # for testing
-from units.compat import unittest
+import unittest
-from units.compat.mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from ansible.module_utils import facts
 from ansible.module_utils.facts import hardware

test/units/module_utils/facts/test_sysctl.py

@@ -19,8 +19,8 @@
 from __future__ import annotations
 
 # for testing
-from units.compat import unittest
+import unittest
-from units.compat.mock import MagicMock
+from unittest.mock import MagicMock
 
 from ansible.module_utils.facts.sysctl import get_sysctl
 

test/units/module_utils/facts/test_utils.py

@@ -15,8 +15,8 @@
 
 from __future__ import annotations
 
-from units.compat import unittest
+import unittest
-from units.compat.mock import patch
+from unittest.mock import patch
 
 from ansible.module_utils.facts import utils
 

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
 
 

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

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):

test/units/modules/test_apt.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 
 import collections
 
-from units.compat.mock import Mock
+from unittest.mock import Mock
-from units.compat import unittest
+import unittest
 
 from ansible.modules.apt import (
     expand_pkgspec_from_fnmatches,

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 unittest.mock import patch, Mock
-from units.compat import unittest
+import unittest
 
 from ansible.modules import apt_key
 

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

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

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
 

test/units/modules/test_service_facts.py

@@ -4,8 +4,8 @@
 
 from __future__ import annotations
 
-from units.compat import unittest
+import unittest
-from units.compat.mock import patch
+from unittest.mock import patch
 
 from ansible.module_utils import basic
 from ansible.modules.service_facts import AIXScanService

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
 
 

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
 

test/units/modules/utils.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 
 import json
 
-from units.compat import unittest
+import unittest
-from units.compat.mock import patch
+from unittest.mock import patch
 from ansible.module_utils import basic
 from ansible.module_utils.common.text.converters import to_bytes
 

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

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
 
 

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

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

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

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

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
 

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

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

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
 
 

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

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
 

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
 

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
 

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

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
 

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

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

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

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

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

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

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

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
 

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

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

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
 
 

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
 
 

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

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

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
 

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
 

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

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
 

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

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