From 0947b53bdf1a6ca72a05765e997372eda2ca294b Mon Sep 17 00:00:00 2001
From: Sean McGinnis <sean.mcginnis@gmail.com>
Date: Sat, 18 Apr 2020 12:01:29 -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: I436eab174b823c1e0e028529fed9009cc38776bc
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
---
 test-requirements.txt                   | 1 -
 virtualbmc/tests/unit/cmd/test_vbmc.py  | 2 +-
 virtualbmc/tests/unit/cmd/test_vbmcd.py | 2 +-
 virtualbmc/tests/unit/test_config.py    | 2 +-
 virtualbmc/tests/unit/test_control.py   | 2 +-
 virtualbmc/tests/unit/test_manager.py   | 2 +-
 virtualbmc/tests/unit/test_utils.py     | 2 +-
 virtualbmc/tests/unit/test_vbmc.py      | 2 +-
 8 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index d45a799..e705ad4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,7 +14,6 @@ testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 stestr>=1.0.0 # Apache-2.0
-mock>=2.0.0 # BSD
 
 # releasenotes
 reno>=2.5.0 # Apache-2.0
diff --git a/virtualbmc/tests/unit/cmd/test_vbmc.py b/virtualbmc/tests/unit/cmd/test_vbmc.py
index 320cec7..c340fa3 100644
--- a/virtualbmc/tests/unit/cmd/test_vbmc.py
+++ b/virtualbmc/tests/unit/cmd/test_vbmc.py
@@ -15,8 +15,8 @@
 
 import io
 import json
-import mock
 import sys
+from unittest import mock
 
 import zmq
 
diff --git a/virtualbmc/tests/unit/cmd/test_vbmcd.py b/virtualbmc/tests/unit/cmd/test_vbmcd.py
index 7b066f3..e62a1b4 100644
--- a/virtualbmc/tests/unit/cmd/test_vbmcd.py
+++ b/virtualbmc/tests/unit/cmd/test_vbmcd.py
@@ -15,8 +15,8 @@
 
 import builtins
 import os
+from unittest import mock
 
-import mock
 
 from virtualbmc.cmd import vbmcd
 from virtualbmc import control
diff --git a/virtualbmc/tests/unit/test_config.py b/virtualbmc/tests/unit/test_config.py
index 1583850..7219971 100644
--- a/virtualbmc/tests/unit/test_config.py
+++ b/virtualbmc/tests/unit/test_config.py
@@ -15,8 +15,8 @@
 
 import configparser
 import os
+from unittest import mock
 
-import mock
 
 from virtualbmc import config
 from virtualbmc.tests.unit import base
diff --git a/virtualbmc/tests/unit/test_control.py b/virtualbmc/tests/unit/test_control.py
index 50932b6..a588a53 100644
--- a/virtualbmc/tests/unit/test_control.py
+++ b/virtualbmc/tests/unit/test_control.py
@@ -15,8 +15,8 @@
 
 import json
 import os
+from unittest import mock
 
-import mock
 
 import zmq
 
diff --git a/virtualbmc/tests/unit/test_manager.py b/virtualbmc/tests/unit/test_manager.py
index 23ec4bb..e8cd660 100644
--- a/virtualbmc/tests/unit/test_manager.py
+++ b/virtualbmc/tests/unit/test_manager.py
@@ -20,8 +20,8 @@ import errno
 import multiprocessing
 import os
 import shutil
+from unittest import mock
 
-import mock
 
 from virtualbmc import exception
 from virtualbmc import manager
diff --git a/virtualbmc/tests/unit/test_utils.py b/virtualbmc/tests/unit/test_utils.py
index c173026..16ed6e3 100644
--- a/virtualbmc/tests/unit/test_utils.py
+++ b/virtualbmc/tests/unit/test_utils.py
@@ -14,9 +14,9 @@
 #    under the License.
 
 import os
+from unittest import mock
 
 import libvirt
-import mock
 
 from virtualbmc import exception
 from virtualbmc.tests.unit import base
diff --git a/virtualbmc/tests/unit/test_vbmc.py b/virtualbmc/tests/unit/test_vbmc.py
index 8f37764..cf4c2eb 100644
--- a/virtualbmc/tests/unit/test_vbmc.py
+++ b/virtualbmc/tests/unit/test_vbmc.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 import libvirt
-import mock
+from unittest import mock
 
 from virtualbmc import exception
 from virtualbmc.tests.unit import base