From 65a95cbd18071a042cafa17c092671bfad6b0133 Mon Sep 17 00:00:00 2001
From: Sean McGinnis <sean.mcginnis@gmail.com>
Date: Sat, 18 Apr 2020 11:58:42 -0500
Subject: [PATCH] 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: If3a760ea142023791d44350d4603b329b4396f6b
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
---
 masakariclient/tests/unit/osc/v1/test_host.py         | 2 +-
 masakariclient/tests/unit/osc/v1/test_notification.py | 2 +-
 masakariclient/tests/unit/osc/v1/test_segment.py      | 3 ++-
 masakariclient/tests/unit/test_cliargs.py             | 2 +-
 masakariclient/tests/unit/test_client.py              | 2 +-
 masakariclient/tests/unit/test_shell.py               | 3 ++-
 masakariclient/tests/unit/v1/test_client.py           | 2 +-
 masakariclient/tests/unit/v1/test_shell.py            | 3 ++-
 8 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/masakariclient/tests/unit/osc/v1/test_host.py b/masakariclient/tests/unit/osc/v1/test_host.py
index c92dd29..9e13b43 100644
--- a/masakariclient/tests/unit/osc/v1/test_host.py
+++ b/masakariclient/tests/unit/osc/v1/test_host.py
@@ -17,7 +17,7 @@ test_masakariclient
 
 Tests for `masakariclient` module.
 """
-import mock
+from unittest import mock
 import uuid
 
 from osc_lib import utils
diff --git a/masakariclient/tests/unit/osc/v1/test_notification.py b/masakariclient/tests/unit/osc/v1/test_notification.py
index 8a699c2..9d48f0d 100644
--- a/masakariclient/tests/unit/osc/v1/test_notification.py
+++ b/masakariclient/tests/unit/osc/v1/test_notification.py
@@ -17,7 +17,7 @@ test_masakariclient
 
 Tests for `masakariclient` module.
 """
-import mock
+from unittest import mock
 import uuid
 
 from osc_lib.tests import utils as osc_lib_utils
diff --git a/masakariclient/tests/unit/osc/v1/test_segment.py b/masakariclient/tests/unit/osc/v1/test_segment.py
index fe7e84a..d502df5 100644
--- a/masakariclient/tests/unit/osc/v1/test_segment.py
+++ b/masakariclient/tests/unit/osc/v1/test_segment.py
@@ -17,8 +17,9 @@ test_masakariclient
 
 Tests for `masakariclient` module.
 """
+from unittest import mock
+
 import ddt
-import mock
 import uuid
 
 from osc_lib.tests import utils as osc_lib_utils
diff --git a/masakariclient/tests/unit/test_cliargs.py b/masakariclient/tests/unit/test_cliargs.py
index d5648e4..559ab59 100644
--- a/masakariclient/tests/unit/test_cliargs.py
+++ b/masakariclient/tests/unit/test_cliargs.py
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from masakariclient import cliargs
 
diff --git a/masakariclient/tests/unit/test_client.py b/masakariclient/tests/unit/test_client.py
index 578a317..618a95e 100644
--- a/masakariclient/tests/unit/test_client.py
+++ b/masakariclient/tests/unit/test_client.py
@@ -18,7 +18,7 @@ test_masakariclient
 
 Tests for `masakariclient` module.
 """
-import mock
+from unittest import mock
 
 from masakariclient import client as mc
 from masakariclient.common import utils
diff --git a/masakariclient/tests/unit/test_shell.py b/masakariclient/tests/unit/test_shell.py
index d19721f..7e0248e 100644
--- a/masakariclient/tests/unit/test_shell.py
+++ b/masakariclient/tests/unit/test_shell.py
@@ -19,7 +19,8 @@ test_shell
 Tests for `masakariclient` module.
 """
 import logging
-import mock
+from unittest import mock
+
 import six
 import sys
 import testtools
diff --git a/masakariclient/tests/unit/v1/test_client.py b/masakariclient/tests/unit/v1/test_client.py
index 276210d..e69d277 100644
--- a/masakariclient/tests/unit/v1/test_client.py
+++ b/masakariclient/tests/unit/v1/test_client.py
@@ -17,7 +17,7 @@ test_masakariclient
 
 Tests for `masakariclient` module.
 """
-import mock
+from unittest import mock
 
 from keystoneauth1.identity.generic import password as ks_password
 from keystoneauth1 import session as ks_session
diff --git a/masakariclient/tests/unit/v1/test_shell.py b/masakariclient/tests/unit/v1/test_shell.py
index 44e4e7b..2a83a8e 100644
--- a/masakariclient/tests/unit/v1/test_shell.py
+++ b/masakariclient/tests/unit/v1/test_shell.py
@@ -18,8 +18,9 @@ test_masakariclient
 Tests for `masakariclient` module.
 """
 
+from unittest import mock
+
 import ddt
-import mock
 import six
 import sys