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

novaclient/tests/unit/test_api_versions.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 import novaclient
 from novaclient import api_versions

novaclient/tests/unit/test_client.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 import copy
+from unittest import mock
 
 from keystoneauth1 import session
-import mock
 from oslo_utils import uuidutils
 
 import novaclient.api_versions

novaclient/tests/unit/test_crypto.py

@@ -14,8 +14,7 @@
 
 import base64
 import subprocess
-
-import mock
+from unittest import mock
 
 from novaclient import crypto
 from novaclient.tests.unit import utils

novaclient/tests/unit/test_discover.py

@@ -15,8 +15,8 @@
 
 import imp
 import inspect
+from unittest import mock
 
-import mock
 import pkg_resources
 
 from novaclient import client

novaclient/tests/unit/test_shell.py

@@ -16,11 +16,11 @@ import distutils.version as dist_version
 import io
 import re
 import sys
+from unittest import mock
 
 import ddt
 import fixtures
 from keystoneauth1 import fixture
-import mock
 import prettytable
 import requests_mock
 from testtools import matchers

novaclient/tests/unit/test_utils.py

@@ -13,10 +13,9 @@
 
 import io
 import sys
+from unittest import mock
 from urllib import parse
 
-import mock
-
 from novaclient import base
 from novaclient import exceptions
 from novaclient.tests.unit import fakes

novaclient/tests/unit/utils.py

@@ -12,9 +12,9 @@
 #    under the License.
 
 import os
+from unittest import mock
 
 import fixtures
-import mock
 from oslo_serialization import jsonutils
 import requests
 from requests_mock.contrib import fixture as requests_mock_fixture

novaclient/tests/unit/v2/fakes.py

@@ -17,9 +17,9 @@
 import copy
 import datetime
 import re
+from unittest import mock
 from urllib import parse
 
-import mock
 from oslo_utils import strutils
 
 import novaclient

novaclient/tests/unit/v2/test_flavors.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from novaclient import api_versions
 from novaclient import base

novaclient/tests/unit/v2/test_images.py

@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from novaclient.tests.unit.fixture_data import client
 from novaclient.tests.unit.fixture_data import images as data

novaclient/tests/unit/v2/test_servers.py

@@ -16,8 +16,7 @@ import base64
 import io
 import os
 import tempfile
-
-import mock
+from unittest import mock
 
 from novaclient import api_versions
 from novaclient import exceptions

novaclient/tests/unit/v2/test_shell.py

@@ -23,9 +23,9 @@ import collections
 import datetime
 import io
 import os
+from unittest import mock
 
 import fixtures
-import mock
 from oslo_utils import timeutils
 import testtools
 

novaclient/tests/unit/v2/test_versions.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from novaclient import api_versions
 from novaclient import exceptions as exc

novaclient/tests/unit/v2/test_volumes.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from novaclient import api_versions
 from novaclient.tests.unit import utils

test-requirements.txt

@@ -7,7 +7,6 @@ bandit>=1.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
 python-keystoneclient>=3.8.0 # Apache-2.0
 python-cinderclient!=4.0.0,>=3.3.0 # Apache-2.0
 python-glanceclient>=2.8.0 # Apache-2.0