Use unittest.mock instead of third party mock

Change-Id: I501ddb22496305b835fd8977b2839c7046c1c054

zunclient/tests/unit/common/test_httpclient.py

@@ -13,10 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
-import six
+from unittest import mock
 
 from oslo_serialization import jsonutils
+import six
 
 from zunclient import api_versions
 from zunclient.common.apiclient import exceptions

zunclient/tests/unit/osc/test_plugin.py

@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from zunclient import api_versions
 from zunclient.osc import plugin

zunclient/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
 
 from zunclient import api_versions
 from zunclient import exceptions

zunclient/tests/unit/test_client.py

@@ -12,7 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 import testtools
 
 from zunclient import api_versions

zunclient/tests/unit/test_shell.py

@@ -14,10 +14,10 @@
 
 import re
 import sys
+from unittest import mock
 
 import fixtures
 from keystoneauth1 import fixture
-import mock
 import six
 from testtools import matchers
 

zunclient/tests/unit/test_websocketclient.py

@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 import testtools
 
 from zunclient.common.websocketclient import websocketclient

zunclient/tests/unit/v1/shell_test_base.py

@@ -13,8 +13,8 @@
 #    under the License.
 
 import re
+from unittest import mock
 
-import mock
 from testtools import matchers
 
 from zunclient import api_versions

zunclient/tests/unit/v1/test_availability_zones_shell.py

@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from zunclient.tests.unit.v1 import shell_test_base
 

zunclient/tests/unit/v1/test_client.py

@@ -12,7 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 import testtools
 
 from zunclient.v1 import client

zunclient/tests/unit/v1/test_containers_shell.py

@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from zunclient.common.apiclient import exceptions as apiexec
 from zunclient.common import utils as zun_utils

zunclient/tests/unit/v1/test_images_shell.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from zunclient.tests.unit.v1 import shell_test_base
 

zunclient/tests/unit/v1/test_services_shell.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from zunclient.tests.unit.v1 import shell_test_base
 

zunclient/tests/unit/v1/test_versions_shell.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from zunclient.tests.unit.v1 import shell_test_base