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

brick_cinderclient_ext/tests/unit/test_brick_client.py

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

brick_cinderclient_ext/tests/unit/test_brick_utils.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
 
 import netifaces
 from oslotest import base

brick_cinderclient_ext/tests/unit/test_cli.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from cinderclient import exceptions
 from oslotest import base

brick_cinderclient_ext/tests/unit/test_volume_actions.py

@@ -10,8 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
+
 import ddt
-import mock
 import netifaces
 
 from cinderclient import exceptions as cinder_exceptions