From 1f2b0ed263dccfda3e195e1c08d34726d3fb50e0 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Sat, 18 Apr 2020 11:57:59 -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: I1e30d77b7ca98c08ec8c42a18df863b202525418 Signed-off-by: Sean McGinnis --- dracclient/tests/test_bios.py | 2 +- dracclient/tests/test_client.py | 3 ++- dracclient/tests/test_idrac_card.py | 3 ++- dracclient/tests/test_inventory.py | 3 ++- dracclient/tests/test_job.py | 3 ++- dracclient/tests/test_lifecycle_controller.py | 3 ++- dracclient/tests/test_nic.py | 3 ++- dracclient/tests/test_raid.py | 3 ++- dracclient/tests/test_system.py | 3 ++- dracclient/tests/test_wsman.py | 2 +- test-requirements.txt | 1 - 11 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dracclient/tests/test_bios.py b/dracclient/tests/test_bios.py index f5d3d2c..0cc4c25 100644 --- a/dracclient/tests/test_bios.py +++ b/dracclient/tests/test_bios.py @@ -12,9 +12,9 @@ # under the License. import re +from unittest import mock import lxml.etree -import mock import requests_mock import dracclient.client diff --git a/dracclient/tests/test_client.py b/dracclient/tests/test_client.py index 29c2e18..5e0801b 100644 --- a/dracclient/tests/test_client.py +++ b/dracclient/tests/test_client.py @@ -11,7 +11,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import requests_mock import dracclient.client diff --git a/dracclient/tests/test_idrac_card.py b/dracclient/tests/test_idrac_card.py index 6228554..d3db623 100644 --- a/dracclient/tests/test_idrac_card.py +++ b/dracclient/tests/test_idrac_card.py @@ -12,8 +12,9 @@ # under the License. import lxml.etree -import mock import re +from unittest import mock + import requests_mock import dracclient.client diff --git a/dracclient/tests/test_inventory.py b/dracclient/tests/test_inventory.py index ecd6a40..378a114 100644 --- a/dracclient/tests/test_inventory.py +++ b/dracclient/tests/test_inventory.py @@ -11,7 +11,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import requests_mock import dracclient.client diff --git a/dracclient/tests/test_job.py b/dracclient/tests/test_job.py index adb1a34..38add78 100644 --- a/dracclient/tests/test_job.py +++ b/dracclient/tests/test_job.py @@ -13,7 +13,8 @@ import datetime import lxml.etree -import mock +from unittest import mock + import requests_mock import dracclient.client diff --git a/dracclient/tests/test_lifecycle_controller.py b/dracclient/tests/test_lifecycle_controller.py index 58352bc..136c201 100644 --- a/dracclient/tests/test_lifecycle_controller.py +++ b/dracclient/tests/test_lifecycle_controller.py @@ -12,8 +12,9 @@ # under the License. import lxml.etree -import mock import re +from unittest import mock + import requests_mock import dracclient.client diff --git a/dracclient/tests/test_nic.py b/dracclient/tests/test_nic.py index 7029df3..2a4ea79 100644 --- a/dracclient/tests/test_nic.py +++ b/dracclient/tests/test_nic.py @@ -13,8 +13,9 @@ import datetime import lxml.etree -import mock import re +from unittest import mock + import requests_mock import dracclient.client diff --git a/dracclient/tests/test_raid.py b/dracclient/tests/test_raid.py index 99faab1..2af8640 100644 --- a/dracclient/tests/test_raid.py +++ b/dracclient/tests/test_raid.py @@ -14,9 +14,10 @@ import collections import lxml.etree -import mock import random import re +from unittest import mock + import requests_mock import dracclient.client diff --git a/dracclient/tests/test_system.py b/dracclient/tests/test_system.py index 76a38b4..54c9d9b 100644 --- a/dracclient/tests/test_system.py +++ b/dracclient/tests/test_system.py @@ -11,7 +11,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import requests_mock import dracclient.client diff --git a/dracclient/tests/test_wsman.py b/dracclient/tests/test_wsman.py index ea86f3b..c0d6ea5 100644 --- a/dracclient/tests/test_wsman.py +++ b/dracclient/tests/test_wsman.py @@ -12,11 +12,11 @@ # under the License. import collections +from unittest import mock import uuid import lxml.etree import lxml.objectify -import mock import requests.exceptions import requests_mock import six diff --git a/test-requirements.txt b/test-requirements.txt index 94c7246..d87015c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,5 +5,4 @@ coverage>=3.6 doc8 hacking>=1.1.0,<1.2.0 # Apache-2.0 -mock>=2.0 requests-mock>=1.0