From 94b0876429a4234738a9481a749d2dd5458be298 Mon Sep 17 00:00:00 2001
From: Sean McGinnis <sean.mcginnis@gmail.com>
Date: Sat, 18 Apr 2020 11:52:42 -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: I44e7b6f76e2d12f620ec602afc77ce11ba6b9d9a
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
---
 glance/tests/functional/db/base.py                             | 2 +-
 glance/tests/unit/api/middleware/test_cache_manage.py          | 2 +-
 glance/tests/unit/api/test_cmd.py                              | 2 +-
 .../tests/unit/async_/flows/plugins/test_image_conversion.py   | 2 +-
 .../unit/async_/flows/plugins/test_inject_image_metadata.py    | 2 +-
 glance/tests/unit/async_/flows/test_api_image_import.py        | 2 +-
 glance/tests/unit/async_/flows/test_convert.py                 | 2 +-
 glance/tests/unit/async_/flows/test_copy_image.py              | 2 +-
 glance/tests/unit/async_/flows/test_import.py                  | 2 +-
 glance/tests/unit/async_/flows/test_introspect.py              | 2 +-
 glance/tests/unit/async_/flows/test_ovf_process.py             | 2 +-
 glance/tests/unit/async_/flows/test_web_download.py            | 2 +-
 glance/tests/unit/async_/test_async.py                         | 2 +-
 glance/tests/unit/async_/test_taskflow_executor.py             | 2 +-
 glance/tests/unit/base.py                                      | 2 +-
 glance/tests/unit/common/scripts/image_import/test_main.py     | 3 ++-
 glance/tests/unit/common/scripts/test_scripts_utils.py         | 3 ++-
 glance/tests/unit/common/test_client.py                        | 3 ++-
 glance/tests/unit/common/test_scripts.py                       | 2 +-
 glance/tests/unit/common/test_timeutils.py                     | 2 +-
 glance/tests/unit/common/test_utils.py                         | 2 +-
 glance/tests/unit/common/test_wsgi.py                          | 2 +-
 glance/tests/unit/image_cache/drivers/test_sqlite.py           | 2 +-
 glance/tests/unit/test_data_migration_framework.py             | 2 +-
 glance/tests/unit/test_db.py                                   | 2 +-
 glance/tests/unit/test_domain.py                               | 2 +-
 glance/tests/unit/test_domain_proxy.py                         | 3 ++-
 glance/tests/unit/test_glance_manage.py                        | 3 ++-
 glance/tests/unit/test_glance_replicator.py                    | 2 +-
 glance/tests/unit/test_manage.py                               | 2 +-
 glance/tests/unit/test_notifier.py                             | 2 +-
 glance/tests/unit/test_policy.py                               | 2 +-
 glance/tests/unit/test_quota.py                                | 2 +-
 glance/tests/unit/test_scrubber.py                             | 2 +-
 glance/tests/unit/test_store_image.py                          | 2 +-
 glance/tests/unit/test_store_location.py                       | 2 +-
 glance/tests/unit/utils.py                                     | 3 ++-
 glance/tests/unit/v2/test_image_data_resource.py               | 2 +-
 glance/tests/unit/v2/test_images_resource.py                   | 2 +-
 glance/tests/unit/v2/test_metadef_resources.py                 | 2 +-
 glance/tests/unit/v2/test_tasks_resource.py                    | 2 +-
 glance/tests/utils.py                                          | 2 +-
 test-requirements.txt                                          | 1 -
 43 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/glance/tests/functional/db/base.py b/glance/tests/functional/db/base.py
index c416c8e3a5..e7144add40 100644
--- a/glance/tests/functional/db/base.py
+++ b/glance/tests/functional/db/base.py
@@ -17,9 +17,9 @@
 
 import copy
 import datetime
+from unittest import mock
 import uuid
 
-import mock
 from oslo_db import exception as db_exception
 from oslo_db.sqlalchemy import utils as sqlalchemyutils
 # NOTE(jokke): simplified transition to py3, behaves like py2 xrange
diff --git a/glance/tests/unit/api/middleware/test_cache_manage.py b/glance/tests/unit/api/middleware/test_cache_manage.py
index 04751f5786..b40b3191ca 100644
--- a/glance/tests/unit/api/middleware/test_cache_manage.py
+++ b/glance/tests/unit/api/middleware/test_cache_manage.py
@@ -16,8 +16,8 @@ import glance.common.config
 import glance.common.wsgi
 import glance.image_cache
 from glance.tests import utils as test_utils
+from unittest import mock
 
-import mock
 import webob
 
 
diff --git a/glance/tests/unit/api/test_cmd.py b/glance/tests/unit/api/test_cmd.py
index 80a11fcbc5..b7e9dbcbf6 100644
--- a/glance/tests/unit/api/test_cmd.py
+++ b/glance/tests/unit/api/test_cmd.py
@@ -10,9 +10,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import sys
+from unittest import mock
 
 import glance_store as store
-import mock
 from oslo_config import cfg
 from oslo_log import log as logging
 import six
diff --git a/glance/tests/unit/async_/flows/plugins/test_image_conversion.py b/glance/tests/unit/async_/flows/plugins/test_image_conversion.py
index df6e420085..2dc4dc6f74 100644
--- a/glance/tests/unit/async_/flows/plugins/test_image_conversion.py
+++ b/glance/tests/unit/async_/flows/plugins/test_image_conversion.py
@@ -14,8 +14,8 @@
 #    under the License.
 
 import json
-import mock
 import os
+from unittest import mock
 
 import glance_store
 from oslo_concurrency import processutils
diff --git a/glance/tests/unit/async_/flows/plugins/test_inject_image_metadata.py b/glance/tests/unit/async_/flows/plugins/test_inject_image_metadata.py
index 8bc7c1142d..b5fdc65d8a 100644
--- a/glance/tests/unit/async_/flows/plugins/test_inject_image_metadata.py
+++ b/glance/tests/unit/async_/flows/plugins/test_inject_image_metadata.py
@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import os
+from unittest import mock
 
 import glance_store
 from oslo_config import cfg
diff --git a/glance/tests/unit/async_/flows/test_api_image_import.py b/glance/tests/unit/async_/flows/test_api_image_import.py
index 53f8c9bafb..7e76e8fbcb 100644
--- a/glance/tests/unit/async_/flows/test_api_image_import.py
+++ b/glance/tests/unit/async_/flows/test_api_image_import.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from oslo_config import cfg
 
diff --git a/glance/tests/unit/async_/flows/test_convert.py b/glance/tests/unit/async_/flows/test_convert.py
index 1b8d9ab23e..50ca55c969 100644
--- a/glance/tests/unit/async_/flows/test_convert.py
+++ b/glance/tests/unit/async_/flows/test_convert.py
@@ -14,8 +14,8 @@
 #    under the License.
 
 import json
-import mock
 import os
+from unittest import mock
 
 import glance_store
 from oslo_concurrency import processutils
diff --git a/glance/tests/unit/async_/flows/test_copy_image.py b/glance/tests/unit/async_/flows/test_copy_image.py
index 009ae3df1e..251531a420 100644
--- a/glance/tests/unit/async_/flows/test_copy_image.py
+++ b/glance/tests/unit/async_/flows/test_copy_image.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 import datetime
-import mock
+from unittest import mock
 
 import glance_store as store_api
 from oslo_config import cfg
diff --git a/glance/tests/unit/async_/flows/test_import.py b/glance/tests/unit/async_/flows/test_import.py
index 4998f6e38f..f945ed00f2 100644
--- a/glance/tests/unit/async_/flows/test_import.py
+++ b/glance/tests/unit/async_/flows/test_import.py
@@ -14,8 +14,8 @@
 #    under the License.
 
 import json
-import mock
 import os
+from unittest import mock
 
 import glance_store
 from oslo_concurrency import processutils as putils
diff --git a/glance/tests/unit/async_/flows/test_introspect.py b/glance/tests/unit/async_/flows/test_introspect.py
index 573c441110..db171bdeb1 100644
--- a/glance/tests/unit/async_/flows/test_introspect.py
+++ b/glance/tests/unit/async_/flows/test_introspect.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 import json
-import mock
+from unittest import mock
 
 import glance_store
 from oslo_concurrency import processutils
diff --git a/glance/tests/unit/async_/flows/test_ovf_process.py b/glance/tests/unit/async_/flows/test_ovf_process.py
index 0a70bc266d..7f06763e85 100644
--- a/glance/tests/unit/async_/flows/test_ovf_process.py
+++ b/glance/tests/unit/async_/flows/test_ovf_process.py
@@ -17,8 +17,8 @@ import os.path
 import shutil
 import tarfile
 import tempfile
+from unittest import mock
 
-import mock
 try:
     from defusedxml.cElementTree import ParseError
 except ImportError:
diff --git a/glance/tests/unit/async_/flows/test_web_download.py b/glance/tests/unit/async_/flows/test_web_download.py
index 66c63332af..0ca22700c6 100644
--- a/glance/tests/unit/async_/flows/test_web_download.py
+++ b/glance/tests/unit/async_/flows/test_web_download.py
@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import os
+from unittest import mock
 
 from glance_store._drivers import filesystem
 from glance_store import backend
diff --git a/glance/tests/unit/async_/test_async.py b/glance/tests/unit/async_/test_async.py
index d6a1212af1..afbae8a907 100644
--- a/glance/tests/unit/async_/test_async.py
+++ b/glance/tests/unit/async_/test_async.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 
-import mock
+from unittest import mock
 
 import glance.async_
 import glance.tests.utils as test_utils
diff --git a/glance/tests/unit/async_/test_taskflow_executor.py b/glance/tests/unit/async_/test_taskflow_executor.py
index 222ad4d4e9..84604f868f 100644
--- a/glance/tests/unit/async_/test_taskflow_executor.py
+++ b/glance/tests/unit/async_/test_taskflow_executor.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 import glance_store
 from oslo_config import cfg
diff --git a/glance/tests/unit/base.py b/glance/tests/unit/base.py
index 606cb037a2..4b069e2299 100644
--- a/glance/tests/unit/base.py
+++ b/glance/tests/unit/base.py
@@ -14,10 +14,10 @@
 #    under the License.
 
 import os
+from unittest import mock
 
 import glance_store as store
 from glance_store import location
-import mock
 from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_db import options
diff --git a/glance/tests/unit/common/scripts/image_import/test_main.py b/glance/tests/unit/common/scripts/image_import/test_main.py
index d9e6b1347e..db06ec85ba 100644
--- a/glance/tests/unit/common/scripts/image_import/test_main.py
+++ b/glance/tests/unit/common/scripts/image_import/test_main.py
@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from six.moves import urllib
 
 import glance.common.exception as exception
diff --git a/glance/tests/unit/common/scripts/test_scripts_utils.py b/glance/tests/unit/common/scripts/test_scripts_utils.py
index cb467d5c1f..986c1ee6ec 100644
--- a/glance/tests/unit/common/scripts/test_scripts_utils.py
+++ b/glance/tests/unit/common/scripts/test_scripts_utils.py
@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from six.moves import urllib
 
 from glance.common import exception
diff --git a/glance/tests/unit/common/test_client.py b/glance/tests/unit/common/test_client.py
index d57d3ee80f..c834dd1517 100644
--- a/glance/tests/unit/common/test_client.py
+++ b/glance/tests/unit/common/test_client.py
@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from six.moves import http_client
 import testtools
 
diff --git a/glance/tests/unit/common/test_scripts.py b/glance/tests/unit/common/test_scripts.py
index 5c47ec9925..da74e68d7f 100644
--- a/glance/tests/unit/common/test_scripts.py
+++ b/glance/tests/unit/common/test_scripts.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 
-import mock
+from unittest import mock
 
 import glance.common.scripts as scripts
 from glance.common.scripts.image_import import main as image_import
diff --git a/glance/tests/unit/common/test_timeutils.py b/glance/tests/unit/common/test_timeutils.py
index debe01062e..678d30c127 100644
--- a/glance/tests/unit/common/test_timeutils.py
+++ b/glance/tests/unit/common/test_timeutils.py
@@ -15,9 +15,9 @@
 
 import calendar
 import datetime
+from unittest import mock
 
 import iso8601
-import mock
 
 from glance.common import timeutils
 from glance.tests import utils as test_utils
diff --git a/glance/tests/unit/common/test_utils.py b/glance/tests/unit/common/test_utils.py
index 57f2ffc43b..9d8fc0ebf0 100644
--- a/glance/tests/unit/common/test_utils.py
+++ b/glance/tests/unit/common/test_utils.py
@@ -15,8 +15,8 @@
 #    under the License.
 
 import glance_store as store
-import mock
 import tempfile
+from unittest import mock
 
 from oslo_config import cfg
 from oslo_log import log as logging
diff --git a/glance/tests/unit/common/test_wsgi.py b/glance/tests/unit/common/test_wsgi.py
index f9ce557e78..98726e729d 100644
--- a/glance/tests/unit/common/test_wsgi.py
+++ b/glance/tests/unit/common/test_wsgi.py
@@ -19,11 +19,11 @@ import datetime
 import gettext
 import os
 import socket
+from unittest import mock
 
 from babel import localedata
 import eventlet.patcher
 import fixtures
-import mock
 from oslo_concurrency import processutils
 from oslo_serialization import jsonutils
 import routes
diff --git a/glance/tests/unit/image_cache/drivers/test_sqlite.py b/glance/tests/unit/image_cache/drivers/test_sqlite.py
index eb5ed7d5d5..0690e51063 100644
--- a/glance/tests/unit/image_cache/drivers/test_sqlite.py
+++ b/glance/tests/unit/image_cache/drivers/test_sqlite.py
@@ -18,9 +18,9 @@ Tests for the sqlite image_cache driver.
 """
 
 import os
+from unittest import mock
 
 import ddt
-import mock
 
 from glance.image_cache.drivers import sqlite
 from glance.tests import utils
diff --git a/glance/tests/unit/test_data_migration_framework.py b/glance/tests/unit/test_data_migration_framework.py
index 759f06e422..4492f5c266 100644
--- a/glance/tests/unit/test_data_migration_framework.py
+++ b/glance/tests/unit/test_data_migration_framework.py
@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from glance.db.sqlalchemy.alembic_migrations import data_migrations
 from glance.tests import utils as test_utils
diff --git a/glance/tests/unit/test_db.py b/glance/tests/unit/test_db.py
index e1ac678963..921c5ec752 100644
--- a/glance/tests/unit/test_db.py
+++ b/glance/tests/unit/test_db.py
@@ -15,9 +15,9 @@
 #    under the License.
 
 import datetime
+from unittest import mock
 import uuid
 
-import mock
 from oslo_config import cfg
 from oslo_db import exception as db_exc
 from oslo_utils import encodeutils
diff --git a/glance/tests/unit/test_domain.py b/glance/tests/unit/test_domain.py
index 97037f3ddd..bbdb43601c 100644
--- a/glance/tests/unit/test_domain.py
+++ b/glance/tests/unit/test_domain.py
@@ -15,9 +15,9 @@
 #    under the License.
 
 import datetime
+from unittest import mock
 import uuid
 
-import mock
 from oslo_config import cfg
 import oslo_utils.importutils
 
diff --git a/glance/tests/unit/test_domain_proxy.py b/glance/tests/unit/test_domain_proxy.py
index 6979cab776..dfe117fbc3 100644
--- a/glance/tests/unit/test_domain_proxy.py
+++ b/glance/tests/unit/test_domain_proxy.py
@@ -14,8 +14,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 # NOTE(jokke): simplified transition to py3, behaves like py2 xrange
+from unittest import mock
+
 from six.moves import range
 
 from glance.domain import proxy
diff --git a/glance/tests/unit/test_glance_manage.py b/glance/tests/unit/test_glance_manage.py
index 3facb84ab4..cc8dc11d0b 100644
--- a/glance/tests/unit/test_glance_manage.py
+++ b/glance/tests/unit/test_glance_manage.py
@@ -14,7 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from oslo_db import exception as db_exception
 
 from glance.cmd import manage
diff --git a/glance/tests/unit/test_glance_replicator.py b/glance/tests/unit/test_glance_replicator.py
index 8776e9fe1b..a98bca696a 100644
--- a/glance/tests/unit/test_glance_replicator.py
+++ b/glance/tests/unit/test_glance_replicator.py
@@ -13,6 +13,7 @@
 #    under the License.
 
 from __future__ import absolute_import
+from unittest import mock
 
 import copy
 import os
@@ -20,7 +21,6 @@ import sys
 import uuid
 
 import fixtures
-import mock
 from oslo_serialization import jsonutils
 import six
 from six import moves
diff --git a/glance/tests/unit/test_manage.py b/glance/tests/unit/test_manage.py
index f193d9171b..882cf36cc9 100644
--- a/glance/tests/unit/test_manage.py
+++ b/glance/tests/unit/test_manage.py
@@ -14,9 +14,9 @@
 #    under the License.
 
 from __future__ import absolute_import
+from unittest import mock
 
 import fixtures
-import mock
 from six.moves import StringIO
 
 from glance.cmd import manage
diff --git a/glance/tests/unit/test_notifier.py b/glance/tests/unit/test_notifier.py
index c75ce24888..72819745b4 100644
--- a/glance/tests/unit/test_notifier.py
+++ b/glance/tests/unit/test_notifier.py
@@ -15,9 +15,9 @@
 #    under the License.
 
 import datetime
+from unittest import mock
 
 import glance_store
-import mock
 from oslo_config import cfg
 import oslo_messaging
 import webob
diff --git a/glance/tests/unit/test_policy.py b/glance/tests/unit/test_policy.py
index 376a1edcf5..43f012abec 100644
--- a/glance/tests/unit/test_policy.py
+++ b/glance/tests/unit/test_policy.py
@@ -20,11 +20,11 @@ try:
     from collections.abc import Iterable
 except ImportError:
     from collections import Iterable
+from unittest import mock
 
 import hashlib
 import os.path
 
-import mock
 import oslo_config.cfg
 
 import glance.api.policy
diff --git a/glance/tests/unit/test_quota.py b/glance/tests/unit/test_quota.py
index 3930272d0a..ef2f5ba712 100644
--- a/glance/tests/unit/test_quota.py
+++ b/glance/tests/unit/test_quota.py
@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import copy
+from unittest import mock
 import uuid
 
-import mock
 from mock import patch
 from oslo_utils import encodeutils
 from oslo_utils import units
diff --git a/glance/tests/unit/test_scrubber.py b/glance/tests/unit/test_scrubber.py
index b7a1b93e55..9d1d1d5ed0 100644
--- a/glance/tests/unit/test_scrubber.py
+++ b/glance/tests/unit/test_scrubber.py
@@ -13,10 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
 import uuid
 
 import glance_store
-import mock
 from mock import patch
 from oslo_config import cfg
 # NOTE(jokke): simplified transition to py3, behaves like py2 xrange
diff --git a/glance/tests/unit/test_store_image.py b/glance/tests/unit/test_store_image.py
index b351d63504..629f7be474 100644
--- a/glance/tests/unit/test_store_image.py
+++ b/glance/tests/unit/test_store_image.py
@@ -16,7 +16,7 @@ from cryptography import exceptions as crypto_exception
 from cursive import exception as cursive_exception
 from cursive import signature_utils
 import glance_store
-import mock
+from unittest import mock
 
 from glance.common import exception
 import glance.location
diff --git a/glance/tests/unit/test_store_location.py b/glance/tests/unit/test_store_location.py
index a3db624528..40d7ce07cb 100644
--- a/glance/tests/unit/test_store_location.py
+++ b/glance/tests/unit/test_store_location.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import glance_store
-import mock
+from unittest import mock
 
 from glance.common import exception
 from glance.common import store_utils
diff --git a/glance/tests/unit/utils.py b/glance/tests/unit/utils.py
index 5765c08104..2940b24f1b 100644
--- a/glance/tests/unit/utils.py
+++ b/glance/tests/unit/utils.py
@@ -16,7 +16,8 @@
 
 from cryptography import exceptions as crypto_exception
 import glance_store as store
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 from six.moves import urllib
 
diff --git a/glance/tests/unit/v2/test_image_data_resource.py b/glance/tests/unit/v2/test_image_data_resource.py
index 97bd7fd947..07de070965 100644
--- a/glance/tests/unit/v2/test_image_data_resource.py
+++ b/glance/tests/unit/v2/test_image_data_resource.py
@@ -12,12 +12,12 @@
 #    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 unittest import mock
 import uuid
 
 from cursive import exception as cursive_exception
 import glance_store
 from glance_store._drivers import filesystem
-import mock
 import six
 from six.moves import http_client as http
 import webob
diff --git a/glance/tests/unit/v2/test_images_resource.py b/glance/tests/unit/v2/test_images_resource.py
index cc20bc98b2..74911b99e7 100644
--- a/glance/tests/unit/v2/test_images_resource.py
+++ b/glance/tests/unit/v2/test_images_resource.py
@@ -17,11 +17,11 @@ import datetime
 import eventlet
 import hashlib
 import os
+from unittest import mock
 import uuid
 
 from castellan.common import exception as castellan_exception
 import glance_store as store
-import mock
 from oslo_config import cfg
 from oslo_serialization import jsonutils
 import six
diff --git a/glance/tests/unit/v2/test_metadef_resources.py b/glance/tests/unit/v2/test_metadef_resources.py
index f96ff01bf6..f29df00ed0 100644
--- a/glance/tests/unit/v2/test_metadef_resources.py
+++ b/glance/tests/unit/v2/test_metadef_resources.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 import datetime
-import mock
+from unittest import mock
 
 from oslo_serialization import jsonutils
 import webob
diff --git a/glance/tests/unit/v2/test_tasks_resource.py b/glance/tests/unit/v2/test_tasks_resource.py
index 79d31d0435..db634dd383 100644
--- a/glance/tests/unit/v2/test_tasks_resource.py
+++ b/glance/tests/unit/v2/test_tasks_resource.py
@@ -15,9 +15,9 @@
 #    under the License.
 
 import datetime
+from unittest import mock
 import uuid
 
-import mock
 from oslo_config import cfg
 from oslo_serialization import jsonutils
 from six.moves import http_client as http
diff --git a/glance/tests/utils.py b/glance/tests/utils.py
index 7962030d12..f267226c53 100644
--- a/glance/tests/utils.py
+++ b/glance/tests/utils.py
@@ -24,10 +24,10 @@ import socket
 import subprocess
 import threading
 import time
+from unittest import mock
 
 from alembic import command as alembic_command
 import fixtures
-import mock
 from oslo_config import cfg
 from oslo_config import fixture as cfg_fixture
 from oslo_log.fixture import logging_error as log_fixture
diff --git a/test-requirements.txt b/test-requirements.txt
index 9b0a775920..0b26d01192 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,7 +12,6 @@ Babel!=2.4.0,>=2.3.4 # BSD
 coverage!=4.4,>=4.0 # Apache-2.0
 ddt>=1.0.1 # MIT
 fixtures>=3.0.0 # Apache-2.0/BSD
-mock>=2.0.0 # BSD
 requests>=2.14.2 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testresources>=2.0.0 # Apache-2.0/BSD