Switch from mock to unittest.mock use

The mock library is a third party lib that attempted to bridge the gap
between Python 2 and Python 3 mocking. Now that we have moved to py3
only, there is no need to use a third party lib and we can use the
standard built-in mocking support.

Change-Id: I8bbcedb7ad3f0bc2e06dfa13878a97411ee1dc6d
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>

29 files changed, 30 insertions, 32 deletions

diff --git a/keystone/tests/unit/assignment/test_backends.py b/keystone/tests/unit/assignment/test_backends.py
index 1e55dd42e..dd327c879 100644
--- a/keystone/tests/unit/assignment/test_backends.py
+++ b/keystone/tests/unit/assignment/test_backends.py
@@ -10,9 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
 import uuid
 
-import mock
 from testtools import matchers
 
 from keystone.common import provider_api
diff --git a/keystone/tests/unit/auth/test_controllers.py b/keystone/tests/unit/auth/test_controllers.py
index 67a1c8763..2c74962fd 100644
--- a/keystone/tests/unit/auth/test_controllers.py
+++ b/keystone/tests/unit/auth/test_controllers.py
@@ -12,10 +12,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
 import uuid
 
 import fixtures
-import mock
 from oslo_config import cfg
 from oslo_config import fixture as config_fixture
 import stevedore
diff --git a/keystone/tests/unit/catalog/test_backends.py b/keystone/tests/unit/catalog/test_backends.py
index 63442721c..b2989def4 100644
--- a/keystone/tests/unit/catalog/test_backends.py
+++ b/keystone/tests/unit/catalog/test_backends.py
@@ -11,9 +11,9 @@
 # under the License.
 
 import copy
+from unittest import mock
 import uuid
 
-import mock
 from testtools import matchers
 
 from keystone.catalog.backends import base
diff --git a/keystone/tests/unit/common/test_notifications.py b/keystone/tests/unit/common/test_notifications.py
index b774f0fda..26623d1f8 100644
--- a/keystone/tests/unit/common/test_notifications.py
+++ b/keystone/tests/unit/common/test_notifications.py
@@ -13,12 +13,12 @@
 #   under the License.
 
 import datetime
+from unittest import mock
 import uuid
 
 import fixtures
 import freezegun
 import http.client
-import mock
 from oslo_config import fixture as config_fixture
 from oslo_log import log
 import oslo_messaging
diff --git a/keystone/tests/unit/common/test_rbac_enforcer.py b/keystone/tests/unit/common/test_rbac_enforcer.py
index d68463f49..b235eb29d 100644
--- a/keystone/tests/unit/common/test_rbac_enforcer.py
+++ b/keystone/tests/unit/common/test_rbac_enforcer.py
@@ -10,13 +10,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
 import uuid
 
 import fixtures
 import flask
 from flask import blueprints
 import flask_restful
-import mock
 from oslo_policy import policy
 
 from keystone.common import authorization
diff --git a/keystone/tests/unit/identity/backends/test_ldap_common.py b/keystone/tests/unit/identity/backends/test_ldap_common.py
index e464a8a14..029ded643 100644
--- a/keystone/tests/unit/identity/backends/test_ldap_common.py
+++ b/keystone/tests/unit/identity/backends/test_ldap_common.py
@@ -13,11 +13,11 @@
 
 import os
 import tempfile
+from unittest import mock
 import uuid
 
 import fixtures
 import ldap.dn
-import mock
 from oslo_config import fixture as config_fixture
 
 from keystone.common import driver_hints
diff --git a/keystone/tests/unit/identity/test_core.py b/keystone/tests/unit/identity/test_core.py
index fc006054c..45ff9e97d 100644
--- a/keystone/tests/unit/identity/test_core.py
+++ b/keystone/tests/unit/identity/test_core.py
@@ -14,9 +14,9 @@
 
 import itertools
 import os
+from unittest import mock
 import uuid
 
-import mock
 from oslo_config import fixture as config_fixture
 
 from keystone.common import provider_api
diff --git a/keystone/tests/unit/receipt/test_fernet_provider.py b/keystone/tests/unit/receipt/test_fernet_provider.py
index 29e865101..e1a966e19 100644
--- a/keystone/tests/unit/receipt/test_fernet_provider.py
+++ b/keystone/tests/unit/receipt/test_fernet_provider.py
@@ -13,8 +13,8 @@
 import base64
 import datetime
 import hashlib
-import mock
 import os
+from unittest import mock
 import uuid
 
 from oslo_utils import timeutils
diff --git a/keystone/tests/unit/receipt/test_receipt_serialization.py b/keystone/tests/unit/receipt/test_receipt_serialization.py
index 61e95ebe4..8053890b1 100644
--- a/keystone/tests/unit/receipt/test_receipt_serialization.py
+++ b/keystone/tests/unit/receipt/test_receipt_serialization.py
@@ -11,10 +11,9 @@
 # under the License.
 
 import datetime
+from unittest import mock
 import uuid
 
-import mock
-
 from keystone.common.cache import _context_cache
 from keystone.common import utils as ks_utils
 from keystone import exception
diff --git a/keystone/tests/unit/resource/test_backends.py b/keystone/tests/unit/resource/test_backends.py
index fb29b23ed..627789533 100644
--- a/keystone/tests/unit/resource/test_backends.py
+++ b/keystone/tests/unit/resource/test_backends.py
@@ -11,9 +11,9 @@
 # under the License.
 
 import copy
+from unittest import mock
 import uuid
 
-import mock
 from testtools import matchers
 
 from keystone.common import driver_hints
diff --git a/keystone/tests/unit/resource/test_core.py b/keystone/tests/unit/resource/test_core.py
index 50b6b0fd2..0df43f18f 100644
--- a/keystone/tests/unit/resource/test_core.py
+++ b/keystone/tests/unit/resource/test_core.py
@@ -11,9 +11,9 @@
 # under the License.
 
 import copy
+from unittest import mock
 import uuid
 
-import mock
 from oslo_config import cfg
 from testtools import matchers
 
diff --git a/keystone/tests/unit/test_auth_plugin.py b/keystone/tests/unit/test_auth_plugin.py
index f3598ba5d..e8c867a2c 100644
--- a/keystone/tests/unit/test_auth_plugin.py
+++ b/keystone/tests/unit/test_auth_plugin.py
@@ -12,9 +12,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
 import uuid
 
-import mock
 import stevedore
 
 from keystone.api._shared import authentication
diff --git a/keystone/tests/unit/test_backend_ldap.py b/keystone/tests/unit/test_backend_ldap.py
index 77291c7f2..920e34c11 100644
--- a/keystone/tests/unit/test_backend_ldap.py
+++ b/keystone/tests/unit/test_backend_ldap.py
@@ -15,12 +15,12 @@
 # under the License.
 
 import copy
+from unittest import mock
 import uuid
 
 import fixtures
 import http.client
 import ldap
-import mock
 from oslo_log import versionutils
 import pkg_resources
 from testtools import matchers
diff --git a/keystone/tests/unit/test_backend_ldap_pool.py b/keystone/tests/unit/test_backend_ldap_pool.py
index 34fcded3d..9b5e92748 100644
--- a/keystone/tests/unit/test_backend_ldap_pool.py
+++ b/keystone/tests/unit/test_backend_ldap_pool.py
@@ -13,9 +13,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
+
 import fixtures
 import ldappool
-import mock
 
 from keystone.common import provider_api
 import keystone.conf
diff --git a/keystone/tests/unit/test_backend_sql.py b/keystone/tests/unit/test_backend_sql.py
index d3ed38dda..a5e269d44 100644
--- a/keystone/tests/unit/test_backend_sql.py
+++ b/keystone/tests/unit/test_backend_sql.py
@@ -13,9 +13,9 @@
 # under the License.
 
 import datetime
+from unittest import mock
 import uuid
 
-import mock
 from oslo_db import exception as db_exception
 from oslo_db import options
 import sqlalchemy
diff --git a/keystone/tests/unit/test_backend_templated.py b/keystone/tests/unit/test_backend_templated.py
index cca9fe7dd..4b56b37b2 100644
--- a/keystone/tests/unit/test_backend_templated.py
+++ b/keystone/tests/unit/test_backend_templated.py
@@ -12,10 +12,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
 import uuid
 
-import mock
-
 from keystone.catalog.backends import base as catalog_base
 from keystone.common import provider_api
 from keystone.tests import unit
diff --git a/keystone/tests/unit/test_cli.py b/keystone/tests/unit/test_cli.py
index 272f8183c..0c29de947 100644
--- a/keystone/tests/unit/test_cli.py
+++ b/keystone/tests/unit/test_cli.py
@@ -16,6 +16,7 @@ import copy
 import datetime
 import logging
 import os
+from unittest import mock
 import uuid
 
 import argparse
@@ -23,7 +24,6 @@ import configparser
 import fixtures
 import freezegun
 import http.client
-import mock
 import oslo_config.fixture
 from oslo_db.sqlalchemy import migration
 from oslo_log import log
diff --git a/keystone/tests/unit/test_middleware.py b/keystone/tests/unit/test_middleware.py
index 4d7c06f7e..c2c3a4fcb 100644
--- a/keystone/tests/unit/test_middleware.py
+++ b/keystone/tests/unit/test_middleware.py
@@ -14,11 +14,11 @@
 
 import copy
 import hashlib
+from unittest import mock
 import uuid
 
 import fixtures
 import http.client
-import mock
 import webtest
 
 from keystone.auth import core as auth_core
diff --git a/keystone/tests/unit/test_policy.py b/keystone/tests/unit/test_policy.py
index f093e42ef..8346549ec 100644
--- a/keystone/tests/unit/test_policy.py
+++ b/keystone/tests/unit/test_policy.py
@@ -15,9 +15,9 @@
 
 import os
 import subprocess
+from unittest import mock
 import uuid
 
-import mock
 from oslo_policy import policy as common_policy
 
 from keystone.common import policies
diff --git a/keystone/tests/unit/test_revoke.py b/keystone/tests/unit/test_revoke.py
index f5daf9397..82391ae76 100644
--- a/keystone/tests/unit/test_revoke.py
+++ b/keystone/tests/unit/test_revoke.py
@@ -12,9 +12,9 @@
 
 
 import datetime
+from unittest import mock
 import uuid
 
-import mock
 from oslo_utils import timeutils
 from testtools import matchers
 
diff --git a/keystone/tests/unit/test_sql_upgrade.py b/keystone/tests/unit/test_sql_upgrade.py
index 494797b58..044fe2c59 100644
--- a/keystone/tests/unit/test_sql_upgrade.py
+++ b/keystone/tests/unit/test_sql_upgrade.py
@@ -42,13 +42,13 @@ import datetime
 import glob
 import json
 import os
+from unittest import mock
 import uuid
 
 import fixtures
 import migrate
 from migrate.versioning import repository
 from migrate.versioning import script
-import mock
 from oslo_db import exception as db_exception
 from oslo_db.sqlalchemy import enginefacade
 from oslo_db.sqlalchemy import test_fixtures as db_fixtures
diff --git a/keystone/tests/unit/test_v3_auth.py b/keystone/tests/unit/test_v3_auth.py
index 028e3e617..e9debce63 100644
--- a/keystone/tests/unit/test_v3_auth.py
+++ b/keystone/tests/unit/test_v3_auth.py
@@ -18,11 +18,11 @@ import fixtures
 import itertools
 import operator
 import re
+from unittest import mock
 import uuid
 
 import freezegun
 import http.client
-import mock
 from oslo_serialization import jsonutils as json
 from oslo_utils import fixture
 from oslo_utils import timeutils
diff --git a/keystone/tests/unit/test_v3_credential.py b/keystone/tests/unit/test_v3_credential.py
index 49cfde146..81f2b70b7 100644
--- a/keystone/tests/unit/test_v3_credential.py
+++ b/keystone/tests/unit/test_v3_credential.py
@@ -14,11 +14,11 @@
 
 import hashlib
 import json
+from unittest import mock
 import uuid
 
 import http.client
 from keystoneclient.contrib.ec2 import utils as ec2_utils
-import mock
 from oslo_db import exception as oslo_db_exception
 from testtools import matchers
 
diff --git a/keystone/tests/unit/test_v3_federation.py b/keystone/tests/unit/test_v3_federation.py
index ad0537d87..804320a27 100644
--- a/keystone/tests/unit/test_v3_federation.py
+++ b/keystone/tests/unit/test_v3_federation.py
@@ -16,13 +16,13 @@ import random
 import re
 import subprocess
 from testtools import matchers
+from unittest import mock
 import uuid
 
 import fixtures
 import flask
 import http.client
 from lxml import etree
-import mock
 from oslo_serialization import jsonutils
 from oslo_utils import importutils
 import saml2
diff --git a/keystone/tests/unit/test_v3_identity.py b/keystone/tests/unit/test_v3_identity.py
index 3559320d9..276363713 100644
--- a/keystone/tests/unit/test_v3_identity.py
+++ b/keystone/tests/unit/test_v3_identity.py
@@ -13,12 +13,12 @@
 # under the License.
 
 import datetime
+from unittest import mock
 import uuid
 
 import fixtures
 import freezegun
 import http.client
-import mock
 from oslo_db import exception as oslo_db_exception
 from oslo_log import log
 from testtools import matchers
diff --git a/keystone/tests/unit/test_v3_oauth1.py b/keystone/tests/unit/test_v3_oauth1.py
index 4822c5847..eaa2d128e 100644
--- a/keystone/tests/unit/test_v3_oauth1.py
+++ b/keystone/tests/unit/test_v3_oauth1.py
@@ -15,11 +15,11 @@
 import copy
 import datetime
 import random
+from unittest import mock
 import uuid
 
 import freezegun
 import http.client
-import mock
 from oslo_serialization import jsonutils
 from pycadf import cadftaxonomy
 import urllib
diff --git a/keystone/tests/unit/test_v3_os_revoke.py b/keystone/tests/unit/test_v3_os_revoke.py
index 33fa4e21b..fbcfd410e 100644
--- a/keystone/tests/unit/test_v3_os_revoke.py
+++ b/keystone/tests/unit/test_v3_os_revoke.py
@@ -11,7 +11,7 @@
 # under the License.
 
 import datetime
-import mock
+from unittest import mock
 import uuid
 
 import freezegun
diff --git a/keystone/tests/unit/token/test_fernet_provider.py b/keystone/tests/unit/token/test_fernet_provider.py
index 9280ff4cc..cc2a49d0b 100644
--- a/keystone/tests/unit/token/test_fernet_provider.py
+++ b/keystone/tests/unit/token/test_fernet_provider.py
@@ -13,8 +13,8 @@
 import base64
 import datetime
 import hashlib
-import mock
 import os
+from unittest import mock
 import uuid
 
 from oslo_utils import timeutils
diff --git a/keystone/tests/unit/token/test_token_serialization.py b/keystone/tests/unit/token/test_token_serialization.py
index 99b2adff0..de101a338 100644
--- a/keystone/tests/unit/token/test_token_serialization.py
+++ b/keystone/tests/unit/token/test_token_serialization.py
@@ -11,10 +11,9 @@
 # under the License.
 
 import datetime
+from unittest import mock
 import uuid
 
-import mock
-
 from keystone.common.cache import _context_cache
 from keystone.common import utils as ks_utils
 from keystone import exception