Use unittest.mock instead of third party mock

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: I4d45ae17f6f84f945f5dd049a929216ce6b6b58e
Signed-off-by: Takashi Natsume <takanattie@gmail.com>

15 files changed, 14 insertions, 18 deletions

diff --git a/novaclient/tests/unit/test_api_versions.py b/novaclient/tests/unit/test_api_versions.py
index 89d80607..6969718f 100644
--- a/novaclient/tests/unit/test_api_versions.py
+++ b/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
diff --git a/novaclient/tests/unit/test_client.py b/novaclient/tests/unit/test_client.py
index 6b348d1b..d157b73b 100644
--- a/novaclient/tests/unit/test_client.py
+++ b/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
diff --git a/novaclient/tests/unit/test_crypto.py b/novaclient/tests/unit/test_crypto.py
index 0e876a07..3b4a80ed 100644
--- a/novaclient/tests/unit/test_crypto.py
+++ b/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
diff --git a/novaclient/tests/unit/test_discover.py b/novaclient/tests/unit/test_discover.py
index c03c1d0f..9bbbe391 100644
--- a/novaclient/tests/unit/test_discover.py
+++ b/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
diff --git a/novaclient/tests/unit/test_shell.py b/novaclient/tests/unit/test_shell.py
index 2c6af3b4..889916ea 100644
--- a/novaclient/tests/unit/test_shell.py
+++ b/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
diff --git a/novaclient/tests/unit/test_utils.py b/novaclient/tests/unit/test_utils.py
index 4a755a99..8411f3a4 100644
--- a/novaclient/tests/unit/test_utils.py
+++ b/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
diff --git a/novaclient/tests/unit/utils.py b/novaclient/tests/unit/utils.py
index f987fc3e..3a660ecc 100644
--- a/novaclient/tests/unit/utils.py
+++ b/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
diff --git a/novaclient/tests/unit/v2/fakes.py b/novaclient/tests/unit/v2/fakes.py
index 69ecc893..f3f8193a 100644
--- a/novaclient/tests/unit/v2/fakes.py
+++ b/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
diff --git a/novaclient/tests/unit/v2/test_flavors.py b/novaclient/tests/unit/v2/test_flavors.py
index e536af11..fccfc8fd 100644
--- a/novaclient/tests/unit/v2/test_flavors.py
+++ b/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
diff --git a/novaclient/tests/unit/v2/test_images.py b/novaclient/tests/unit/v2/test_images.py
index a3177a9c..5fa448e0 100644
--- a/novaclient/tests/unit/v2/test_images.py
+++ b/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
diff --git a/novaclient/tests/unit/v2/test_servers.py b/novaclient/tests/unit/v2/test_servers.py
index 0d3ca4b2..40d88a19 100644
--- a/novaclient/tests/unit/v2/test_servers.py
+++ b/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
diff --git a/novaclient/tests/unit/v2/test_shell.py b/novaclient/tests/unit/v2/test_shell.py
index adec6a4d..aeb8a560 100644
--- a/novaclient/tests/unit/v2/test_shell.py
+++ b/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
 
diff --git a/novaclient/tests/unit/v2/test_versions.py b/novaclient/tests/unit/v2/test_versions.py
index 63d63c1a..23b72840 100644
--- a/novaclient/tests/unit/v2/test_versions.py
+++ b/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
diff --git a/novaclient/tests/unit/v2/test_volumes.py b/novaclient/tests/unit/v2/test_volumes.py
index 93ea1c96..c0666118 100644
--- a/novaclient/tests/unit/v2/test_volumes.py
+++ b/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
diff --git a/test-requirements.txt b/test-requirements.txt
index 69b11b87..6882de9f 100644
--- a/test-requirements.txt
+++ b/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