From 8d2ac297fd8120c94e79ff8a2b8f2dc455c7e600 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Sat, 18 Apr 2020 11:53:23 -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: I94daf175305b5fd31380088e27ecec2083f89e59 Signed-off-by: Sean McGinnis --- ironic_lib/tests/test_base.py | 2 +- ironic_lib/tests/test_disk_partitioner.py | 3 ++- ironic_lib/tests/test_disk_utils.py | 2 +- ironic_lib/tests/test_exception.py | 2 +- ironic_lib/tests/test_mdns.py | 2 +- ironic_lib/tests/test_metrics.py | 2 +- ironic_lib/tests/test_metrics_statsd.py | 2 +- ironic_lib/tests/test_utils.py | 2 +- test-requirements.txt | 1 - 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ironic_lib/tests/test_base.py b/ironic_lib/tests/test_base.py index c198a46d..77f64288 100644 --- a/ironic_lib/tests/test_base.py +++ b/ironic_lib/tests/test_base.py @@ -12,8 +12,8 @@ # limitations under the License. import subprocess +from unittest import mock -import mock from oslo_concurrency import processutils from ironic_lib.tests import base diff --git a/ironic_lib/tests/test_disk_partitioner.py b/ironic_lib/tests/test_disk_partitioner.py index 059ec340..216d94bd 100644 --- a/ironic_lib/tests/test_disk_partitioner.py +++ b/ironic_lib/tests/test_disk_partitioner.py @@ -13,7 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from testtools.matchers import HasLength from ironic_lib import disk_partitioner diff --git a/ironic_lib/tests/test_disk_utils.py b/ironic_lib/tests/test_disk_utils.py index 6222a9a8..20208ed4 100644 --- a/ironic_lib/tests/test_disk_utils.py +++ b/ironic_lib/tests/test_disk_utils.py @@ -18,8 +18,8 @@ import os import shutil import stat import tempfile +from unittest import mock -import mock from oslo_concurrency import processutils from oslo_config import cfg from oslo_serialization import base64 diff --git a/ironic_lib/tests/test_exception.py b/ironic_lib/tests/test_exception.py index e3fa4eaa..b7829c4e 100644 --- a/ironic_lib/tests/test_exception.py +++ b/ironic_lib/tests/test_exception.py @@ -13,8 +13,8 @@ import re +from unittest import mock -import mock from oslo_config import cfg from ironic_lib import exception diff --git a/ironic_lib/tests/test_mdns.py b/ironic_lib/tests/test_mdns.py index f83ad005..0195d5ca 100644 --- a/ironic_lib/tests/test_mdns.py +++ b/ironic_lib/tests/test_mdns.py @@ -11,8 +11,8 @@ # under the License. import socket +from unittest import mock -import mock from oslo_config import cfg import zeroconf diff --git a/ironic_lib/tests/test_metrics.py b/ironic_lib/tests/test_metrics.py index ced08bba..957a10bb 100644 --- a/ironic_lib/tests/test_metrics.py +++ b/ironic_lib/tests/test_metrics.py @@ -14,8 +14,8 @@ # under the License. import types +from unittest import mock -import mock from oslo_utils import reflection from ironic_lib import metrics as metricslib diff --git a/ironic_lib/tests/test_metrics_statsd.py b/ironic_lib/tests/test_metrics_statsd.py index 7ad952e3..3b0b6d8e 100644 --- a/ironic_lib/tests/test_metrics_statsd.py +++ b/ironic_lib/tests/test_metrics_statsd.py @@ -14,8 +14,8 @@ # under the License. import socket +from unittest import mock -import mock from ironic_lib import metrics_statsd from ironic_lib.tests import base diff --git a/ironic_lib/tests/test_utils.py b/ironic_lib/tests/test_utils.py index e5a895e9..4035fff7 100644 --- a/ironic_lib/tests/test_utils.py +++ b/ironic_lib/tests/test_utils.py @@ -17,8 +17,8 @@ import copy import errno import os import os.path +from unittest import mock -import mock from oslo_concurrency import processutils from oslo_config import cfg diff --git a/test-requirements.txt b/test-requirements.txt index 09edd5cd..e6efec34 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,7 +6,6 @@ coverage!=4.4,>=4.0 # Apache-2.0 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT flake8-import-order>=0.13 # LGPLv3 hacking>=3.0.0,<3.1.0 # Apache-2.0 -mock>=2.0.0 # BSD stestr>=1.0.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 testscenarios>=0.4 # Apache-2.0/BSD