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

14 files changed, 32 insertions, 35 deletions

diff --git a/cinderclient/tests/unit/test_api_versions.py b/cinderclient/tests/unit/test_api_versions.py
index 02e4450..0f86900 100644
--- a/cinderclient/tests/unit/test_api_versions.py
+++ b/cinderclient/tests/unit/test_api_versions.py
@@ -13,17 +13,17 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import ddt
-import mock
 import six
 
 from cinderclient import api_versions
 from cinderclient import client as base_client
 from cinderclient import exceptions
-from cinderclient.v3 import client
-
 from cinderclient.tests.unit import test_utils
 from cinderclient.tests.unit import utils
+from cinderclient.v3 import client
 
 
 @ddt.ddt
diff --git a/cinderclient/tests/unit/test_base.py b/cinderclient/tests/unit/test_base.py
index 63c569b..1b54549 100644
--- a/cinderclient/tests/unit/test_base.py
+++ b/cinderclient/tests/unit/test_base.py
@@ -12,30 +12,28 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
-from requests import Response
+from unittest import mock
+
+import requests
 import six
 
 from cinderclient import api_versions
 from cinderclient.apiclient import base as common_base
 from cinderclient import base
 from cinderclient import exceptions
-from cinderclient.v3 import client
-from cinderclient.v3 import volumes
-
 from cinderclient.tests.unit import test_utils
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v2 import fakes
-
+from cinderclient.v3 import client
+from cinderclient.v3 import volumes
 
 cs = fakes.FakeClient()
 
-
 REQUEST_ID = 'req-test-request-id'
 
 
 def create_response_obj_with_header():
-    resp = Response()
+    resp = requests.Response()
     resp.headers['x-openstack-request-id'] = REQUEST_ID
     resp.headers['Etag'] = 'd5103bf7b26ff0310200d110da3ed186'
     resp.status_code = 200
diff --git a/cinderclient/tests/unit/test_client.py b/cinderclient/tests/unit/test_client.py
index 874cdcc..6770f24 100644
--- a/cinderclient/tests/unit/test_client.py
+++ b/cinderclient/tests/unit/test_client.py
@@ -13,22 +13,21 @@
 
 import json
 import logging
+from unittest import mock
 
 import ddt
 import fixtures
 from keystoneauth1 import adapter
 from keystoneauth1 import exceptions as keystone_exception
-import mock
 from oslo_serialization import jsonutils
 import six
 
 from cinderclient import api_versions
 import cinderclient.client
 from cinderclient import exceptions
-import cinderclient.v2.client
-
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v3 import fakes
+import cinderclient.v2.client
 
 
 @ddt.ddt
diff --git a/cinderclient/tests/unit/test_exceptions.py b/cinderclient/tests/unit/test_exceptions.py
index 2504f6e..0ecda02 100644
--- a/cinderclient/tests/unit/test_exceptions.py
+++ b/cinderclient/tests/unit/test_exceptions.py
@@ -15,7 +15,8 @@
 """Tests the cinderclient.exceptions module."""
 
 import datetime
-import mock
+from unittest import mock
+
 import requests
 
 from cinderclient import exceptions
diff --git a/cinderclient/tests/unit/test_http.py b/cinderclient/tests/unit/test_http.py
index 73ce6ae..534a216 100644
--- a/cinderclient/tests/unit/test_http.py
+++ b/cinderclient/tests/unit/test_http.py
@@ -12,10 +12,11 @@
 # limitations under the License.
 
 import json
-import mock
-import requests
+from unittest import mock
 import uuid
 
+import requests
+
 from cinderclient import client
 from cinderclient import exceptions
 from cinderclient.tests.unit import utils
diff --git a/cinderclient/tests/unit/test_shell.py b/cinderclient/tests/unit/test_shell.py
index 430f4fb..ac7404c 100644
--- a/cinderclient/tests/unit/test_shell.py
+++ b/cinderclient/tests/unit/test_shell.py
@@ -15,6 +15,7 @@ import argparse
 import re
 import sys
 import unittest
+from unittest import mock
 
 import ddt
 import fixtures
@@ -22,7 +23,6 @@ import keystoneauth1.exceptions as ks_exc
 from keystoneauth1.exceptions import DiscoveryFailure
 from keystoneauth1.identity.generic.password import Password as ks_password
 from keystoneauth1 import session
-import mock
 import requests_mock
 from six import moves
 from testtools import matchers
diff --git a/cinderclient/tests/unit/test_utils.py b/cinderclient/tests/unit/test_utils.py
index 0cb12a6..8b3b7a6 100644
--- a/cinderclient/tests/unit/test_utils.py
+++ b/cinderclient/tests/unit/test_utils.py
@@ -12,10 +12,10 @@
 # limitations under the License.
 
 import collections
-import ddt
 import sys
+from unittest import mock
 
-import mock
+import ddt
 import six
 from six import moves
 
@@ -24,10 +24,9 @@ from cinderclient.apiclient import base as common_base
 from cinderclient import base
 from cinderclient import exceptions
 from cinderclient import shell_utils
-from cinderclient import utils
-
 from cinderclient.tests.unit import utils as test_utils
 from cinderclient.tests.unit.v2 import fakes
+from cinderclient import utils
 
 UUID = '8e8ec658-c7b0-4243-bdf8-6f7f2952c0d0'
 
diff --git a/cinderclient/tests/unit/utils.py b/cinderclient/tests/unit/utils.py
index 124b714..8f4e9ac 100644
--- a/cinderclient/tests/unit/utils.py
+++ b/cinderclient/tests/unit/utils.py
@@ -13,9 +13,9 @@
 
 import json
 import os
+from unittest import mock
 
 import fixtures
-import mock
 import requests
 from requests_mock.contrib import fixture as requests_mock_fixture
 import six
diff --git a/cinderclient/tests/unit/v2/test_auth.py b/cinderclient/tests/unit/v2/test_auth.py
index 50c72a3..5d7a4bc 100644
--- a/cinderclient/tests/unit/v2/test_auth.py
+++ b/cinderclient/tests/unit/v2/test_auth.py
@@ -15,14 +15,13 @@
 #    under the License.
 
 import json
+from unittest import mock
 
-import mock
 import requests
 
 from cinderclient import exceptions
-from cinderclient.v2 import client
-
 from cinderclient.tests.unit import utils
+from cinderclient.v2 import client
 
 
 class AuthenticateAgainstKeystoneTests(utils.TestCase):
diff --git a/cinderclient/tests/unit/v2/test_limits.py b/cinderclient/tests/unit/v2/test_limits.py
index b1732e5..34ed1d2 100644
--- a/cinderclient/tests/unit/v2/test_limits.py
+++ b/cinderclient/tests/unit/v2/test_limits.py
@@ -13,8 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from unittest import mock
+
 import ddt
-import mock
 
 from cinderclient.tests.unit import utils
 from cinderclient.v2 import limits
diff --git a/cinderclient/tests/unit/v2/test_shell.py b/cinderclient/tests/unit/v2/test_shell.py
index a610753..f6f6355 100644
--- a/cinderclient/tests/unit/v2/test_shell.py
+++ b/cinderclient/tests/unit/v2/test_shell.py
@@ -13,22 +13,22 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import ddt
 import fixtures
-import mock
 from requests_mock.contrib import fixture as requests_mock_fixture
 from six.moves.urllib import parse
 
 from cinderclient import client
 from cinderclient import exceptions
 from cinderclient import shell
-from cinderclient.v2 import shell as test_shell
-from cinderclient.v2 import volume_backups
-from cinderclient.v2 import volumes
-
 from cinderclient.tests.unit.fixture_data import keystone_client
 from cinderclient.tests.unit import utils
 from cinderclient.tests.unit.v2 import fakes
+from cinderclient.v2 import shell as test_shell
+from cinderclient.v2 import volume_backups
+from cinderclient.v2 import volumes
 
 
 @ddt.ddt
diff --git a/cinderclient/tests/unit/v3/test_shell.py b/cinderclient/tests/unit/v3/test_shell.py
index 6a25238..8338a34 100644
--- a/cinderclient/tests/unit/v3/test_shell.py
+++ b/cinderclient/tests/unit/v3/test_shell.py
@@ -38,9 +38,10 @@
 #                                                   'volume_id': '1234'})
 #             return original(manager, name_or_id, **kwargs)
 
+from unittest import mock
+
 import ddt
 import fixtures
-import mock
 from requests_mock.contrib import fixture as requests_mock_fixture
 import six
 from six.moves.urllib import parse
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 7e8989a..11e6cd7 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -16,7 +16,6 @@ jsonschema==2.6.0
 keystoneauth1==3.4.0
 linecache2==1.0.0
 mccabe==0.2.1
-mock==2.0.0
 monotonic==0.6
 msgpack-python==0.4.0
 netaddr==0.7.18
diff --git a/test-requirements.txt b/test-requirements.txt
index 7aa4096..fdc3d25 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,6 @@ hacking>=3.0.1,<3.1.0 # Apache-2.0
 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
 reno>=3.1.0 # Apache-2.0
 requests-mock>=1.2.0 # Apache-2.0
 tempest>=17.1.0 # Apache-2.0