From a9f7f67de5768726384e2b64208280eaa1c30df6 Mon Sep 17 00:00:00 2001
From: Sean McGinnis <sean.mcginnis@gmail.com>
Date: Sat, 18 Apr 2020 11:53:19 -0500
Subject: [PATCH] Use unittest.mock instead of third party mock

Now that we no longer support py27, we can use the standard library
unittest.mock module instead of the third party mock lib.

Change-Id: Ic67f09a223ae2d0cb460771a10a4122307afa05b
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
---
 ironic_inspector/test/base.py                                  | 2 +-
 ironic_inspector/test/functional.py                            | 2 +-
 ironic_inspector/test/unit/test_api_tools.py                   | 2 +-
 ironic_inspector/test/unit/test_common_ironic.py               | 2 +-
 ironic_inspector/test/unit/test_coordination.py                | 3 ++-
 ironic_inspector/test/unit/test_db.py                          | 2 +-
 ironic_inspector/test/unit/test_dnsmasq_pxe_filter.py          | 2 +-
 ironic_inspector/test/unit/test_introspect.py                  | 2 +-
 ironic_inspector/test/unit/test_iptables.py                    | 3 ++-
 ironic_inspector/test/unit/test_keystone.py                    | 3 ++-
 ironic_inspector/test/unit/test_locking.py                     | 3 ++-
 ironic_inspector/test/unit/test_main.py                        | 2 +-
 ironic_inspector/test/unit/test_manager.py                     | 2 +-
 ironic_inspector/test/unit/test_migrations.py                  | 2 +-
 ironic_inspector/test/unit/test_node_cache.py                  | 2 +-
 ironic_inspector/test/unit/test_plugins_base.py                | 2 +-
 ironic_inspector/test/unit/test_plugins_capabilities.py        | 3 ++-
 ironic_inspector/test/unit/test_plugins_discovery.py           | 2 +-
 ironic_inspector/test/unit/test_plugins_extra_hardware.py      | 2 +-
 ironic_inspector/test/unit/test_plugins_introspection_data.py  | 2 +-
 ironic_inspector/test/unit/test_plugins_lldp_basic.py          | 2 +-
 .../test/unit/test_plugins_local_link_connection.py            | 3 ++-
 ironic_inspector/test/unit/test_plugins_pci_devices.py         | 2 +-
 ironic_inspector/test/unit/test_plugins_raid_device.py         | 2 +-
 ironic_inspector/test/unit/test_plugins_rules.py               | 3 ++-
 ironic_inspector/test/unit/test_plugins_standard.py            | 3 ++-
 ironic_inspector/test/unit/test_process.py                     | 2 +-
 ironic_inspector/test/unit/test_pxe_filter.py                  | 3 ++-
 ironic_inspector/test/unit/test_rules.py                       | 3 ++-
 ironic_inspector/test/unit/test_swift.py                       | 3 ++-
 ironic_inspector/test/unit/test_utils.py                       | 3 ++-
 test-requirements.txt                                          | 1 -
 32 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/ironic_inspector/test/base.py b/ironic_inspector/test/base.py
index 81b71a947..e808cdbfb 100644
--- a/ironic_inspector/test/base.py
+++ b/ironic_inspector/test/base.py
@@ -13,10 +13,10 @@
 
 import datetime
 import time
+from unittest import mock
 
 import fixtures
 import futurist
-import mock
 from oslo_concurrency import lockutils
 from oslo_config import fixture as config_fixture
 from oslo_log import log
diff --git a/ironic_inspector/test/functional.py b/ironic_inspector/test/functional.py
index 95af24222..4d38af9ce 100644
--- a/ironic_inspector/test/functional.py
+++ b/ironic_inspector/test/functional.py
@@ -21,11 +21,11 @@ import sys
 import tempfile
 import time
 import unittest
+from unittest import mock
 import urllib
 
 import eventlet
 import fixtures
-import mock
 from oslo_config import cfg
 from oslo_config import fixture as config_fixture
 from oslo_utils import timeutils
diff --git a/ironic_inspector/test/unit/test_api_tools.py b/ironic_inspector/test/unit/test_api_tools.py
index bfefaa86b..7587e1ba0 100644
--- a/ironic_inspector/test/unit/test_api_tools.py
+++ b/ironic_inspector/test/unit/test_api_tools.py
@@ -12,9 +12,9 @@
 # limitations under the License.
 
 import functools
+from unittest import mock
 
 import flask
-import mock
 from oslo_config import cfg
 from oslo_utils import uuidutils
 
diff --git a/ironic_inspector/test/unit/test_common_ironic.py b/ironic_inspector/test/unit/test_common_ironic.py
index a35e88857..4567fc5ad 100644
--- a/ironic_inspector/test/unit/test_common_ironic.py
+++ b/ironic_inspector/test/unit/test_common_ironic.py
@@ -13,8 +13,8 @@
 
 import socket
 import unittest
+from unittest import mock
 
-import mock
 import openstack
 from openstack import exceptions as os_exc
 
diff --git a/ironic_inspector/test/unit/test_coordination.py b/ironic_inspector/test/unit/test_coordination.py
index 768c323a3..cae773ec2 100644
--- a/ironic_inspector/test/unit/test_coordination.py
+++ b/ironic_inspector/test/unit/test_coordination.py
@@ -10,8 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
+
 import fixtures
-import mock
 from oslo_config import cfg
 import tooz
 
diff --git a/ironic_inspector/test/unit/test_db.py b/ironic_inspector/test/unit/test_db.py
index 7b2a445c8..c7134a6ad 100644
--- a/ironic_inspector/test/unit/test_db.py
+++ b/ironic_inspector/test/unit/test_db.py
@@ -11,7 +11,7 @@
 # under the License.
 
 
-import mock
+from unittest import mock
 
 from ironic_inspector import db
 from ironic_inspector.test import base as test_base
diff --git a/ironic_inspector/test/unit/test_dnsmasq_pxe_filter.py b/ironic_inspector/test/unit/test_dnsmasq_pxe_filter.py
index 07b7d7573..6d15eb684 100644
--- a/ironic_inspector/test/unit/test_dnsmasq_pxe_filter.py
+++ b/ironic_inspector/test/unit/test_dnsmasq_pxe_filter.py
@@ -18,9 +18,9 @@ except ImportError:
     import os.errno as errno
 import datetime
 import os
+from unittest import mock
 
 import fixtures
-import mock
 from openstack import exceptions as os_exc
 from oslo_config import cfg
 
diff --git a/ironic_inspector/test/unit/test_introspect.py b/ironic_inspector/test/unit/test_introspect.py
index ca9fe12c7..a723af87a 100644
--- a/ironic_inspector/test/unit/test_introspect.py
+++ b/ironic_inspector/test/unit/test_introspect.py
@@ -13,9 +13,9 @@
 
 import collections
 import time
+from unittest import mock
 
 import fixtures
-import mock
 from openstack import exceptions as os_exc
 from oslo_config import cfg
 
diff --git a/ironic_inspector/test/unit/test_iptables.py b/ironic_inspector/test/unit/test_iptables.py
index f3c5bcc22..7734954b2 100644
--- a/ironic_inspector/test/unit/test_iptables.py
+++ b/ironic_inspector/test/unit/test_iptables.py
@@ -13,8 +13,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
+
 import fixtures
-import mock
 from openstack import exceptions as os_exc
 from oslo_config import cfg
 
diff --git a/ironic_inspector/test/unit/test_keystone.py b/ironic_inspector/test/unit/test_keystone.py
index b1191dadf..8a75a2bc8 100644
--- a/ironic_inspector/test/unit/test_keystone.py
+++ b/ironic_inspector/test/unit/test_keystone.py
@@ -11,8 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from unittest import mock
+
 from keystoneauth1 import loading as kaloading
-import mock
 from oslo_config import cfg
 
 from ironic_inspector.common import keystone
diff --git a/ironic_inspector/test/unit/test_locking.py b/ironic_inspector/test/unit/test_locking.py
index a9148ee9c..e1b401a57 100644
--- a/ironic_inspector/test/unit/test_locking.py
+++ b/ironic_inspector/test/unit/test_locking.py
@@ -11,7 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 
 from ironic_inspector.common import coordination
diff --git a/ironic_inspector/test/unit/test_main.py b/ironic_inspector/test/unit/test_main.py
index cdce0b100..f933e1579 100644
--- a/ironic_inspector/test/unit/test_main.py
+++ b/ironic_inspector/test/unit/test_main.py
@@ -14,9 +14,9 @@
 import datetime
 import json
 import unittest
+from unittest import mock
 
 import fixtures
-import mock
 import oslo_messaging as messaging
 from oslo_utils import uuidutils
 
diff --git a/ironic_inspector/test/unit/test_manager.py b/ironic_inspector/test/unit/test_manager.py
index 6ec386f52..e4b27c274 100644
--- a/ironic_inspector/test/unit/test_manager.py
+++ b/ironic_inspector/test/unit/test_manager.py
@@ -12,10 +12,10 @@
 # limitations under the License.
 
 import json
+from unittest import mock
 
 import fixtures
 from ironic_lib import mdns
-import mock
 import oslo_messaging as messaging
 import tooz
 
diff --git a/ironic_inspector/test/unit/test_migrations.py b/ironic_inspector/test/unit/test_migrations.py
index ca0c37c55..6ca6a1ed4 100644
--- a/ironic_inspector/test/unit/test_migrations.py
+++ b/ironic_inspector/test/unit/test_migrations.py
@@ -25,10 +25,10 @@ The test will then use that db and u/p combo to run the tests.
 
 import contextlib
 import datetime
+from unittest import mock
 
 import alembic
 from alembic import script
-import mock
 from oslo_config import cfg
 from oslo_db.sqlalchemy import enginefacade
 from oslo_db.sqlalchemy.migration_cli import ext_alembic
diff --git a/ironic_inspector/test/unit/test_node_cache.py b/ironic_inspector/test/unit/test_node_cache.py
index 1f63afcab..6fae6ed46 100644
--- a/ironic_inspector/test/unit/test_node_cache.py
+++ b/ironic_inspector/test/unit/test_node_cache.py
@@ -16,9 +16,9 @@ import datetime
 import functools
 import json
 import unittest
+from unittest import mock
 
 import automaton
-import mock
 from oslo_config import cfg
 import oslo_db
 from oslo_utils import timeutils
diff --git a/ironic_inspector/test/unit/test_plugins_base.py b/ironic_inspector/test/unit/test_plugins_base.py
index 9fc84d46b..01950ccd5 100644
--- a/ironic_inspector/test/unit/test_plugins_base.py
+++ b/ironic_inspector/test/unit/test_plugins_base.py
@@ -12,8 +12,8 @@
 # limitations under the License.
 
 import collections
+from unittest import mock
 
-import mock
 
 from ironic_inspector.plugins import base
 from ironic_inspector.test import base as test_base
diff --git a/ironic_inspector/test/unit/test_plugins_capabilities.py b/ironic_inspector/test/unit/test_plugins_capabilities.py
index 394410fb5..1530875d5 100644
--- a/ironic_inspector/test/unit/test_plugins_capabilities.py
+++ b/ironic_inspector/test/unit/test_plugins_capabilities.py
@@ -11,7 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 
 from ironic_inspector import node_cache
diff --git a/ironic_inspector/test/unit/test_plugins_discovery.py b/ironic_inspector/test/unit/test_plugins_discovery.py
index c4feac1c4..ab6ce0435 100644
--- a/ironic_inspector/test/unit/test_plugins_discovery.py
+++ b/ironic_inspector/test/unit/test_plugins_discovery.py
@@ -11,8 +11,8 @@
 # under the License.
 
 import copy
+from unittest import mock
 
-import mock
 
 from ironic_inspector.common import ironic as ir_utils
 from ironic_inspector import node_cache
diff --git a/ironic_inspector/test/unit/test_plugins_extra_hardware.py b/ironic_inspector/test/unit/test_plugins_extra_hardware.py
index 5da00c9f1..fe01d07c2 100644
--- a/ironic_inspector/test/unit/test_plugins_extra_hardware.py
+++ b/ironic_inspector/test/unit/test_plugins_extra_hardware.py
@@ -12,8 +12,8 @@
 # limitations under the License.
 
 import json
+from unittest import mock
 
-import mock
 
 from ironic_inspector import node_cache
 from ironic_inspector.plugins import extra_hardware
diff --git a/ironic_inspector/test/unit/test_plugins_introspection_data.py b/ironic_inspector/test/unit/test_plugins_introspection_data.py
index 58672a67f..3ac3a7bda 100644
--- a/ironic_inspector/test/unit/test_plugins_introspection_data.py
+++ b/ironic_inspector/test/unit/test_plugins_introspection_data.py
@@ -12,9 +12,9 @@
 # limitations under the License.
 
 import json
+from unittest import mock
 
 import fixtures
-import mock
 from oslo_config import cfg
 
 from ironic_inspector.common import ironic as ir_utils
diff --git a/ironic_inspector/test/unit/test_plugins_lldp_basic.py b/ironic_inspector/test/unit/test_plugins_lldp_basic.py
index ce58932f8..86283687c 100644
--- a/ironic_inspector/test/unit/test_plugins_lldp_basic.py
+++ b/ironic_inspector/test/unit/test_plugins_lldp_basic.py
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from ironic_inspector.common import lldp_parsers as nv
 from ironic_inspector.plugins import lldp_basic
diff --git a/ironic_inspector/test/unit/test_plugins_local_link_connection.py b/ironic_inspector/test/unit/test_plugins_local_link_connection.py
index 375f3b853..199c48251 100644
--- a/ironic_inspector/test/unit/test_plugins_local_link_connection.py
+++ b/ironic_inspector/test/unit/test_plugins_local_link_connection.py
@@ -11,7 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
+
 from openstack import exceptions
 from oslo_config import cfg
 
diff --git a/ironic_inspector/test/unit/test_plugins_pci_devices.py b/ironic_inspector/test/unit/test_plugins_pci_devices.py
index eb5736954..72e6bdb68 100644
--- a/ironic_inspector/test/unit/test_plugins_pci_devices.py
+++ b/ironic_inspector/test/unit/test_plugins_pci_devices.py
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from ironic_inspector import node_cache
 from ironic_inspector.plugins import base
diff --git a/ironic_inspector/test/unit/test_plugins_raid_device.py b/ironic_inspector/test/unit/test_plugins_raid_device.py
index 61785cc4e..2f0872dd5 100644
--- a/ironic_inspector/test/unit/test_plugins_raid_device.py
+++ b/ironic_inspector/test/unit/test_plugins_raid_device.py
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from ironic_inspector import node_cache
 from ironic_inspector.plugins import base
diff --git a/ironic_inspector/test/unit/test_plugins_rules.py b/ironic_inspector/test/unit/test_plugins_rules.py
index 564c87cb1..3790bc1ad 100644
--- a/ironic_inspector/test/unit/test_plugins_rules.py
+++ b/ironic_inspector/test/unit/test_plugins_rules.py
@@ -14,7 +14,8 @@
 
 """Tests for introspection rules plugins."""
 
-import mock
+from unittest import mock
+
 from openstack import exceptions as os_exc
 
 from ironic_inspector.common import ironic as ir_utils
diff --git a/ironic_inspector/test/unit/test_plugins_standard.py b/ironic_inspector/test/unit/test_plugins_standard.py
index b88f678ef..fb3e07039 100644
--- a/ironic_inspector/test/unit/test_plugins_standard.py
+++ b/ironic_inspector/test/unit/test_plugins_standard.py
@@ -11,7 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 from oslo_utils import units
 
diff --git a/ironic_inspector/test/unit/test_process.py b/ironic_inspector/test/unit/test_process.py
index 33fbbfe0e..a1f3d2b9d 100644
--- a/ironic_inspector/test/unit/test_process.py
+++ b/ironic_inspector/test/unit/test_process.py
@@ -17,10 +17,10 @@ import json
 import os
 import shutil
 import tempfile
+from unittest import mock
 
 import eventlet
 import fixtures
-import mock
 from openstack import exceptions as os_exc
 from oslo_config import cfg
 from oslo_serialization import base64
diff --git a/ironic_inspector/test/unit/test_pxe_filter.py b/ironic_inspector/test/unit/test_pxe_filter.py
index ffd8de0c5..51159a43a 100644
--- a/ironic_inspector/test/unit/test_pxe_filter.py
+++ b/ironic_inspector/test/unit/test_pxe_filter.py
@@ -11,11 +11,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from unittest import mock
+
 from automaton import exceptions as automaton_errors
 from eventlet import semaphore
 import fixtures
 from futurist import periodics
-import mock
 from oslo_config import cfg
 import stevedore
 
diff --git a/ironic_inspector/test/unit/test_rules.py b/ironic_inspector/test/unit/test_rules.py
index a54980cdc..0af96dd0e 100644
--- a/ironic_inspector/test/unit/test_rules.py
+++ b/ironic_inspector/test/unit/test_rules.py
@@ -13,7 +13,8 @@
 # under the License.
 
 """Tests for introspection rules."""
-import mock
+from unittest import mock
+
 from oslo_utils import uuidutils
 
 from ironic_inspector import db
diff --git a/ironic_inspector/test/unit/test_swift.py b/ironic_inspector/test/unit/test_swift.py
index d6a701ab8..2b21efa16 100644
--- a/ironic_inspector/test/unit/test_swift.py
+++ b/ironic_inspector/test/unit/test_swift.py
@@ -14,8 +14,9 @@
 
 # Mostly copied from ironic/tests/test_swift.py
 
+from unittest import mock
+
 from keystoneauth1 import exceptions as ks_exc
-import mock
 import openstack
 from openstack import exceptions as os_exc
 
diff --git a/ironic_inspector/test/unit/test_utils.py b/ironic_inspector/test/unit/test_utils.py
index d84b4c44f..bf701091a 100644
--- a/ironic_inspector/test/unit/test_utils.py
+++ b/ironic_inspector/test/unit/test_utils.py
@@ -11,8 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from unittest import mock
+
 from keystonemiddleware import auth_token
-import mock
 from openstack.baremetal.v1 import node
 from oslo_config import cfg
 
diff --git a/test-requirements.txt b/test-requirements.txt
index e92e83c01..17dba03e8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,6 @@ coverage!=4.4,>=4.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
 flake8-import-order>=0.13 # LGPLv3
 hacking>=3.0.0,<3.1.0 # Apache-2.0
-mock>=3.0.0 # BSD
 sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
 sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
 openstackdocstheme>=1.20.0 # Apache-2.0