Use unittest.mock instead of third party mock8.1.0

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: I3e1e5ed4e72837d45b78e5ccb9ce8cca416e5c11
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>

15 files changed, 14 insertions, 17 deletions

diff --git a/lower-constraints.txt b/lower-constraints.txt
index 6e34d7b..87aa12b 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -23,7 +23,6 @@ linecache2==1.0.0
 Mako==0.4.0
 MarkupSafe==1.0
 mccabe==0.2.1
-mock==2.0.0
 monotonic==0.6
 netaddr==0.7.18
 netifaces==0.10.4
diff --git a/oslo_db/tests/sqlalchemy/test_enginefacade.py b/oslo_db/tests/sqlalchemy/test_enginefacade.py
index 5788fb3..bc37536 100644
--- a/oslo_db/tests/sqlalchemy/test_enginefacade.py
+++ b/oslo_db/tests/sqlalchemy/test_enginefacade.py
@@ -16,9 +16,9 @@ import copy
 import fixtures
 import pickle
 import sys
+from unittest import mock
 import warnings
 
-import mock
 from oslo_config import cfg
 from oslo_context import context as oslo_context
 from oslotest import base as oslo_test_base
diff --git a/oslo_db/tests/sqlalchemy/test_exc_filters.py b/oslo_db/tests/sqlalchemy/test_exc_filters.py
index 4ba03c1..0451c89 100644
--- a/oslo_db/tests/sqlalchemy/test_exc_filters.py
+++ b/oslo_db/tests/sqlalchemy/test_exc_filters.py
@@ -16,8 +16,8 @@
 
 import contextlib
 import itertools
+from unittest import mock
 
-import mock
 from oslotest import base as oslo_test_base
 import sqlalchemy as sqla
 from sqlalchemy.engine import url as sqla_url
diff --git a/oslo_db/tests/sqlalchemy/test_fixtures.py b/oslo_db/tests/sqlalchemy/test_fixtures.py
index af6bfa5..6b9fb20 100644
--- a/oslo_db/tests/sqlalchemy/test_fixtures.py
+++ b/oslo_db/tests/sqlalchemy/test_fixtures.py
@@ -10,11 +10,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import os
 import testresources
 import testscenarios
 import unittest
+from unittest import mock
 
 from oslo_db import exception
 from oslo_db.sqlalchemy import enginefacade
diff --git a/oslo_db/tests/sqlalchemy/test_migrate_cli.py b/oslo_db/tests/sqlalchemy/test_migrate_cli.py
index dc30139..4c92d64 100644
--- a/oslo_db/tests/sqlalchemy/test_migrate_cli.py
+++ b/oslo_db/tests/sqlalchemy/test_migrate_cli.py
@@ -9,9 +9,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 unittest import mock
 
 import alembic
-import mock
 from oslotest import base as test_base
 import sqlalchemy
 
diff --git a/oslo_db/tests/sqlalchemy/test_migration_common.py b/oslo_db/tests/sqlalchemy/test_migration_common.py
index 377c6a9..d0b10cd 100644
--- a/oslo_db/tests/sqlalchemy/test_migration_common.py
+++ b/oslo_db/tests/sqlalchemy/test_migration_common.py
@@ -16,10 +16,10 @@
 
 import os
 import tempfile
+from unittest import mock
 
 from migrate import exceptions as migrate_exception
 from migrate.versioning import api as versioning_api
-import mock
 import sqlalchemy
 
 from oslo_db import exception as db_exception
diff --git a/oslo_db/tests/sqlalchemy/test_migrations.py b/oslo_db/tests/sqlalchemy/test_migrations.py
index 5d27b07..4839f49 100644
--- a/oslo_db/tests/sqlalchemy/test_migrations.py
+++ b/oslo_db/tests/sqlalchemy/test_migrations.py
@@ -13,10 +13,10 @@
 #    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 fixtures
 from migrate.versioning import api as versioning_api
-import mock
 from oslotest import base as test
 import sqlalchemy as sa
 import sqlalchemy.ext.declarative as sa_decl
diff --git a/oslo_db/tests/sqlalchemy/test_models.py b/oslo_db/tests/sqlalchemy/test_models.py
index 1c7339e..2211926 100644
--- a/oslo_db/tests/sqlalchemy/test_models.py
+++ b/oslo_db/tests/sqlalchemy/test_models.py
@@ -15,8 +15,8 @@
 
 from collections import abc
 import datetime
+from unittest import mock
 
-import mock
 from oslotest import base as oslo_test
 from sqlalchemy import Column
 from sqlalchemy import Integer, String
diff --git a/oslo_db/tests/sqlalchemy/test_ndb.py b/oslo_db/tests/sqlalchemy/test_ndb.py
index 421befe..ea817ad 100644
--- a/oslo_db/tests/sqlalchemy/test_ndb.py
+++ b/oslo_db/tests/sqlalchemy/test_ndb.py
@@ -14,8 +14,7 @@
 """Tests for MySQL Cluster (NDB) Support."""
 
 import logging
-
-import mock
+from unittest import mock
 
 from oslo_db import exception
 from oslo_db.sqlalchemy import enginefacade
diff --git a/oslo_db/tests/sqlalchemy/test_provision.py b/oslo_db/tests/sqlalchemy/test_provision.py
index d985595..97d91bf 100644
--- a/oslo_db/tests/sqlalchemy/test_provision.py
+++ b/oslo_db/tests/sqlalchemy/test_provision.py
@@ -10,8 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import os
+from unittest import mock
 
 from oslotest import base as oslo_test_base
 from sqlalchemy import exc as sa_exc
diff --git a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py
index bde7303..b3e81e3 100644
--- a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py
+++ b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py
@@ -19,9 +19,9 @@
 
 import logging
 import os
+from unittest import mock
 
 import fixtures
-import mock
 from oslo_config import cfg
 from oslotest import base as oslo_test
 import sqlalchemy
diff --git a/oslo_db/tests/sqlalchemy/test_utils.py b/oslo_db/tests/sqlalchemy/test_utils.py
index 4ca09e1..e6174a7 100644
--- a/oslo_db/tests/sqlalchemy/test_utils.py
+++ b/oslo_db/tests/sqlalchemy/test_utils.py
@@ -13,10 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
 from urllib import parse
 
 import fixtures
-import mock
 from oslotest import base as test_base
 import sqlalchemy
 from sqlalchemy.dialects import mysql
diff --git a/oslo_db/tests/test_api.py b/oslo_db/tests/test_api.py
index 7aafba6..8bf2489 100644
--- a/oslo_db/tests/test_api.py
+++ b/oslo_db/tests/test_api.py
@@ -15,7 +15,8 @@
 
 """Unit tests for DB API."""
 
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 from oslo_utils import importutils
 
diff --git a/oslo_db/tests/test_concurrency.py b/oslo_db/tests/test_concurrency.py
index 051da2b..91e2f64 100644
--- a/oslo_db/tests/test_concurrency.py
+++ b/oslo_db/tests/test_concurrency.py
@@ -14,8 +14,7 @@
 #    under the License.
 
 import sys
-
-import mock
+from unittest import mock
 
 from oslo_db import concurrency
 from oslo_db.tests import utils as test_utils
diff --git a/test-requirements.txt b/test-requirements.txt
index 4fc397b..4f26aa4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,7 +5,6 @@ hacking>=3.0,<3.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
 fixtures>=3.0.0 # Apache-2.0/BSD
-mock>=2.0.0 # BSD
 python-subunit>=1.0.0 # Apache-2.0/BSD
 oslotest>=3.2.0 # Apache-2.0
 oslo.context>=2.19.2 # Apache-2.0