Remove obsolete units.compat.mock compat layer. (#77118)

* Remove obsolete units.compat.mock compat layer.
* Update remaining units.compat.mock references.

test/units/_vendor/test_vendor.py

@@ -9,7 +9,7 @@ import pkgutil
 import pytest
 import sys
 
-from units.compat.mock import MagicMock, NonCallableMagicMock, patch
+from mock import MagicMock, NonCallableMagicMock, patch
 
 
 def reset_internal_vendor_package():

test/units/cli/test_cli.py

@@ -20,7 +20,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 from units.compat import unittest
-from units.compat.mock import patch, MagicMock
+from mock import patch, MagicMock
 
 from units.mock.loader import DictDataLoader
 

test/units/cli/test_console.py

@@ -20,7 +20,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 from units.compat import unittest
-from units.compat.mock import patch
+from mock import patch
 
 from ansible.cli.console import ConsoleCLI
 

test/units/cli/test_galaxy.py

@@ -41,7 +41,7 @@ from ansible.module_utils._text 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
-from units.compat.mock import patch, MagicMock
+from mock import patch, MagicMock
 
 
 @pytest.fixture(autouse='function')

test/units/cli/test_vault.py

@@ -24,7 +24,7 @@ import os
 import pytest
 
 from units.compat import unittest
-from units.compat.mock import patch, MagicMock
+from mock import patch, MagicMock
 from units.mock.vault_helper import TextVaultSecret
 
 from ansible import context, errors

test/units/compat/mock.py

@@ -1,43 +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/>.
-
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-'''
-Compat module for Python3.x's unittest.mock module
-'''
-import sys
-
-# Python 2.7
-
-# Note: Could use the pypi mock library on python3.x as well as python2.x.  It
-# is the same as the python3 stdlib mock library
-
-try:
-    # Allow wildcard import because we really do want to import all of mock's
-    # symbols into this compat shim
-    # pylint: disable=wildcard-import,unused-wildcard-import
-    from unittest.mock import *
-except ImportError:
-    # Python 2
-    # pylint: disable=wildcard-import,unused-wildcard-import
-    try:
-        from mock import *
-    except ImportError:
-        print('You need the mock library installed on python2.x to run tests')

test/units/errors/test_errors.py

@@ -21,7 +21,7 @@ __metaclass__ = type
 
 
 from units.compat import unittest
-from units.compat.mock import mock_open, patch
+from mock import mock_open, patch
 from ansible.errors import AnsibleError
 from ansible.parsing.yaml.objects import AnsibleBaseYAMLObject
 

test/units/executor/test_interpreter_discovery.py

@@ -6,7 +6,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from units.compat.mock import MagicMock
+from mock import MagicMock
 
 from ansible.executor.interpreter_discovery import discover_interpreter
 from ansible.module_utils._text import to_text

test/units/executor/test_play_iterator.py

@@ -20,7 +20,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 from units.compat import unittest
-from units.compat.mock import patch, MagicMock
+from mock import patch, MagicMock
 
 from ansible.executor.play_iterator import HostState, PlayIterator, IteratingStates, FailedStates
 from ansible.playbook import Playbook

test/units/executor/test_playbook_executor.py

@@ -20,7 +20,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 from units.compat import unittest
-from units.compat.mock import MagicMock
+from mock import MagicMock
 
 from ansible.executor.playbook_executor import PlaybookExecutor
 from ansible.playbook import Playbook

test/units/executor/test_task_executor.py

@@ -22,7 +22,7 @@ __metaclass__ = type
 import mock
 
 from units.compat import unittest
-from units.compat.mock import patch, MagicMock
+from mock import patch, MagicMock
 from ansible.errors import AnsibleError
 from ansible.executor.task_executor import TaskExecutor, remove_omit
 from ansible.plugins.loader import action_loader, lookup_loader

test/units/executor/test_task_queue_manager_callbacks.py

@@ -19,7 +19,7 @@
 from __future__ import (absolute_import, division, print_function)
 
 from units.compat import unittest
-from units.compat.mock import MagicMock
+from mock import MagicMock
 
 from ansible.executor.task_queue_manager import TaskQueueManager
 from ansible.playbook import Playbook

test/units/executor/test_task_result.py

@@ -20,7 +20,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 from units.compat import unittest
-from units.compat.mock import patch, MagicMock
+from mock import patch, MagicMock
 
 from ansible.executor.task_result import TaskResult
 

test/units/galaxy/test_api.py

@@ -16,7 +16,7 @@ import tempfile
 import time
 
 from io import BytesIO, StringIO
-from units.compat.mock import MagicMock
+from mock import MagicMock
 
 import ansible.constants as C
 from ansible import context

test/units/galaxy/test_collection.py

@@ -15,7 +15,7 @@ import uuid
 
 from hashlib import sha256
 from io import BytesIO
-from units.compat.mock import MagicMock, mock_open, patch
+from mock import MagicMock, mock_open, patch
 
 import ansible.constants as C
 from ansible import context

test/units/galaxy/test_collection_install.py

@@ -17,7 +17,7 @@ import tarfile
 import yaml
 
 from io import BytesIO, StringIO
-from units.compat.mock import MagicMock
+from mock import MagicMock
 
 import ansible.module_utils.six.moves.urllib.error as urllib_error
 

test/units/galaxy/test_token.py

@@ -8,7 +8,7 @@ __metaclass__ = type
 
 import os
 import pytest
-from units.compat.mock import MagicMock
+from mock import MagicMock
 
 import ansible.constants as C
 from ansible.cli.galaxy import GalaxyCLI, SERVER_DEF

test/units/mock/path.py

@@ -1,7 +1,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from units.compat.mock import MagicMock
+from mock import MagicMock
 from ansible.utils.path import unfrackpath
 
 

test/units/module_utils/basic/test_argument_spec.py

@@ -12,7 +12,7 @@ import os
 
 import pytest
 
-from units.compat.mock import MagicMock
+from 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

@@ -9,7 +9,7 @@ __metaclass__ = type
 
 from units.mock.procenv import ModuleTestCase
 
-from units.compat.mock import patch, MagicMock
+from 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

@@ -9,7 +9,7 @@ __metaclass__ = type
 
 from units.mock.procenv import ModuleTestCase
 
-from units.compat.mock import patch
+from mock import patch
 from ansible.module_utils.six.moves import builtins
 
 realimport = builtins.__import__

test/units/module_utils/basic/test_imports.py

@@ -12,7 +12,7 @@ import sys
 from units.mock.procenv import ModuleTestCase
 
 from units.compat import unittest
-from units.compat.mock import patch
+from mock import patch
 from ansible.module_utils.six.moves import builtins
 
 realimport = builtins.__import__

test/units/module_utils/basic/test_platform_distribution.py

@@ -9,7 +9,7 @@ __metaclass__ = type
 
 import pytest
 
-from units.compat.mock import patch
+from mock import patch
 
 from ansible.module_utils.six.moves import builtins
 

test/units/module_utils/basic/test_selinux.py

@@ -11,7 +11,8 @@ import errno
 import json
 import pytest
 
-from ...compat.mock import mock_open, patch
+from mock import mock_open, patch
+
 from ansible.module_utils import basic
 from ansible.module_utils.common.text.converters import to_bytes
 from ansible.module_utils.six.moves import builtins

test/units/module_utils/basic/test_set_cwd.py

@@ -13,7 +13,7 @@ import tempfile
 
 import pytest
 
-from units.compat.mock import patch, MagicMock
+from mock import patch, MagicMock
 from ansible.module_utils._text import to_bytes
 
 from ansible.module_utils import basic

test/units/module_utils/basic/test_tmpdir.py

@@ -13,7 +13,7 @@ import tempfile
 
 import pytest
 
-from units.compat.mock import patch, MagicMock
+from mock import patch, MagicMock
 from ansible.module_utils._text import to_bytes
 
 from ansible.module_utils import basic

test/units/module_utils/common/test_locale.py

@@ -5,7 +5,7 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
-from units.compat.mock import MagicMock
+from mock import MagicMock
 
 from ansible.module_utils.common.locale import get_best_parsable_locale
 

test/units/module_utils/common/test_sys_info.py

@@ -9,7 +9,7 @@ __metaclass__ = type
 
 import pytest
 
-from units.compat.mock import patch
+from mock import patch
 
 from ansible.module_utils.six.moves import builtins
 

test/units/module_utils/facts/base.py

@@ -20,7 +20,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 from units.compat import unittest
-from units.compat.mock import Mock, patch
+from mock import Mock, patch
 
 
 class BaseFactsTest(unittest.TestCase):

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

@@ -19,7 +19,7 @@ __metaclass__ = type
 import os
 
 from units.compat import unittest
-from units.compat.mock import Mock, patch
+from mock import Mock, patch
 
 from ansible.module_utils.facts import timeout
 

test/units/module_utils/facts/network/test_fc_wwn.py

@@ -6,7 +6,7 @@ from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
 from ansible.module_utils.facts.network import fc_wwn
-from units.compat.mock import Mock
+from mock import Mock
 
 
 # AIX lsdev

test/units/module_utils/facts/network/test_generic_bsd.py

@@ -18,7 +18,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from units.compat.mock import Mock
+from mock import Mock
 from units.compat import unittest
 
 from ansible.module_utils.facts.network import generic_bsd

test/units/module_utils/facts/network/test_iscsi_get_initiator.py

@@ -6,7 +6,7 @@ from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
 from ansible.module_utils.facts.network import iscsi
-from units.compat.mock import Mock
+from mock import Mock
 
 
 # AIX # lsattr -E -l iscsi0

test/units/module_utils/facts/other/test_facter.py

@@ -19,7 +19,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from units.compat.mock import Mock, patch
+from mock import Mock, patch
 
 from .. base import BaseFactsTest
 

test/units/module_utils/facts/other/test_ohai.py

@@ -19,7 +19,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from units.compat.mock import Mock, patch
+from mock import Mock, patch
 
 from .. base import BaseFactsTest
 

test/units/module_utils/facts/system/distribution/conftest.py

@@ -8,7 +8,7 @@ __metaclass__ = type
 
 import pytest
 
-from units.compat.mock import Mock
+from mock import Mock
 
 
 @pytest.fixture

test/units/module_utils/facts/system/test_lsb.py

@@ -19,7 +19,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from units.compat.mock import Mock, patch
+from mock import Mock, patch
 
 from .. base import BaseFactsTest
 

test/units/module_utils/facts/test_ansible_collector.py

@@ -21,7 +21,7 @@ __metaclass__ = type
 
 # for testing
 from units.compat import unittest
-from units.compat.mock import Mock, patch
+from 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_collectors.py

@@ -21,7 +21,7 @@ __metaclass__ = type
 
 import pytest
 
-from units.compat.mock import Mock, patch
+from mock import Mock, patch
 
 from . base import BaseFactsTest
 

test/units/module_utils/facts/test_facts.py

@@ -26,7 +26,7 @@ import pytest
 
 # for testing
 from units.compat import unittest
-from units.compat.mock import Mock, patch
+from 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

@@ -26,7 +26,7 @@ import pytest
 
 # for testing
 from units.compat import unittest
-from units.compat.mock import patch, MagicMock, mock_open, Mock
+from mock import patch, MagicMock, mock_open, Mock
 
 from ansible.module_utils.facts.sysctl import get_sysctl
 

test/units/module_utils/facts/test_utils.py

@@ -18,7 +18,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 from units.compat import unittest
-from units.compat.mock import patch
+from mock import patch
 
 from ansible.module_utils.facts import utils
 

test/units/modules/test_apt.py

@@ -4,7 +4,8 @@ __metaclass__ = type
 import collections
 import sys
 
-from units.compat import mock
+import mock
+
 from units.compat import unittest
 
 try:

test/units/modules/test_apt_key.py

@@ -3,7 +3,8 @@ __metaclass__ = type
 
 import os
 
-from units.compat import mock
+import mock
+
 from units.compat import unittest
 
 from ansible.modules import apt_key

test/units/modules/test_async_wrapper.py

@@ -11,7 +11,7 @@ import tempfile
 
 import pytest
 
-from units.compat.mock import patch, MagicMock
+from mock import patch, MagicMock
 from ansible.modules import async_wrapper
 
 from pprint import pprint

test/units/modules/test_hostname.py

@@ -5,7 +5,7 @@ import os
 import shutil
 import tempfile
 
-from units.compat.mock import patch, MagicMock, mock_open
+from mock import patch, MagicMock, mock_open
 from ansible.module_utils import basic
 from ansible.module_utils.common._utils import get_all_subclasses
 from ansible.modules import hostname

test/units/modules/test_iptables.py

@@ -1,7 +1,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from units.compat.mock import patch
+from 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_service_facts.py

@@ -6,7 +6,7 @@ from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
 from units.compat import unittest
-from units.compat.mock import patch
+from mock import patch
 
 from ansible.module_utils import basic
 from ansible.modules.service_facts import AIXScanService

test/units/modules/utils.py

@@ -4,7 +4,7 @@ __metaclass__ = type
 import json
 
 from units.compat import unittest
-from units.compat.mock import patch
+from mock import patch
 from ansible.module_utils import basic
 from ansible.module_utils._text import to_bytes
 

test/units/parsing/test_dataloader.py

@@ -22,7 +22,7 @@ __metaclass__ = type
 import os
 
 from units.compat import unittest
-from units.compat.mock import patch, mock_open
+from mock import patch, mock_open
 from ansible.errors import AnsibleParserError, yaml_strings, AnsibleFileNotFound
 from ansible.parsing.vault import AnsibleVaultError
 from ansible.module_utils._text import to_text

test/units/parsing/vault/test_vault.py

@@ -30,7 +30,7 @@ from binascii import hexlify
 import pytest
 
 from units.compat import unittest
-from units.compat.mock import patch, MagicMock
+from mock import patch, MagicMock
 
 from ansible import errors
 from ansible.module_utils import six

test/units/parsing/vault/test_vault_editor.py

@@ -27,7 +27,7 @@ from io import BytesIO, StringIO
 import pytest
 
 from units.compat import unittest
-from units.compat.mock import patch
+from mock import patch
 
 from ansible import errors
 from ansible.parsing import vault

test/units/playbook/role/test_include_role.py

@@ -20,7 +20,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 from units.compat import unittest
-from units.compat.mock import patch
+from mock import patch
 
 from ansible.playbook import Play
 from ansible.playbook.role_include import IncludeRole

test/units/playbook/role/test_role.py

@@ -20,7 +20,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 from units.compat import unittest
-from units.compat.mock import patch, MagicMock
+from mock import patch, MagicMock
 
 from ansible.errors import AnsibleError, AnsibleParserError
 from ansible.module_utils.common._collections_compat import Container

test/units/playbook/test_conditional.py

@@ -3,7 +3,7 @@ __metaclass__ = type
 
 from units.compat import unittest
 from units.mock.loader import DictDataLoader
-from units.compat.mock import MagicMock
+from mock import MagicMock
 
 from ansible.template import Templar
 from ansible import errors

test/units/playbook/test_helpers.py

@@ -22,7 +22,7 @@ __metaclass__ = type
 import os
 
 from units.compat import unittest
-from units.compat.mock import MagicMock
+from mock import MagicMock
 from units.mock.loader import DictDataLoader
 
 from ansible import errors

test/units/playbook/test_included_file.py

@@ -23,7 +23,7 @@ import os
 
 import pytest
 
-from units.compat.mock import MagicMock
+from mock import MagicMock
 from units.mock.loader import DictDataLoader
 
 from ansible.playbook.block import Block

test/units/playbook/test_task.py

@@ -20,7 +20,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 from units.compat import unittest
-from units.compat.mock import patch
+from mock import patch
 from ansible.playbook.task import Task
 from ansible.parsing.yaml import objects
 from ansible import errors

test/units/plugins/action/test_action.py

@@ -25,7 +25,7 @@ import re
 
 from ansible import constants as C
 from units.compat import unittest
-from units.compat.mock import patch, MagicMock, mock_open
+from mock import patch, MagicMock, mock_open
 
 from ansible.errors import AnsibleError, AnsibleAuthenticationFailure
 from ansible.module_utils.six import text_type

test/units/plugins/action/test_gather_facts.py

@@ -19,7 +19,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 from units.compat import unittest
-from units.compat.mock import MagicMock, patch
+from mock import MagicMock, patch
 
 from ansible import constants as C
 from ansible.playbook.task import Task

test/units/plugins/action/test_raw.py

@@ -22,7 +22,7 @@ import os
 
 from ansible.errors import AnsibleActionFail
 from units.compat import unittest
-from units.compat.mock import MagicMock, Mock
+from mock import MagicMock, Mock
 from ansible.plugins.action.raw import ActionModule
 from ansible.playbook.task import Task
 from ansible.plugins.loader import connection_loader

test/units/plugins/cache/test_cache.py

@@ -23,7 +23,9 @@ import os
 import shutil
 import tempfile
 
-from units.compat import unittest, mock
+import mock
+
+from units.compat import unittest
 from ansible.errors import AnsibleError
 from ansible.plugins.cache import CachePluginAdjudicator
 from ansible.plugins.cache.base import BaseCacheModule

test/units/plugins/callback/test_callback.py

@@ -25,7 +25,7 @@ import textwrap
 import types
 
 from units.compat import unittest
-from units.compat.mock import MagicMock
+from mock import MagicMock
 
 from ansible.executor.task_result import TaskResult
 from ansible.inventory.host import Host

test/units/plugins/connection/test_connection.py

@@ -20,14 +20,8 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 from io import StringIO
-import sys
-import pytest
 
-from units.compat import mock
 from units.compat import unittest
-from units.compat.mock import MagicMock
-from units.compat.mock import patch
-from ansible.errors import AnsibleError
 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_psrp.py

@@ -10,7 +10,7 @@ import pytest
 import sys
 
 from io import StringIO
-from units.compat.mock import MagicMock
+from mock import MagicMock
 
 from ansible.playbook.play_context import PlayContext
 from ansible.plugins.loader import connection_loader

test/units/plugins/connection/test_ssh.py

@@ -27,7 +27,7 @@ import pytest
 from ansible import constants as C
 from ansible.errors import AnsibleAuthenticationFailure
 from units.compat import unittest
-from units.compat.mock import patch, MagicMock, PropertyMock
+from mock import patch, MagicMock, PropertyMock
 from ansible.errors import AnsibleError, AnsibleConnectionFailure, AnsibleFileNotFound
 from ansible.module_utils.compat.selectors import SelectorKey, EVENT_READ
 from ansible.module_utils.six.moves import shlex_quote

test/units/plugins/connection/test_winrm.py

@@ -10,7 +10,7 @@ import pytest
 
 from io import StringIO
 
-from units.compat.mock import MagicMock
+from mock import MagicMock
 from ansible.errors import AnsibleConnectionFailure
 from ansible.module_utils._text import to_bytes
 from ansible.playbook.play_context import PlayContext

test/units/plugins/inventory/test_inventory.py

@@ -22,8 +22,9 @@ __metaclass__ = type
 import string
 import textwrap
 
+import mock
+
 from ansible import constants as C
-from units.compat import mock
 from units.compat import unittest
 from ansible.module_utils.six import string_types
 from ansible.module_utils._text import to_text

test/units/plugins/inventory/test_script.py

@@ -22,11 +22,11 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 import pytest
+import mock
 
 from ansible import constants as C
 from ansible.errors import AnsibleError
 from ansible.plugins.loader import PluginLoader
-from units.compat import mock
 from units.compat import unittest
 from ansible.module_utils._text import to_bytes, to_native
 

test/units/plugins/lookup/test_password.py

@@ -32,7 +32,7 @@ import pytest
 from units.mock.loader import DictDataLoader
 
 from units.compat import unittest
-from units.compat.mock import mock_open, patch
+from mock import mock_open, patch
 from ansible.errors import AnsibleError
 from ansible.module_utils.six import text_type
 from ansible.module_utils.six.moves import builtins

test/units/plugins/strategy/test_linear.py

@@ -7,7 +7,7 @@ __metaclass__ = type
 
 
 from units.compat import unittest
-from units.compat.mock import patch, MagicMock
+from mock import patch, MagicMock
 
 from ansible.executor.play_iterator import PlayIterator
 from ansible.playbook import Playbook

test/units/plugins/strategy/test_strategy.py

@@ -23,7 +23,7 @@ from units.mock.loader import DictDataLoader
 import uuid
 
 from units.compat import unittest
-from units.compat.mock import patch, MagicMock
+from mock import patch, MagicMock
 from ansible.executor.process.worker import WorkerProcess
 from ansible.executor.task_queue_manager import TaskQueueManager
 from ansible.executor.task_result import TaskResult

test/units/plugins/test_plugins.py

@@ -23,7 +23,7 @@ __metaclass__ = type
 import os
 
 from units.compat import unittest
-from units.compat.mock import patch, MagicMock
+from mock import patch, MagicMock
 from ansible.plugins.loader import PluginLoader, PluginPathContext
 
 

test/units/template/test_templar.py

@@ -22,7 +22,7 @@ __metaclass__ = type
 from jinja2.runtime import Context
 
 from units.compat import unittest
-from units.compat.mock import patch
+from mock import patch
 
 from ansible import constants as C
 from ansible.errors import AnsibleError, AnsibleUndefinedVariable

test/units/template/test_vars.py

@@ -20,7 +20,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 from units.compat import unittest
-from units.compat.mock import MagicMock
+from mock import MagicMock
 
 from ansible.template.vars import AnsibleJ2Vars
 

test/units/utils/collection_loader/test_collection_loader.py

@@ -17,7 +17,7 @@ from ansible.utils.collection_loader._collection_finder import (
     _get_collection_name_from_path, _get_collection_role_path, _get_collection_metadata, _iter_modules_impl
 )
 from ansible.utils.collection_loader._collection_config import _EventSource
-from units.compat.mock import MagicMock, NonCallableMagicMock, patch
+from mock import MagicMock, NonCallableMagicMock, patch
 
 
 # fixture to ensure we always clean up the import stuff when we're done

test/units/utils/test_display.py

@@ -5,7 +5,7 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
-from units.compat.mock import MagicMock
+from mock import MagicMock
 
 import pytest
 

test/units/utils/test_vars.py

@@ -22,7 +22,9 @@ __metaclass__ = type
 
 from collections import defaultdict
 
-from units.compat import mock, unittest
+import mock
+
+from units.compat import unittest
 from ansible.errors import AnsibleError
 from ansible.utils.vars import combine_vars, merge_hash
 

test/units/vars/test_variable_manager.py

@@ -22,7 +22,7 @@ __metaclass__ = type
 import os
 
 from units.compat import unittest
-from units.compat.mock import MagicMock, patch
+from mock import MagicMock, patch
 from ansible.inventory.manager import InventoryManager
 from ansible.module_utils.six import iteritems
 from ansible.playbook.play import Play