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/units/plugins/action/test_action.py

@@ -24,8 +24,8 @@ import os
 import re
 
 from ansible import constants as C
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import patch, MagicMock, mock_open
+from units.compat import unittest
+from units.compat.mock import patch, MagicMock, mock_open
 
 from ansible.errors import AnsibleError
 from ansible.module_utils.six import text_type

test/units/plugins/action/test_raw.py

@@ -21,8 +21,8 @@ __metaclass__ = type
 import os
 
 from ansible.errors import AnsibleActionFail
-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.plugins.action.raw import ActionModule
 from ansible.playbook.task import Task
 from ansible.plugins.loader import connection_loader

test/units/plugins/action/test_synchronize.py

@@ -19,7 +19,7 @@ import yaml
 from pprint import pprint
 
 import ansible.plugins
-from ansible.compat.tests.mock import patch, MagicMock
+from units.compat.mock import patch, MagicMock
 from ansible.plugins.action.synchronize import ActionModule
 
 

test/units/plugins/action/test_win_updates.py

@@ -8,7 +8,7 @@ __metaclass__ = type
 
 import pytest
 
-from ansible.compat.tests.mock import patch, MagicMock, mock_open
+from units.compat.mock import patch, MagicMock, mock_open
 from ansible.plugins.action.win_updates import ActionModule
 from ansible.playbook.task import Task
 

test/units/plugins/cache/test_cache.py

@@ -19,7 +19,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible.compat.tests import unittest, mock
+from units.compat import unittest, mock
 from ansible.errors import AnsibleError
 from ansible.plugins.cache import FactCache
 from ansible.plugins.cache.base import BaseCacheModule

test/units/plugins/callback/test_callback.py

@@ -23,8 +23,8 @@ import re
 import textwrap
 import types
 
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import patch, mock_open, MagicMock
+from units.compat import unittest
+from units.compat.mock import patch, mock_open, MagicMock
 
 
 from ansible.plugins.callback import CallbackBase

test/units/plugins/cliconf/test_nos.py

@@ -24,7 +24,7 @@ import json
 
 from mock import MagicMock, call
 
-from ansible.compat.tests import unittest
+from units.compat import unittest
 from ansible.plugins.cliconf import nos
 
 FIXTURE_DIR = b'%s/fixtures/nos' % (

test/units/plugins/cliconf/test_slxos.py

@@ -24,7 +24,7 @@ import json
 
 from mock import MagicMock, call
 
-from ansible.compat.tests import unittest
+from units.compat import unittest
 from ansible.plugins.cliconf import slxos
 
 FIXTURE_DIR = b'%s/fixtures/slxos' % (

test/units/plugins/connection/test_connection.py

@@ -23,10 +23,10 @@ from io import StringIO
 import sys
 import pytest
 
-from ansible.compat.tests import mock
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import MagicMock
-from ansible.compat.tests.mock import patch
+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

test/units/plugins/connection/test_netconf.py

@@ -27,8 +27,8 @@ import pytest
 
 from io import StringIO
 
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import patch, MagicMock, PropertyMock
+from units.compat import unittest
+from units.compat.mock import patch, MagicMock, PropertyMock
 from ansible.errors import AnsibleConnectionFailure
 from ansible.playbook.play_context import PlayContext
 

test/units/plugins/connection/test_network_cli.py

@@ -25,8 +25,8 @@ import json
 
 from io import StringIO
 
-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 AnsibleConnectionFailure
 from ansible.playbook.play_context import PlayContext

test/units/plugins/connection/test_ssh.py

@@ -26,8 +26,8 @@ import pytest
 
 from ansible import constants as C
 from ansible.compat.selectors import SelectorKey, EVENT_READ
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import patch, MagicMock, PropertyMock
+from units.compat import unittest
+from units.compat.mock import patch, MagicMock, PropertyMock
 from ansible.errors import AnsibleError, AnsibleConnectionFailure, AnsibleFileNotFound
 from ansible.module_utils.six.moves import shlex_quote
 from ansible.module_utils._text import to_bytes

test/units/plugins/connection/test_winrm.py

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

test/units/plugins/filter/test_ipaddr.py

@@ -20,7 +20,7 @@ __metaclass__ = type
 import sys
 import pytest
 
-from ansible.compat.tests import unittest
+from units.compat import unittest
 from ansible.errors import AnsibleFilterError
 from ansible.plugins.filter.ipaddr import (ipaddr, _netmask_query, nthhost, next_nth_usable, ipsubnet,
                                            previous_nth_usable, network_in_usable, network_in_network,

test/units/plugins/filter/test_network.py

@@ -22,7 +22,7 @@ import sys
 
 import pytest
 
-from ansible.compat.tests import unittest
+from units.compat import unittest
 from ansible.plugins.filter.network import parse_xml, type5_pw, hash_salt, comp_type5
 from ansible.errors import AnsibleFilterError
 

test/units/plugins/httpapi/test_ftd.py

@@ -22,9 +22,10 @@ from io import BytesIO
 
 from ansible.module_utils.six.moves.urllib.error import HTTPError
 
-from ansible.compat.tests import mock
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import mock_open, patch
+from units.compat import mock
+from units.compat import unittest
+from units.compat.builtins import BUILTINS
+from units.compat.mock import mock_open, patch
 from ansible.errors import AnsibleConnectionFailure
 from ansible.module_utils.connection import ConnectionError
 from ansible.module_utils.network.ftd.common import HTTPMethod, ResponseParams
@@ -32,11 +33,6 @@ from ansible.module_utils.network.ftd.fdm_swagger_client import SpecProp, FdmSwa
 from ansible.module_utils.six import PY3, StringIO
 from ansible.plugins.httpapi.ftd import HttpApi
 
-if PY3:
-    BUILTINS_NAME = 'builtins'
-else:
-    BUILTINS_NAME = '__builtin__'
-
 EXPECTED_BASE_HEADERS = {
     'Accept': 'application/json',
     'Content-Type': 'application/json'
@@ -191,7 +187,7 @@ class TestFtdHttpApi(unittest.TestCase):
         self.connection_mock.send.return_value = self._connection_response('File content')
 
         open_mock = mock_open()
-        with patch('%s.open' % BUILTINS_NAME, open_mock):
+        with patch('%s.open' % BUILTINS, open_mock):
             self.ftd_plugin.download_file('/files/1', '/tmp/test.txt')
 
         open_mock.assert_called_once_with('/tmp/test.txt', 'wb')
@@ -206,7 +202,7 @@ class TestFtdHttpApi(unittest.TestCase):
         self.connection_mock.send.return_value = response, response_data
 
         open_mock = mock_open()
-        with patch('%s.open' % BUILTINS_NAME, open_mock):
+        with patch('%s.open' % BUILTINS, open_mock):
             self.ftd_plugin.download_file('/files/1', '/tmp/')
 
         open_mock.assert_called_once_with('/tmp/%s' % filename, 'wb')
@@ -219,7 +215,7 @@ class TestFtdHttpApi(unittest.TestCase):
         self.connection_mock.send.return_value = self._connection_response({'id': '123'})
 
         open_mock = mock_open()
-        with patch('%s.open' % BUILTINS_NAME, open_mock):
+        with patch('%s.open' % BUILTINS, open_mock):
             resp = self.ftd_plugin.upload_file('/tmp/test.txt', '/files')
 
         assert {'id': '123'} == resp
@@ -237,7 +233,7 @@ class TestFtdHttpApi(unittest.TestCase):
         self.connection_mock.send.return_value = self._connection_response('invalidJsonResponse')
 
         open_mock = mock_open()
-        with patch('%s.open' % BUILTINS_NAME, open_mock):
+        with patch('%s.open' % BUILTINS, open_mock):
             with self.assertRaises(ConnectionError) as res:
                 self.ftd_plugin.upload_file('/tmp/test.txt', '/files')
 

test/units/plugins/inventory/test_group.py

@@ -15,7 +15,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.inventory.group import Group
 from ansible.inventory.host import Host

test/units/plugins/inventory/test_host.py

@@ -18,7 +18,7 @@
 # for __setstate__/__getstate__ tests
 import pickle
 
-from ansible.compat.tests import unittest
+from units.compat import unittest
 
 from ansible.inventory.group import Group
 from ansible.inventory.host import Host

test/units/plugins/inventory/test_inventory.py

@@ -23,8 +23,8 @@ import string
 import textwrap
 
 from ansible import constants as C
-from ansible.compat.tests import mock
-from ansible.compat.tests import unittest
+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
 from units.mock.path import mock_unfrackpath_noop

test/units/plugins/inventory/test_script.py

@@ -26,8 +26,8 @@ import pytest
 from ansible import constants as C
 from ansible.errors import AnsibleError
 from ansible.plugins.loader import PluginLoader
-from ansible.compat.tests import mock
-from ansible.compat.tests import unittest
+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_conjur_variable.py

@@ -22,7 +22,7 @@ __metaclass__ = type
 
 
 import pytest
-from ansible.compat.tests.mock import MagicMock
+from units.compat.mock import MagicMock
 from ansible.errors import AnsibleError
 from ansible.module_utils.six.moves import http_client
 from ansible.plugins.lookup import conjur_variable

test/units/plugins/lookup/test_ini.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.plugins.lookup.ini import _parse_params
 
 

test/units/plugins/lookup/test_lastpass.py

@@ -21,8 +21,8 @@ __metaclass__ = type
 
 from argparse import ArgumentParser
 
-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.errors import AnsibleError
 from ansible.module_utils import six

test/units/plugins/lookup/test_onepassword.py

@@ -15,8 +15,8 @@ except ImportError:
 from argparse import ArgumentParser
 
 
-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.errors import AnsibleError
 from ansible.plugins.lookup.onepassword import OnePass, LookupModule
 from ansible.plugins.lookup.onepassword_raw import LookupModule as OnePasswordRawLookup

test/units/plugins/lookup/test_password.py

@@ -24,8 +24,8 @@ import passlib
 from passlib.handlers import pbkdf2
 from units.mock.loader import DictDataLoader
 
-from ansible.compat.tests import unittest
-from ansible.compat.tests.mock import mock_open, patch
+from units.compat import unittest
+from units.compat.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_strategy_base.py

@@ -23,8 +23,8 @@ from units.mock.loader import DictDataLoader
 from copy import deepcopy
 import uuid
 
-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.process.worker import WorkerProcess
 from ansible.executor.task_queue_manager import TaskQueueManager

test/units/plugins/strategy/test_strategy_linear.py

@@ -6,8 +6,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.play_iterator import PlayIterator
 from ansible.playbook import Playbook

test/units/plugins/terminal/test_slxos.py

@@ -24,7 +24,7 @@ import json
 
 from mock import MagicMock
 
-from ansible.compat.tests import unittest
+from units.compat import unittest
 from ansible.plugins.terminal import slxos
 from ansible.errors import AnsibleConnectionFailure
 

test/units/plugins/test_plugins.py

@@ -22,8 +22,9 @@ __metaclass__ = type
 
 import os
 
-from ansible.compat.tests import BUILTINS, unittest
-from ansible.compat.tests.mock import mock_open, patch, MagicMock
+from units.compat import unittest
+from units.compat.builtins import BUILTINS
+from units.compat.mock import mock_open, patch, MagicMock
 from ansible.plugins.loader import MODULE_CACHE, PATH_CACHE, PLUGIN_PATH_CACHE, PluginLoader