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

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

7 files changed, 9 insertions, 7 deletions

diff --git a/test/units/modules/test_apt.py b/test/units/modules/test_apt.py
index 3daf3c111f..78dbbadea6 100644
--- a/test/units/modules/test_apt.py
+++ b/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:
diff --git a/test/units/modules/test_apt_key.py b/test/units/modules/test_apt_key.py
index e348db0cc4..39339d76d2 100644
--- a/test/units/modules/test_apt_key.py
+++ b/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
diff --git a/test/units/modules/test_async_wrapper.py b/test/units/modules/test_async_wrapper.py
index 37b1fda374..eacb9361a4 100644
--- a/test/units/modules/test_async_wrapper.py
+++ b/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
diff --git a/test/units/modules/test_hostname.py b/test/units/modules/test_hostname.py
index 9050fd04b0..804ecf74a7 100644
--- a/test/units/modules/test_hostname.py
+++ b/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
diff --git a/test/units/modules/test_iptables.py b/test/units/modules/test_iptables.py
index 265e770ac2..5953334b6a 100644
--- a/test/units/modules/test_iptables.py
+++ b/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
diff --git a/test/units/modules/test_service_facts.py b/test/units/modules/test_service_facts.py
index 07f6827e02..3a180dc9c5 100644
--- a/test/units/modules/test_service_facts.py
+++ b/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
diff --git a/test/units/modules/utils.py b/test/units/modules/utils.py
index 6d169e36f0..92f4ceabce 100644
--- a/test/units/modules/utils.py
+++ b/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