Move unit test compat code out of lib/ansible/. (#46996)

* Move ansible.compat.tests to test/units/compat/.
* Fix unit test references to ansible.compat.tests.
* Move builtins compat to separate file.
* Fix classification of test/units/compat/ dir.

test/runner/lib/classification.py

@@ -614,6 +614,11 @@ class PathMapper(object):
                     'units': path,
                 }
 
+            if path.startswith('test/units/compat/'):
+                return {
+                    'units': 'test/units/',
+                }
+
             # changes to files which are not unit tests should trigger tests from the nearest parent directory
 
             test_path = os.path.dirname(path)

test/units/cli/test_cli.py

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

test/units/cli/test_console.py

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

test/units/cli/test_galaxy.py

@@ -27,8 +27,8 @@ import tempfile
 import yaml
 
 from ansible.cli.galaxy import GalaxyCLI
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import call, patch
+from units.compat import unittest
+from units.compat.mock import call, patch
 from ansible.errors import AnsibleError, AnsibleOptionsError
 from ansible.module_utils.six import PY3
 

test/units/cli/test_playbook.py

@@ -19,7 +19,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible.compat.tests import unittest
+from units.compat import unittest
 from units.mock.loader import DictDataLoader
 
 from ansible.inventory.manager import InventoryManager

test/units/cli/test_vault.py

@@ -19,8 +19,8 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import patch
+from units.compat import unittest
+from units.compat.mock import patch
 from units.mock.vault_helper import TextVaultSecret
 
 from ansible import errors

test/units/compat/builtins.py

@@ -0,0 +1,33 @@
+# (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 for python2.7
+#
+
+# One unittest needs to import builtins via __import__() so we need to have
+# the string that represents it
+try:
+    import __builtin__
+except ImportError:
+    BUILTINS = 'builtins'
+else:
+    BUILTINS = '__builtin__'

test/units/compat/mock.py

@@ -0,0 +1,122 @@
+# (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')
+
+
+# Prior to 3.4.4, mock_open cannot handle binary read_data
+if sys.version_info >= (3,) and sys.version_info < (3, 4, 4):
+    file_spec = None
+
+    def _iterate_read_data(read_data):
+        # Helper for mock_open:
+        # Retrieve lines from read_data via a generator so that separate calls to
+        # readline, read, and readlines are properly interleaved
+        sep = b'\n' if isinstance(read_data, bytes) else '\n'
+        data_as_list = [l + sep for l in read_data.split(sep)]
+
+        if data_as_list[-1] == sep:
+            # If the last line ended in a newline, the list comprehension will have an
+            # extra entry that's just a newline.  Remove this.
+            data_as_list = data_as_list[:-1]
+        else:
+            # If there wasn't an extra newline by itself, then the file being
+            # emulated doesn't have a newline to end the last line  remove the
+            # newline that our naive format() added
+            data_as_list[-1] = data_as_list[-1][:-1]
+
+        for line in data_as_list:
+            yield line
+
+    def mock_open(mock=None, read_data=''):
+        """
+        A helper function to create a mock to replace the use of `open`. It works
+        for `open` called directly or used as a context manager.
+
+        The `mock` argument is the mock object to configure. If `None` (the
+        default) then a `MagicMock` will be created for you, with the API limited
+        to methods or attributes available on standard file handles.
+
+        `read_data` is a string for the `read` methoddline`, and `readlines` of the
+        file handle to return.  This is an empty string by default.
+        """
+        def _readlines_side_effect(*args, **kwargs):
+            if handle.readlines.return_value is not None:
+                return handle.readlines.return_value
+            return list(_data)
+
+        def _read_side_effect(*args, **kwargs):
+            if handle.read.return_value is not None:
+                return handle.read.return_value
+            return type(read_data)().join(_data)
+
+        def _readline_side_effect():
+            if handle.readline.return_value is not None:
+                while True:
+                    yield handle.readline.return_value
+            for line in _data:
+                yield line
+
+        global file_spec
+        if file_spec is None:
+            import _io
+            file_spec = list(set(dir(_io.TextIOWrapper)).union(set(dir(_io.BytesIO))))
+
+        if mock is None:
+            mock = MagicMock(name='open', spec=open)
+
+        handle = MagicMock(spec=file_spec)
+        handle.__enter__.return_value = handle
+
+        _data = _iterate_read_data(read_data)
+
+        handle.write.return_value = None
+        handle.read.return_value = None
+        handle.readline.return_value = None
+        handle.readlines.return_value = None
+
+        handle.read.side_effect = _read_side_effect
+        handle.readline.side_effect = _readline_side_effect()
+        handle.readlines.side_effect = _readlines_side_effect
+
+        mock.return_value = handle
+        return mock

test/units/compat/unittest.py

@@ -0,0 +1,38 @@
+# (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 Python2.7's unittest module
+'''
+
+import sys
+
+# 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
+if sys.version_info < (2, 7):
+    try:
+        # Need unittest2 on python2.6
+        from unittest2 import *
+    except ImportError:
+        print('You need unittest2 installed on python2.6.x to run tests')
+else:
+    from unittest import *

test/units/config/test_data.py

@@ -2,7 +2,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible.compat.tests import unittest
+from units.compat import unittest
 
 from ansible.config.data import ConfigData
 from ansible.config.manager import Setting

test/units/config/test_manager.py

@@ -5,7 +5,7 @@ __metaclass__ = type
 import os
 import os.path
 
-from ansible.compat.tests import unittest
+from units.compat import unittest
 
 from ansible.config.manager import ConfigManager, Setting, ensure_type, resolve_path, find_ini_config_file
 

test/units/errors/test_errors.py

@@ -20,8 +20,9 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 
-from ansible.compat.tests import BUILTINS, unittest
-from ansible.compat.tests.mock import mock_open, patch
+from units.compat import unittest
+from units.compat.builtins import BUILTINS
+from units.compat.mock import mock_open, patch
 from ansible.errors import AnsibleError
 from ansible.parsing.yaml.objects import AnsibleBaseYAMLObject
 

test/units/executor/test_play_iterator.py

@@ -19,8 +19,8 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import patch, MagicMock
+from units.compat import unittest
+from units.compat.mock import patch, MagicMock
 
 from ansible.errors import AnsibleError, AnsibleParserError
 from ansible.executor.play_iterator import HostState, PlayIterator

test/units/executor/test_playbook_executor.py

@@ -19,8 +19,8 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import MagicMock
+from units.compat import unittest
+from units.compat.mock import MagicMock
 from ansible.executor.playbook_executor import PlaybookExecutor
 from ansible.playbook import Playbook
 from ansible.template import Templar

test/units/executor/test_task_executor.py

@@ -19,8 +19,8 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import patch, MagicMock
+from units.compat import unittest
+from units.compat.mock import patch, MagicMock
 from ansible.errors import AnsibleError, AnsibleParserError
 from ansible.executor.task_executor import TaskExecutor, remove_omit
 from ansible.playbook.play_context import PlayContext

test/units/executor/test_task_queue_manager_callbacks.py

@@ -18,8 +18,8 @@
 # Make coding more python3-ish
 from __future__ import (absolute_import, division, print_function)
 
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import MagicMock
+from units.compat import unittest
+from units.compat.mock import MagicMock
 from ansible.executor.task_queue_manager import TaskQueueManager
 from ansible.playbook import Playbook
 from ansible.plugins.callback import CallbackBase

test/units/executor/test_task_result.py

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

test/units/mock/path.py

@@ -1,4 +1,4 @@
-from ansible.compat.tests.mock import MagicMock
+from units.compat.mock import MagicMock
 from ansible.utils.path import unfrackpath
 
 

test/units/mock/procenv.py

@@ -25,7 +25,7 @@ import json
 
 from contextlib import contextmanager
 from io import BytesIO, StringIO
-from ansible.compat.tests import unittest
+from units.compat import unittest
 from ansible.module_utils.six import PY3
 from ansible.module_utils._text import to_bytes
 

test/units/module_utils/aws/test_aws_module.py

@@ -23,7 +23,7 @@ import unittest
 from ansible.module_utils import basic
 from ansible.module_utils.aws.core import AnsibleAWSModule
 from ansible.module_utils._text import to_bytes
-from ansible.compat.tests.mock import Mock, patch
+from units.compat.mock import Mock, patch
 import json
 
 importorskip("boto3")

test/units/module_utils/basic/test_argument_spec.py

@@ -12,7 +12,7 @@ import os
 
 import pytest
 
-from ansible.compat.tests.mock import MagicMock, patch
+from units.compat.mock import MagicMock, patch
 from ansible.module_utils import basic
 from ansible.module_utils.six import string_types
 from ansible.module_utils.six.moves import builtins

test/units/module_utils/basic/test_filesystem.py

@@ -9,7 +9,7 @@ __metaclass__ = type
 
 from units.mock.procenv import ModuleTestCase
 
-from ansible.compat.tests.mock import patch, MagicMock
+from units.compat.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 ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.module_utils.six.moves import builtins
 
 realimport = builtins.__import__

test/units/module_utils/basic/test_heuristic_log_sanitize.py

@@ -20,7 +20,7 @@
 from __future__ import (absolute_import, division)
 __metaclass__ = type
 
-from ansible.compat.tests import unittest
+from units.compat import unittest
 from ansible.module_utils.basic import heuristic_log_sanitize
 
 

test/units/module_utils/basic/test_imports.py

@@ -11,8 +11,8 @@ import sys
 
 from units.mock.procenv import ModuleTestCase
 
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import patch, MagicMock
+from units.compat import unittest
+from units.compat.mock import patch, MagicMock
 from ansible.module_utils.six.moves import builtins
 
 realimport = builtins.__import__

test/units/module_utils/basic/test_no_log.py

@@ -6,7 +6,7 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
-from ansible.compat.tests import unittest
+from units.compat import unittest
 
 from ansible.module_utils.basic import return_values, remove_values
 

test/units/module_utils/basic/test_platform_distribution.py

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

test/units/module_utils/basic/test_selinux.py

@@ -12,7 +12,7 @@ import json
 
 from units.mock.procenv import ModuleTestCase, swap_stdin_and_argv
 
-from ansible.compat.tests.mock import patch, MagicMock, mock_open, Mock
+from units.compat.mock import patch, MagicMock, mock_open, Mock
 from ansible.module_utils.six.moves import builtins
 
 realimport = builtins.__import__

test/units/module_utils/basic/test_tmpdir.py

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

test/units/module_utils/cloud/test_backoff.py

@@ -1,6 +1,6 @@
 import random
 
-from ansible.compat.tests import unittest
+from units.compat import unittest
 from ansible.module_utils.cloud import _exponential_backoff, \
     _full_jitter_backoff
 

test/units/module_utils/common/test_dict_transformations.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-from ansible.compat.tests import unittest
+from units.compat import unittest
 from ansible.module_utils.common.dict_transformations import _camel_to_snake, _snake_to_camel, camel_dict_to_snake_dict, dict_merge
 
 EXPECTED_SNAKIFICATION = {

test/units/module_utils/ec2/test_aws.py

@@ -25,7 +25,7 @@ except:
 
 from nose.plugins.skip import SkipTest
 
-from ansible.compat.tests import unittest
+from units.compat import unittest
 from ansible.module_utils.ec2 import AWSRetry
 
 if not HAS_BOTO3:

test/units/module_utils/facts/base.py

@@ -19,8 +19,8 @@
 from __future__ import (absolute_import, division)
 __metaclass__ = type
 
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import Mock
+from units.compat import unittest
+from units.compat.mock import Mock
 
 
 class BaseFactsTest(unittest.TestCase):

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

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

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

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

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

@@ -19,7 +19,7 @@
 from __future__ import (absolute_import, division)
 __metaclass__ = type
 
-from ansible.compat.tests.mock import Mock, patch
+from units.compat.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)
 __metaclass__ = type
 
-from ansible.compat.tests.mock import Mock, patch
+from units.compat.mock import Mock, patch
 
 from .. base import BaseFactsTest
 

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

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

test/units/module_utils/facts/test_ansible_collector.py

@@ -20,8 +20,8 @@ from __future__ import (absolute_import, division)
 __metaclass__ = type
 
 # for testing
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import Mock, patch
+from units.compat import unittest
+from units.compat.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

@@ -24,7 +24,7 @@ from collections import defaultdict
 import pprint
 
 # for testing
-from ansible.compat.tests import unittest
+from units.compat import unittest
 
 from ansible.module_utils.facts import collector
 

test/units/module_utils/facts/test_collectors.py

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

test/units/module_utils/facts/test_facts.py

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

test/units/module_utils/facts/test_timeout.py

@@ -24,8 +24,8 @@ import time
 
 import pytest
 
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import patch, MagicMock
+from units.compat import unittest
+from units.compat.mock import patch, MagicMock
 
 from ansible.module_utils.facts import timeout
 

test/units/module_utils/facts/test_utils.py

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

test/units/module_utils/gcp/test_auth.py

@@ -20,7 +20,7 @@ import sys
 
 import pytest
 
-from ansible.compat.tests import mock, unittest
+from units.compat import mock, unittest
 from ansible.module_utils.gcp import (_get_gcp_ansible_credentials, _get_gcp_credentials, _get_gcp_environ_var,
                                       _get_gcp_environment_credentials,
                                       _validate_credentials_file)

test/units/module_utils/gcp/test_gcp_utils.py

@@ -18,7 +18,7 @@
 import os
 import sys
 
-from ansible.compat.tests import mock, unittest
+from units.compat import mock, unittest
 from ansible.module_utils.gcp_utils import GcpRequest
 
 

test/units/module_utils/gcp/test_utils.py

@@ -18,7 +18,7 @@
 import os
 import sys
 
-from ansible.compat.tests import mock, unittest
+from units.compat import mock, unittest
 from ansible.module_utils.gcp import check_min_pkg_version, GCPUtils, GCPInvalidURLError
 
 

test/units/module_utils/json_utils/test_filter_non_json_lines.py

@@ -22,7 +22,7 @@ __metaclass__ = type
 
 import json
 
-from ansible.compat.tests import unittest
+from units.compat import unittest
 from ansible.module_utils.json_utils import _filter_non_json_lines
 
 

test/units/module_utils/net_tools/nios/test_api.py

@@ -7,8 +7,8 @@ __metaclass__ = type
 import sys
 import copy
 
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import patch, MagicMock, Mock
+from units.compat import unittest
+from units.compat.mock import patch, MagicMock, Mock
 from ansible.module_utils.net_tools.nios import api
 
 

test/units/module_utils/network/aci/test_aci.py

@@ -20,7 +20,7 @@
 
 import sys
 
-from ansible.compat.tests import unittest
+from units.compat import unittest
 from ansible.module_utils.network.aci.aci import ACIModule
 from ansible.module_utils.six import PY2, PY3
 from ansible.module_utils._text import to_native

test/units/module_utils/network/common/test_parsing.py

@@ -20,7 +20,7 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
-from ansible.compat.tests import unittest
+from units.compat import unittest
 from ansible.module_utils.network.common.parsing import Conditional
 
 test_results = ['result_1', 'result_2', 'result_3']

test/units/module_utils/network/ftd/test_configuration.py

@@ -16,8 +16,8 @@
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from ansible.compat.tests import mock
-from ansible.compat.tests.mock import call, patch
+from units.compat import mock
+from units.compat.mock import call, patch
 from ansible.module_utils.network.ftd.configuration import iterate_over_pageable_resource, BaseConfigurationResource
 
 

test/units/module_utils/network/nos/test_nos.py

@@ -24,7 +24,7 @@ import json
 
 from mock import MagicMock, patch, call
 
-from ansible.compat.tests import unittest
+from units.compat import unittest
 from ansible.module_utils.network.nos import nos
 
 

test/units/module_utils/network/nso/test_nso.py

@@ -20,8 +20,8 @@ from __future__ import (absolute_import, division, print_function)
 
 import json
 
-from ansible.compat.tests.mock import patch
-from ansible.compat.tests import unittest
+from units.compat.mock import patch
+from units.compat import unittest
 from ansible.module_utils.network.nso import nso
 
 

test/units/module_utils/network/slxos/test_slxos.py

@@ -24,7 +24,7 @@ import json
 
 from mock import MagicMock, patch, call
 
-from ansible.compat.tests import unittest
+from units.compat import unittest
 from ansible.module_utils.network.slxos import slxos
 
 

test/units/module_utils/test_postgresql.py

@@ -3,8 +3,8 @@
 
 import sys
 
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import patch, MagicMock
+from units.compat import unittest
+from units.compat.mock import patch, MagicMock
 
 from ansible.module_utils.six.moves import builtins
 from ansible.module_utils._text import to_native

test/units/modules/cloud/amazon/test_lambda.py

@@ -22,7 +22,7 @@ from __future__ import (absolute_import, division, print_function)
 import copy
 import pytest
 
-from ansible.compat.tests.mock import MagicMock, Mock, patch
+from units.compat.mock import MagicMock, Mock, patch
 from ansible.module_utils import basic
 from units.modules.utils import set_module_args
 

test/units/modules/cloud/amazon/test_lambda_policy.py

@@ -24,7 +24,7 @@ import copy
 import pytest
 
 from ansible.module_utils.aws.core import HAS_BOTO3
-from ansible.compat.tests.mock import MagicMock
+from units.compat.mock import MagicMock
 from units.modules.utils import set_module_args
 
 if not HAS_BOTO3:

test/units/modules/monitoring/test_circonus_annotation.py

@@ -6,7 +6,7 @@ import re
 import uuid
 from urllib3.response import HTTPResponse
 
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.module_utils import basic
 from ansible.module_utils._text import to_bytes
 from ansible.modules.monitoring import circonus_annotation

test/units/modules/monitoring/test_icinga2_feature.py

@@ -7,7 +7,7 @@
 
 from ansible.modules.monitoring import icinga2_feature
 from units.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.module_utils import basic
 
 

test/units/modules/monitoring/test_pagerduty.py

@@ -1,4 +1,4 @@
-from ansible.compat.tests import unittest
+from units.compat import unittest
 from ansible.modules.monitoring import pagerduty
 
 import json

test/units/modules/monitoring/test_pagerduty_alert.py

@@ -1,4 +1,4 @@
-from ansible.compat.tests import unittest
+from units.compat import unittest
 from ansible.modules.monitoring import pagerduty_alert
 
 from ansible.module_utils.six.moves.urllib.parse import urlparse, urlencode, urlunparse

test/units/modules/net_tools/nios/test_nios_a_record.py

@@ -22,7 +22,7 @@ __metaclass__ = type
 
 from ansible.modules.net_tools.nios import nios_a_record
 from ansible.module_utils.net_tools.nios import api
-from ansible.compat.tests.mock import patch, MagicMock, Mock
+from units.compat.mock import patch, MagicMock, Mock
 from .test_nios_module import TestNiosModule, load_fixture
 
 

test/units/modules/net_tools/nios/test_nios_aaaa_record.py

@@ -22,7 +22,7 @@ __metaclass__ = type
 
 from ansible.modules.net_tools.nios import nios_aaaa_record
 from ansible.module_utils.net_tools.nios import api
-from ansible.compat.tests.mock import patch, MagicMock, Mock
+from units.compat.mock import patch, MagicMock, Mock
 from .test_nios_module import TestNiosModule, load_fixture
 
 

test/units/modules/net_tools/nios/test_nios_cname_record.py

@@ -22,7 +22,7 @@ __metaclass__ = type
 
 from ansible.modules.net_tools.nios import nios_cname_record
 from ansible.module_utils.net_tools.nios import api
-from ansible.compat.tests.mock import patch, MagicMock, Mock
+from units.compat.mock import patch, MagicMock, Mock
 from .test_nios_module import TestNiosModule, load_fixture
 
 

test/units/modules/net_tools/nios/test_nios_dns_view.py

@@ -22,7 +22,7 @@ __metaclass__ = type
 
 from ansible.modules.net_tools.nios import nios_dns_view
 from ansible.module_utils.net_tools.nios import api
-from ansible.compat.tests.mock import patch, MagicMock, Mock
+from units.compat.mock import patch, MagicMock, Mock
 from .test_nios_module import TestNiosModule, load_fixture
 
 

test/units/modules/net_tools/nios/test_nios_host_record.py

@@ -21,7 +21,7 @@ __metaclass__ = type
 from ansible.modules.net_tools.nios import nios_host_record
 from ansible.module_utils.net_tools.nios import api
 from units.modules.utils import set_module_args
-from ansible.compat.tests.mock import patch, MagicMock, Mock
+from units.compat.mock import patch, MagicMock, Mock
 from .test_nios_module import TestNiosModule, load_fixture
 
 

test/units/modules/net_tools/nios/test_nios_mx_record.py

@@ -22,7 +22,7 @@ __metaclass__ = type
 
 from ansible.modules.net_tools.nios import nios_mx_record
 from ansible.module_utils.net_tools.nios import api
-from ansible.compat.tests.mock import patch, MagicMock, Mock
+from units.compat.mock import patch, MagicMock, Mock
 from .test_nios_module import TestNiosModule, load_fixture
 
 

test/units/modules/net_tools/nios/test_nios_naptr_record.py

@@ -22,7 +22,7 @@ __metaclass__ = type
 
 from ansible.modules.net_tools.nios import nios_naptr_record
 from ansible.module_utils.net_tools.nios import api
-from ansible.compat.tests.mock import patch, MagicMock, Mock
+from units.compat.mock import patch, MagicMock, Mock
 from .test_nios_module import TestNiosModule, load_fixture
 
 

test/units/modules/net_tools/nios/test_nios_network.py

@@ -20,7 +20,7 @@ __metaclass__ = type
 
 from ansible.module_utils.net_tools.nios import api
 from ansible.modules.net_tools.nios import nios_network
-from ansible.compat.tests.mock import patch, MagicMock, Mock
+from units.compat.mock import patch, MagicMock, Mock
 from units.modules.utils import set_module_args
 from .test_nios_module import TestNiosModule, load_fixture
 

test/units/modules/net_tools/nios/test_nios_network_view.py

@@ -22,7 +22,7 @@ __metaclass__ = type
 
 from ansible.modules.net_tools.nios import nios_network_view
 from ansible.module_utils.net_tools.nios import api
-from ansible.compat.tests.mock import patch, MagicMock, Mock
+from units.compat.mock import patch, MagicMock, Mock
 from .test_nios_module import TestNiosModule, load_fixture
 
 

test/units/modules/net_tools/nios/test_nios_ptr_record.py

@@ -20,7 +20,7 @@ __metaclass__ = type
 
 from ansible.modules.net_tools.nios import nios_ptr_record
 from ansible.module_utils.net_tools.nios import api
-from ansible.compat.tests.mock import patch, MagicMock, Mock
+from units.compat.mock import patch, MagicMock, Mock
 from .test_nios_module import TestNiosModule, load_fixture
 
 

test/units/modules/net_tools/nios/test_nios_srv_record.py

@@ -22,7 +22,7 @@ __metaclass__ = type
 
 from ansible.modules.net_tools.nios import nios_srv_record
 from ansible.module_utils.net_tools.nios import api
-from ansible.compat.tests.mock import patch, MagicMock, Mock
+from units.compat.mock import patch, MagicMock, Mock
 from .test_nios_module import TestNiosModule, load_fixture
 
 

test/units/modules/net_tools/nios/test_nios_zone.py

@@ -22,7 +22,7 @@ __metaclass__ = type
 
 from ansible.modules.net_tools.nios import nios_zone
 from ansible.module_utils.net_tools.nios import api
-from ansible.compat.tests.mock import patch, MagicMock, Mock
+from units.compat.mock import patch, MagicMock, Mock
 from .test_nios_module import TestNiosModule, load_fixture
 
 

test/units/modules/network/aireos/test_aireos_command.py

@@ -21,7 +21,7 @@ __metaclass__ = type
 
 import json
 
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.modules.network.aireos import aireos_command
 from units.modules.utils import set_module_args
 from .aireos_module import TestCiscoWlcModule, load_fixture

test/units/modules/network/aireos/test_aireos_config.py

@@ -20,7 +20,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.modules.network.aireos import aireos_config
 from units.modules.utils import set_module_args
 from .aireos_module import TestCiscoWlcModule, load_fixture

test/units/modules/network/aruba/test_aruba_command.py

@@ -21,7 +21,7 @@ __metaclass__ = type
 
 import json
 
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.modules.network.aruba import aruba_command
 from units.modules.utils import set_module_args
 from .aruba_module import TestArubaModule, load_fixture

test/units/modules/network/aruba/test_aruba_config.py

@@ -20,7 +20,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.modules.network.aruba import aruba_config
 from units.modules.utils import set_module_args
 from .aruba_module import TestArubaModule, load_fixture

test/units/modules/network/cloudvision/test_cv_server_provision.py

@@ -14,8 +14,8 @@
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import patch, Mock
+from units.compat import unittest
+from units.compat.mock import patch, Mock
 import sys
 sys.modules['cvprac'] = Mock()
 sys.modules['cvprac.cvp_client'] = Mock()

test/units/modules/network/cnos/cnos_module.py

@@ -23,8 +23,8 @@ import os
 import json
 import tempfile
 
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import patch
+from units.compat import unittest
+from units.compat.mock import patch
 from ansible.module_utils import basic
 from ansible.module_utils._text import to_bytes
 

test/units/modules/network/cnos/test_cnos_bgp.py

@@ -3,7 +3,7 @@ __metaclass__ = type
 
 import json
 import os
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.modules.network.cnos import cnos_bgp
 from units.modules.utils import set_module_args
 from .cnos_module import TestCnosModule, load_fixture

test/units/modules/network/cnos/test_cnos_command.py

@@ -21,7 +21,7 @@ __metaclass__ = type
 
 import json
 
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.modules.network.cnos import cnos_command
 from units.modules.utils import set_module_args
 from .cnos_module import TestCnosModule, load_fixture

test/units/modules/network/cnos/test_cnos_config.py

@@ -22,7 +22,7 @@ __metaclass__ = type
 
 import json
 
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.modules.network.cnos import cnos_config
 
 from .cnos_module import TestCnosModule, load_fixture

test/units/modules/network/cnos/test_cnos_ethernet.py

@@ -3,7 +3,7 @@ __metaclass__ = type
 
 import json
 import os
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.modules.network.cnos import cnos_interface
 from units.modules.utils import set_module_args
 from .cnos_module import TestCnosModule, load_fixture

test/units/modules/network/cnos/test_cnos_facts.py

@@ -21,7 +21,7 @@ __metaclass__ = type
 
 import json
 
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from .cnos_module import TestCnosModule, load_fixture
 from ansible.modules.network.cnos import cnos_facts
 from units.modules.utils import set_module_args

test/units/modules/network/cnos/test_cnos_portchannel.py

@@ -3,7 +3,7 @@ __metaclass__ = type
 
 import json
 import os
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.modules.network.cnos import cnos_portchannel
 from units.modules.utils import set_module_args
 from .cnos_module import TestCnosModule, load_fixture

test/units/modules/network/cnos/test_cnos_vlag.py

@@ -3,7 +3,7 @@ __metaclass__ = type
 
 import json
 import os
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.modules.network.cnos import cnos_vlag
 from units.modules.utils import set_module_args
 from .cnos_module import TestCnosModule, load_fixture

test/units/modules/network/cnos/test_cnos_vlan.py

@@ -3,7 +3,7 @@ __metaclass__ = type
 
 import json
 import os
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.modules.network.cnos import cnos_vlan
 from units.modules.utils import set_module_args
 from .cnos_module import TestCnosModule, load_fixture

test/units/modules/network/dellos10/test_dellos10_command.py

@@ -23,7 +23,7 @@ __metaclass__ = type
 
 import json
 
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.modules.network.dellos10 import dellos10_command
 from units.modules.utils import set_module_args
 from .dellos10_module import TestDellos10Module, load_fixture

test/units/modules/network/dellos10/test_dellos10_config.py

@@ -22,7 +22,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.modules.network.dellos10 import dellos10_config
 from units.modules.utils import set_module_args
 from .dellos10_module import TestDellos10Module, load_fixture

test/units/modules/network/dellos10/test_dellos10_facts.py

@@ -23,7 +23,7 @@ __metaclass__ = type
 
 import json
 
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from units.modules.utils import set_module_args
 from .dellos10_module import TestDellos10Module, load_fixture
 from ansible.modules.network.dellos10 import dellos10_facts

test/units/modules/network/dellos6/test_dellos6_command.py

@@ -21,7 +21,7 @@ __metaclass__ = type
 
 import json
 
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.modules.network.dellos6 import dellos6_command
 from units.modules.utils import set_module_args
 from .dellos6_module import TestDellos6Module, load_fixture

test/units/modules/network/dellos6/test_dellos6_config.py

@@ -20,7 +20,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.modules.network.dellos6 import dellos6_config
 from units.modules.utils import set_module_args
 from .dellos6_module import TestDellos6Module, load_fixture

test/units/modules/network/dellos6/test_dellos6_facts.py

@@ -21,7 +21,7 @@ __metaclass__ = type
 
 import json
 
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from units.modules.utils import set_module_args
 from .dellos6_module import TestDellos6Module, load_fixture
 from ansible.modules.network.dellos6 import dellos6_facts

test/units/modules/network/dellos9/test_dellos9_command.py

@@ -23,7 +23,7 @@ __metaclass__ = type
 
 import json
 
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.modules.network.dellos9 import dellos9_command
 from units.modules.utils import set_module_args
 from .dellos9_module import TestDellos9Module, load_fixture

test/units/modules/network/dellos9/test_dellos9_config.py

@@ -22,7 +22,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.modules.network.dellos9 import dellos9_config
 from units.modules.utils import set_module_args
 from .dellos9_module import TestDellos9Module, load_fixture

test/units/modules/network/dellos9/test_dellos9_facts.py

@@ -21,7 +21,7 @@ __metaclass__ = type
 
 import json
 
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from units.modules.utils import set_module_args
 from .dellos9_module import TestDellos9Module, load_fixture
 from ansible.modules.network.dellos9 import dellos9_facts

test/units/modules/network/edgeos/test_edgeos_command.py

@@ -21,7 +21,7 @@ __metaclass__ = type
 
 import json
 
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.modules.network.edgeos import edgeos_command
 from units.modules.utils import set_module_args
 from .edgeos_module import TestEdgeosModule, load_fixture

test/units/modules/network/edgeos/test_edgeos_config.py

@@ -20,7 +20,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible.compat.tests.mock import patch
+from units.compat.mock import patch
 from ansible.modules.network.edgeos import edgeos_config
 from units.modules.utils import set_module_args
 from .edgeos_module import TestEdgeosModule, load_fixture