Merge "Use unittest.mock instead of third party mock"

keystoneclient/tests/unit/auth/test_cli.py

@@ -11,10 +11,10 @@
 # under the License.
 
 import argparse
+from unittest import mock
 import uuid
 
 import fixtures
-import mock
 from oslo_config import cfg
 
 from keystoneclient.auth import base

keystoneclient/tests/unit/auth/test_conf.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 oslo_config import cfg
 from oslo_config import fixture as config
 import stevedore

keystoneclient/tests/unit/auth/test_default_cli.py

@@ -11,9 +11,9 @@
 # under the License.
 
 import argparse
+from unittest import mock
 import uuid
 
-import mock
 
 from keystoneclient.auth.identity.generic import cli
 from keystoneclient import exceptions

keystoneclient/tests/unit/auth/test_identity_common.py

@@ -12,11 +12,11 @@
 
 import abc
 import datetime
+from unittest import mock
 import uuid
 
 from keystoneauth1 import fixture
 from keystoneauth1 import plugin
-import mock
 from oslo_utils import timeutils
 import six
 

keystoneclient/tests/unit/auth/test_identity_v2.py

@@ -12,9 +12,9 @@
 
 import argparse
 import copy
+from unittest import mock
 import uuid
 
-import mock
 
 from keystoneclient.auth.identity import v2
 from keystoneclient import exceptions

keystoneclient/tests/unit/auth/test_identity_v3.py

@@ -12,10 +12,10 @@
 
 import argparse
 import copy
+from unittest import mock
 import uuid
 
 from keystoneauth1 import fixture
-import mock
 
 from keystoneclient import access
 from keystoneclient.auth.identity import v3

keystoneclient/tests/unit/auth/test_password.py

@@ -11,9 +11,9 @@
 # under the License.
 
 import argparse
+from unittest import mock
 import uuid
 
-import mock
 
 from keystoneclient.auth.identity.generic import password
 from keystoneclient.auth.identity import v2

keystoneclient/tests/unit/auth/utils.py

@@ -11,10 +11,10 @@
 # under the License.
 
 import functools
+from unittest import mock
 import uuid
 
 from keystoneauth1 import fixture
-import mock
 from oslo_config import cfg
 
 from keystoneclient import access

keystoneclient/tests/unit/test_cms.py

@@ -13,8 +13,8 @@
 import errno
 import os
 import subprocess
+from unittest import mock
 
-import mock
 import testresources
 from testtools import matchers
 

keystoneclient/tests/unit/test_https.py

@@ -10,8 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import requests
+from unittest import mock
 
 from keystoneclient import httpclient
 from keystoneclient.tests.unit import utils

keystoneclient/tests/unit/test_keyring.py

@@ -11,8 +11,8 @@
 #    under the License.
 
 import datetime
+from unittest import mock
 
-import mock
 from oslo_utils import timeutils
 
 from keystoneclient import access

keystoneclient/tests/unit/test_session.py

@@ -15,9 +15,9 @@
 import argparse
 import itertools
 import logging
+from unittest import mock
 import uuid
 
-import mock
 from oslo_config import cfg
 from oslo_config import fixture as config
 from oslo_serialization import jsonutils

keystoneclient/tests/unit/v3/test_oauth1.py

@@ -11,10 +11,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from unittest import mock
+
 import fixtures
 import uuid
 
-import mock
 import six
 from six.moves.urllib import parse as urlparse
 from testtools import matchers

keystoneclient/tests/unit/v3/test_users.py

@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 import uuid
 
 from keystoneclient import exceptions

test-requirements.txt

@@ -9,7 +9,6 @@ coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 keyring>=5.5.1 # MIT/PSF
 lxml!=3.7.0,>=3.4.1 # BSD
-mock>=2.0.0 # BSD
 oauthlib>=0.6.2 # BSD
 os-client-config>=1.28.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0