From cddffe6af3d816ac862819c891944693390fac39 Mon Sep 17 00:00:00 2001
From: jacky06 <zhang.min@99cloud.net>
Date: Mon, 6 Apr 2020 12:47:42 +0800
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: Ia561a40708efb4346146ab0456adc1a1f1565b47
---
 lower-constraints.txt                                       | 1 -
 searchlight/tests/fake_plugins.py                           | 2 +-
 searchlight/tests/functional/__init__.py                    | 2 +-
 searchlight/tests/functional/test_api.py                    | 2 +-
 searchlight/tests/functional/test_cinder_plugins.py         | 3 +--
 searchlight/tests/functional/test_designate_plugins.py      | 2 +-
 searchlight/tests/functional/test_glance_plugins.py         | 2 +-
 searchlight/tests/functional/test_load.py                   | 2 +-
 searchlight/tests/functional/test_neutron_plugins.py        | 2 +-
 searchlight/tests/functional/test_nova_plugins.py           | 3 ++-
 searchlight/tests/unit/test_cinder_snapshot_plugin.py       | 2 +-
 searchlight/tests/unit/test_cinder_volume_plugin.py         | 2 +-
 searchlight/tests/unit/test_designate_recordset_plugin.py   | 2 +-
 searchlight/tests/unit/test_designate_zone_plugin.py        | 2 +-
 searchlight/tests/unit/test_glance_image_plugin.py          | 2 +-
 searchlight/tests/unit/test_glance_metadefs_plugin.py       | 2 +-
 searchlight/tests/unit/test_indexing_helper.py              | 2 +-
 searchlight/tests/unit/test_ironic_node_plugin.py           | 3 ++-
 searchlight/tests/unit/test_listener.py                     | 2 +-
 searchlight/tests/unit/test_neutron_floatingip.py           | 2 +-
 searchlight/tests/unit/test_neutron_port_plugin.py          | 2 +-
 searchlight/tests/unit/test_neutron_securitygroup_plugin.py | 2 +-
 searchlight/tests/unit/test_nova_flavor_plugin.py           | 2 +-
 searchlight/tests/unit/test_nova_hypervisor_plugin.py       | 2 +-
 searchlight/tests/unit/test_nova_server_plugin.py           | 2 +-
 searchlight/tests/unit/test_nova_servergroup_plugin.py      | 2 +-
 searchlight/tests/unit/test_plugin.py                       | 2 +-
 searchlight/tests/unit/test_plugin_utils.py                 | 3 ++-
 searchlight/tests/unit/test_reindexing.py                   | 2 +-
 searchlight/tests/unit/test_service_policies.py             | 2 +-
 searchlight/tests/unit/test_wsgi.py                         | 2 +-
 searchlight/tests/unit/v1/test_api_policy.py                | 2 +-
 searchlight/tests/unit/v1/test_search.py                    | 2 +-
 searchlight/tests/utils.py                                  | 2 +-
 test-requirements.txt                                       | 1 -
 35 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index bdaef174..aa23db63 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -5,7 +5,6 @@ eventlet==0.18.2
 fixtures==3.0.0
 greenlet==0.4.10
 keystonemiddleware==4.17.0
-mock==2.0.0
 openstackdocstheme==1.18.1
 os-api-ref==1.4.0
 oslo.concurrency==3.26.0
diff --git a/searchlight/tests/fake_plugins.py b/searchlight/tests/fake_plugins.py
index 8a9a1459..3cd12a34 100644
--- a/searchlight/tests/fake_plugins.py
+++ b/searchlight/tests/fake_plugins.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 import copy
-import mock
+from unittest import mock
 
 from searchlight.elasticsearch.plugins import base
 
diff --git a/searchlight/tests/functional/__init__.py b/searchlight/tests/functional/__init__.py
index 688b75db..d30feb7d 100644
--- a/searchlight/tests/functional/__init__.py
+++ b/searchlight/tests/functional/__init__.py
@@ -26,7 +26,6 @@ import datetime
 import elasticsearch
 import importlib
 import logging as std_logging
-import mock
 import os
 import platform
 import requests
@@ -37,6 +36,7 @@ import socket
 import sys
 import tempfile
 import time
+from unittest import mock
 
 import fixtures
 from oslo_log import log as logging
diff --git a/searchlight/tests/functional/test_api.py b/searchlight/tests/functional/test_api.py
index 791f70df..871ae19b 100644
--- a/searchlight/tests/functional/test_api.py
+++ b/searchlight/tests/functional/test_api.py
@@ -13,10 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import os
 import six
 import time
+from unittest import mock
 
 from oslo_serialization import jsonutils
 from oslo_utils import uuidutils
diff --git a/searchlight/tests/functional/test_cinder_plugins.py b/searchlight/tests/functional/test_cinder_plugins.py
index 35e7b424..537adb22 100644
--- a/searchlight/tests/functional/test_cinder_plugins.py
+++ b/searchlight/tests/functional/test_cinder_plugins.py
@@ -13,8 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
-import mock
+from unittest import mock
 
 from searchlight.listener import NotificationEndpoint
 from searchlight.pipeline import PipelineManager
diff --git a/searchlight/tests/functional/test_designate_plugins.py b/searchlight/tests/functional/test_designate_plugins.py
index 3eb5a10e..6e9e29d2 100644
--- a/searchlight/tests/functional/test_designate_plugins.py
+++ b/searchlight/tests/functional/test_designate_plugins.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from searchlight.listener import NotificationEndpoint
 from searchlight.pipeline import PipelineManager
diff --git a/searchlight/tests/functional/test_glance_plugins.py b/searchlight/tests/functional/test_glance_plugins.py
index 6f1d2777..988274d8 100644
--- a/searchlight/tests/functional/test_glance_plugins.py
+++ b/searchlight/tests/functional/test_glance_plugins.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import copy
-import mock
+from unittest import mock
 
 from oslo_serialization import jsonutils
 from oslo_utils import uuidutils
diff --git a/searchlight/tests/functional/test_load.py b/searchlight/tests/functional/test_load.py
index 7e18bae6..a9db4219 100644
--- a/searchlight/tests/functional/test_load.py
+++ b/searchlight/tests/functional/test_load.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import datetime
-import mock
+from unittest import mock
 
 from oslo_config import cfg
 import oslo_utils
diff --git a/searchlight/tests/functional/test_neutron_plugins.py b/searchlight/tests/functional/test_neutron_plugins.py
index d220c659..5f4ee8d1 100644
--- a/searchlight/tests/functional/test_neutron_plugins.py
+++ b/searchlight/tests/functional/test_neutron_plugins.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import copy
-import mock
+from unittest import mock
 
 from oslo_utils import uuidutils
 
diff --git a/searchlight/tests/functional/test_nova_plugins.py b/searchlight/tests/functional/test_nova_plugins.py
index 1147b51d..f0300b5f 100644
--- a/searchlight/tests/functional/test_nova_plugins.py
+++ b/searchlight/tests/functional/test_nova_plugins.py
@@ -11,7 +11,8 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-import mock
+
+from unittest import mock
 
 from searchlight.listener import NotificationEndpoint
 from searchlight.pipeline import PipelineManager
diff --git a/searchlight/tests/unit/test_cinder_snapshot_plugin.py b/searchlight/tests/unit/test_cinder_snapshot_plugin.py
index d647d7c9..b2166711 100644
--- a/searchlight/tests/unit/test_cinder_snapshot_plugin.py
+++ b/searchlight/tests/unit/test_cinder_snapshot_plugin.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 import datetime
-import mock
+from unittest import mock
 
 from searchlight.elasticsearch.plugins.cinder import serialize_cinder_snapshot
 from searchlight.elasticsearch.plugins.cinder \
diff --git a/searchlight/tests/unit/test_cinder_volume_plugin.py b/searchlight/tests/unit/test_cinder_volume_plugin.py
index ac38efd1..52d188b0 100644
--- a/searchlight/tests/unit/test_cinder_volume_plugin.py
+++ b/searchlight/tests/unit/test_cinder_volume_plugin.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 import datetime
-import mock
+from unittest import mock
 
 from oslo_utils import uuidutils
 
diff --git a/searchlight/tests/unit/test_designate_recordset_plugin.py b/searchlight/tests/unit/test_designate_recordset_plugin.py
index 2da5c823..fdcf81b3 100644
--- a/searchlight/tests/unit/test_designate_recordset_plugin.py
+++ b/searchlight/tests/unit/test_designate_recordset_plugin.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 import datetime
-import mock
+from unittest import mock
 
 from searchlight.elasticsearch.plugins.designate import \
     recordsets as recordsets_plugin
diff --git a/searchlight/tests/unit/test_designate_zone_plugin.py b/searchlight/tests/unit/test_designate_zone_plugin.py
index 8bcf0b4c..e5221bd3 100644
--- a/searchlight/tests/unit/test_designate_zone_plugin.py
+++ b/searchlight/tests/unit/test_designate_zone_plugin.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 import datetime
-import mock
+from unittest import mock
 
 from searchlight.elasticsearch.plugins import designate
 from searchlight.elasticsearch import ROLE_USER_FIELD
diff --git a/searchlight/tests/unit/test_glance_image_plugin.py b/searchlight/tests/unit/test_glance_image_plugin.py
index c7d8d692..e36466d1 100644
--- a/searchlight/tests/unit/test_glance_image_plugin.py
+++ b/searchlight/tests/unit/test_glance_image_plugin.py
@@ -15,7 +15,7 @@
 
 import copy
 import datetime
-import mock
+from unittest import mock
 
 import glanceclient.exc
 
diff --git a/searchlight/tests/unit/test_glance_metadefs_plugin.py b/searchlight/tests/unit/test_glance_metadefs_plugin.py
index 6ce0c62e..8a73cc12 100644
--- a/searchlight/tests/unit/test_glance_metadefs_plugin.py
+++ b/searchlight/tests/unit/test_glance_metadefs_plugin.py
@@ -15,7 +15,7 @@
 
 import copy
 import datetime
-import mock
+from unittest import mock
 
 from searchlight.elasticsearch.plugins.base import NotificationBase
 from searchlight.elasticsearch.plugins.glance import metadefs as md_plugin
diff --git a/searchlight/tests/unit/test_indexing_helper.py b/searchlight/tests/unit/test_indexing_helper.py
index 01707a12..e893bb12 100644
--- a/searchlight/tests/unit/test_indexing_helper.py
+++ b/searchlight/tests/unit/test_indexing_helper.py
@@ -15,9 +15,9 @@
 
 import copy
 from elasticsearch import exceptions as es_exceptions
-import mock
 from oslo_config import cfg
 import six
+from unittest import mock
 
 from searchlight.elasticsearch.plugins import helper
 from searchlight.elasticsearch import ROLE_USER_FIELD
diff --git a/searchlight/tests/unit/test_ironic_node_plugin.py b/searchlight/tests/unit/test_ironic_node_plugin.py
index f733551a..b0cf00e0 100644
--- a/searchlight/tests/unit/test_ironic_node_plugin.py
+++ b/searchlight/tests/unit/test_ironic_node_plugin.py
@@ -10,7 +10,8 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import mock
+
+from unittest import mock
 
 from ironicclient import exceptions as ironic_exc
 from keystoneclient import exceptions as keystone_exc
diff --git a/searchlight/tests/unit/test_listener.py b/searchlight/tests/unit/test_listener.py
index a91d3730..68a7299e 100644
--- a/searchlight/tests/unit/test_listener.py
+++ b/searchlight/tests/unit/test_listener.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from searchlight.elasticsearch.plugins import base
 from searchlight import listener
diff --git a/searchlight/tests/unit/test_neutron_floatingip.py b/searchlight/tests/unit/test_neutron_floatingip.py
index b4b6349d..101000aa 100644
--- a/searchlight/tests/unit/test_neutron_floatingip.py
+++ b/searchlight/tests/unit/test_neutron_floatingip.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import datetime
-import mock
+from unittest import mock
 
 from oslo_utils import uuidutils
 
diff --git a/searchlight/tests/unit/test_neutron_port_plugin.py b/searchlight/tests/unit/test_neutron_port_plugin.py
index c1727709..1a75c076 100644
--- a/searchlight/tests/unit/test_neutron_port_plugin.py
+++ b/searchlight/tests/unit/test_neutron_port_plugin.py
@@ -14,8 +14,8 @@
 # limitations under the License.
 
 import datetime
-import mock
 from oslo_utils import uuidutils
+from unittest import mock
 
 from searchlight.common import utils
 from searchlight.elasticsearch.plugins.neutron import\
diff --git a/searchlight/tests/unit/test_neutron_securitygroup_plugin.py b/searchlight/tests/unit/test_neutron_securitygroup_plugin.py
index b1547525..43512416 100644
--- a/searchlight/tests/unit/test_neutron_securitygroup_plugin.py
+++ b/searchlight/tests/unit/test_neutron_securitygroup_plugin.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import datetime
-import mock
+from unittest import mock
 
 from oslo_utils import uuidutils
 
diff --git a/searchlight/tests/unit/test_nova_flavor_plugin.py b/searchlight/tests/unit/test_nova_flavor_plugin.py
index 6a988a24..62fd3da2 100644
--- a/searchlight/tests/unit/test_nova_flavor_plugin.py
+++ b/searchlight/tests/unit/test_nova_flavor_plugin.py
@@ -11,7 +11,7 @@
 #    under the License.
 
 import datetime
-import mock
+from unittest import mock
 
 import novaclient.v2.flavors as novaclient_flavors
 
diff --git a/searchlight/tests/unit/test_nova_hypervisor_plugin.py b/searchlight/tests/unit/test_nova_hypervisor_plugin.py
index 1a99d063..14d1abde 100644
--- a/searchlight/tests/unit/test_nova_hypervisor_plugin.py
+++ b/searchlight/tests/unit/test_nova_hypervisor_plugin.py
@@ -13,7 +13,7 @@
 #    under the License.
 
 import datetime
-import mock
+from unittest import mock
 
 import novaclient.v2.hypervisors as novaclient_hypervisors
 
diff --git a/searchlight/tests/unit/test_nova_server_plugin.py b/searchlight/tests/unit/test_nova_server_plugin.py
index f7b70e6a..251ce344 100644
--- a/searchlight/tests/unit/test_nova_server_plugin.py
+++ b/searchlight/tests/unit/test_nova_server_plugin.py
@@ -14,9 +14,9 @@
 #    under the License.
 
 import datetime
-import mock
 import novaclient.exceptions
 import novaclient.v2.servers as novaclient_servers
+from unittest import mock
 
 from searchlight.elasticsearch.plugins.nova import\
     servers as servers_plugin
diff --git a/searchlight/tests/unit/test_nova_servergroup_plugin.py b/searchlight/tests/unit/test_nova_servergroup_plugin.py
index 24e35224..605610f8 100644
--- a/searchlight/tests/unit/test_nova_servergroup_plugin.py
+++ b/searchlight/tests/unit/test_nova_servergroup_plugin.py
@@ -13,7 +13,7 @@
 #    under the License.
 
 import datetime
-import mock
+from unittest import mock
 
 import novaclient.v2.server_groups as novaclient_server_groups
 
diff --git a/searchlight/tests/unit/test_plugin.py b/searchlight/tests/unit/test_plugin.py
index 0c272d39..39aa42cd 100644
--- a/searchlight/tests/unit/test_plugin.py
+++ b/searchlight/tests/unit/test_plugin.py
@@ -15,10 +15,10 @@
 
 import collections
 import copy
-import mock
 import operator
 import six
 import types
+from unittest import mock
 
 from oslo_config import cfg
 
diff --git a/searchlight/tests/unit/test_plugin_utils.py b/searchlight/tests/unit/test_plugin_utils.py
index 0cfdb7b4..7434cd4e 100644
--- a/searchlight/tests/unit/test_plugin_utils.py
+++ b/searchlight/tests/unit/test_plugin_utils.py
@@ -12,8 +12,9 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+
 from elasticsearch import exceptions as es_exc
-import mock
+from unittest import mock
 
 from oslo_config import cfg
 import oslo_utils
diff --git a/searchlight/tests/unit/test_reindexing.py b/searchlight/tests/unit/test_reindexing.py
index ce408ad7..948831a8 100644
--- a/searchlight/tests/unit/test_reindexing.py
+++ b/searchlight/tests/unit/test_reindexing.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from elasticsearch import exceptions as es_exc
 from searchlight.common import utils as common_utils
diff --git a/searchlight/tests/unit/test_service_policies.py b/searchlight/tests/unit/test_service_policies.py
index 1ec3b728..4364330b 100644
--- a/searchlight/tests/unit/test_service_policies.py
+++ b/searchlight/tests/unit/test_service_policies.py
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import os
+from unittest import mock
 
 from oslo_config import cfg
 from searchlight import service_policies
diff --git a/searchlight/tests/unit/test_wsgi.py b/searchlight/tests/unit/test_wsgi.py
index d182f994..9c8d9a90 100644
--- a/searchlight/tests/unit/test_wsgi.py
+++ b/searchlight/tests/unit/test_wsgi.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 import fixtures
-import mock
+from unittest import mock
 import webob
 
 from searchlight.common import wsgi
diff --git a/searchlight/tests/unit/v1/test_api_policy.py b/searchlight/tests/unit/v1/test_api_policy.py
index 9f730281..372320fb 100644
--- a/searchlight/tests/unit/v1/test_api_policy.py
+++ b/searchlight/tests/unit/v1/test_api_policy.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 import webob
 
 from searchlight.api.v1 import search
diff --git a/searchlight/tests/unit/v1/test_search.py b/searchlight/tests/unit/v1/test_search.py
index d3425208..3190c987 100644
--- a/searchlight/tests/unit/v1/test_search.py
+++ b/searchlight/tests/unit/v1/test_search.py
@@ -14,10 +14,10 @@
 #    under the License.
 
 from elasticsearch import exceptions as es_exc
-import mock
 import operator
 from oslo_serialization import jsonutils
 import six
+from unittest import mock
 import webob.exc
 
 from searchlight.api.v1 import search
diff --git a/searchlight/tests/utils.py b/searchlight/tests/utils.py
index b00abe4b..1397da5d 100644
--- a/searchlight/tests/utils.py
+++ b/searchlight/tests/utils.py
@@ -23,9 +23,9 @@ import shlex
 import shutil
 import socket
 import subprocess
+from unittest import mock
 
 import fixtures
-import mock
 from oslo_config import cfg
 import six
 from six.moves import BaseHTTPServer
diff --git a/test-requirements.txt b/test-requirements.txt
index 7a7490d3..ef926b9f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,7 +11,6 @@ Babel!=2.4.0,>=2.3.4 # BSD
 # Needed for testing
 coverage>=4.5.2 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
-mock>=2.0.0 # BSD
 oslotest>=3.2.0 # Apache-2.0
 requests>=2.21.0 # Apache-2.0
 stestr>=2.0.0 # Apache-2.0