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

cyborgclient/tests/unit/common/test_httpclient.py

@@ -13,8 +13,8 @@
 #    under the License.
 
 import json
+from unittest import mock
 
-import mock
 import six
 
 

cyborgclient/tests/unit/osc/test_plugin.py

@@ -10,9 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
 from openstack import connection as sdk_connection
 import testtools
+from unittest import mock
 
 from cyborgclient.osc import plugin
 

cyborgclient/tests/unit/osc/v2/fakes.py

@@ -12,8 +12,8 @@
 #
 
 from cyborgclient.tests.unit.osc import fakes
-import mock
 from osc_lib.tests import utils
+from unittest import mock
 import uuid
 
 deployable_created_at = '2019-06-24T00:00:00.000000+00:00'

cyborgclient/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
 

cyborgclient/tests/unit/v1/shell_test_base.py

@@ -12,8 +12,8 @@
 #    under the License.
 
 import re
+from unittest import mock
 
-import mock
 from testtools import matchers
 
 from cyborgclient.tests.unit import utils

cyborgclient/tests/unit/v1/test_accelerators_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 cyborgclient.tests.unit.v1 import shell_test_base
 

cyborgclient/tests/unit/v1/test_client.py

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