From bdaa7473b581ac1b3a9c507ef0230cd99dfc9300 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Sat, 18 Apr 2020 11:56: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: I78a70c535950f645fcb3a5f1e820d70cc6958d36 Signed-off-by: Sean McGinnis --- openstack_virtual_baremetal/tests/test_auth.py | 3 ++- openstack_virtual_baremetal/tests/test_build_nodes_json.py | 2 +- openstack_virtual_baremetal/tests/test_deploy.py | 2 +- openstack_virtual_baremetal/tests/test_openstackbmc.py | 2 +- test-requirements.txt | 1 - 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openstack_virtual_baremetal/tests/test_auth.py b/openstack_virtual_baremetal/tests/test_auth.py index cbb547b..4cb2a6d 100644 --- a/openstack_virtual_baremetal/tests/test_auth.py +++ b/openstack_virtual_baremetal/tests/test_auth.py @@ -12,9 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + import fixtures import json -import mock import testtools from openstack_virtual_baremetal import auth diff --git a/openstack_virtual_baremetal/tests/test_build_nodes_json.py b/openstack_virtual_baremetal/tests/test_build_nodes_json.py index 0a91fc3..01dab53 100644 --- a/openstack_virtual_baremetal/tests/test_build_nodes_json.py +++ b/openstack_virtual_baremetal/tests/test_build_nodes_json.py @@ -15,9 +15,9 @@ import copy import json import sys +from unittest import mock import fixtures -import mock import testtools from openstack_virtual_baremetal import build_nodes_json diff --git a/openstack_virtual_baremetal/tests/test_deploy.py b/openstack_virtual_baremetal/tests/test_deploy.py index 5695175..a797aa9 100755 --- a/openstack_virtual_baremetal/tests/test_deploy.py +++ b/openstack_virtual_baremetal/tests/test_deploy.py @@ -14,10 +14,10 @@ # under the License. import copy +from unittest import mock import unittest import yaml -import mock import testtools from openstack_virtual_baremetal import deploy diff --git a/openstack_virtual_baremetal/tests/test_openstackbmc.py b/openstack_virtual_baremetal/tests/test_openstackbmc.py index 94d7fd8..3942348 100755 --- a/openstack_virtual_baremetal/tests/test_openstackbmc.py +++ b/openstack_virtual_baremetal/tests/test_openstackbmc.py @@ -13,10 +13,10 @@ # under the License. import sys +from unittest import mock import unittest import fixtures -import mock from novaclient import exceptions import testtools diff --git a/test-requirements.txt b/test-requirements.txt index bf27024..a349a26 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,7 +4,6 @@ fixtures>=0.3.14 python-subunit>=0.0.18 stestr testtools>=0.9.36,!=1.2.0 -mock>=1.0 # docs sphinx!=1.6.6,>=1.6.2,<2.0.0;python_version=='2.7' # BSD