From 3182d90bbfa6745901c64aa987a7a63d0185dbae Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Sat, 18 Apr 2020 11:54:40 -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: Ib2843c62ff29b269139981f067ae6afcab624799 Signed-off-by: Sean McGinnis --- monasca_api/tests/config.py | 2 +- monasca_api/tests/db/test_fingerprint.py | 2 +- monasca_api/tests/policy/test_policy.py | 2 +- monasca_api/tests/test_alarms_db_health_check.py | 2 +- monasca_api/tests/test_healthchecks.py | 2 +- monasca_api/tests/test_kafka_health_check.py | 3 ++- monasca_api/tests/test_keystone_protocol.py | 2 +- monasca_api/tests/test_log_publisher.py | 2 +- monasca_api/tests/test_logs.py | 2 +- monasca_api/tests/test_message_formats.py | 2 +- monasca_api/tests/test_metrics_db_health_check.py | 2 +- monasca_api/tests/test_rest.py | 2 +- monasca_api/tests/test_validation.py | 2 +- test-requirements.txt | 1 - 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/monasca_api/tests/config.py b/monasca_api/tests/config.py index 01454b77a..8654361aa 100644 --- a/monasca_api/tests/config.py +++ b/monasca_api/tests/config.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from monasca_api import config from monasca_api.tests import base diff --git a/monasca_api/tests/db/test_fingerprint.py b/monasca_api/tests/db/test_fingerprint.py index 7e2744b52..4fceb4589 100644 --- a/monasca_api/tests/db/test_fingerprint.py +++ b/monasca_api/tests/db/test_fingerprint.py @@ -13,7 +13,7 @@ # under the License. import hashlib -import mock +from unittest import mock import monasca_api.db.fingerprint as fingerprint from monasca_api.tests import base diff --git a/monasca_api/tests/policy/test_policy.py b/monasca_api/tests/policy/test_policy.py index bdaa9358b..faf7cb2ca 100644 --- a/monasca_api/tests/policy/test_policy.py +++ b/monasca_api/tests/policy/test_policy.py @@ -14,8 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import requests_mock +from unittest import mock from oslo_context import context from oslo_policy import policy as os_policy diff --git a/monasca_api/tests/test_alarms_db_health_check.py b/monasca_api/tests/test_alarms_db_health_check.py index 4348a7726..e56ec577a 100644 --- a/monasca_api/tests/test_alarms_db_health_check.py +++ b/monasca_api/tests/test_alarms_db_health_check.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from monasca_api import config from monasca_api.healthcheck import alarms_db_check as rdc diff --git a/monasca_api/tests/test_healthchecks.py b/monasca_api/tests/test_healthchecks.py index 8bbdffcae..92de83de1 100644 --- a/monasca_api/tests/test_healthchecks.py +++ b/monasca_api/tests/test_healthchecks.py @@ -13,7 +13,7 @@ # under the License. import falcon -import mock +from unittest import mock from monasca_api import config from monasca_api.healthcheck import base diff --git a/monasca_api/tests/test_kafka_health_check.py b/monasca_api/tests/test_kafka_health_check.py index 50626ceea..dc004ddb5 100644 --- a/monasca_api/tests/test_kafka_health_check.py +++ b/monasca_api/tests/test_kafka_health_check.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from six import PY3 from monasca_common.kafka_lib import client diff --git a/monasca_api/tests/test_keystone_protocol.py b/monasca_api/tests/test_keystone_protocol.py index 27cf2ddfd..1e99b727a 100644 --- a/monasca_api/tests/test_keystone_protocol.py +++ b/monasca_api/tests/test_keystone_protocol.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from monasca_api.healthcheck import keystone_protocol from monasca_api.tests import base diff --git a/monasca_api/tests/test_log_publisher.py b/monasca_api/tests/test_log_publisher.py index 9cd49a969..42e5494f1 100644 --- a/monasca_api/tests/test_log_publisher.py +++ b/monasca_api/tests/test_log_publisher.py @@ -16,8 +16,8 @@ import copy import datetime import random +from unittest import mock -import mock from oslo_config import cfg from oslo_log import log import simplejson as json diff --git a/monasca_api/tests/test_logs.py b/monasca_api/tests/test_logs.py index 00a5a6542..466142c34 100644 --- a/monasca_api/tests/test_logs.py +++ b/monasca_api/tests/test_logs.py @@ -13,8 +13,8 @@ # under the License. import falcon -import mock import simplejson as json +from unittest import mock from monasca_api.tests import base from monasca_api.v2.reference import logs diff --git a/monasca_api/tests/test_message_formats.py b/monasca_api/tests/test_message_formats.py index 2004fc7ad..d557f0163 100644 --- a/monasca_api/tests/test_message_formats.py +++ b/monasca_api/tests/test_message_formats.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. import json -import mock +from unittest import mock from monasca_api.common.messaging.message_formats.metrics import transform from monasca_api.tests import base diff --git a/monasca_api/tests/test_metrics_db_health_check.py b/monasca_api/tests/test_metrics_db_health_check.py index e84bfc3f5..93423d3fa 100644 --- a/monasca_api/tests/test_metrics_db_health_check.py +++ b/monasca_api/tests/test_metrics_db_health_check.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from monasca_common.simport import simport diff --git a/monasca_api/tests/test_rest.py b/monasca_api/tests/test_rest.py index 4282e0a89..33e60066c 100644 --- a/monasca_api/tests/test_rest.py +++ b/monasca_api/tests/test_rest.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from oslotest import base diff --git a/monasca_api/tests/test_validation.py b/monasca_api/tests/test_validation.py index aa6992117..beec93a66 100644 --- a/monasca_api/tests/test_validation.py +++ b/monasca_api/tests/test_validation.py @@ -15,7 +15,7 @@ # under the License. import falcon -import mock +from unittest import mock from monasca_api.tests import base import monasca_api.v2.common.exceptions as common_exceptions diff --git a/test-requirements.txt b/test-requirements.txt index f4da7c58e..048558d91 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -11,7 +11,6 @@ cassandra-driver!=3.6.0,>=3.3.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD httplib2>=0.9.1 # MIT influxdb>=2.9.2 # MIT -mock>=2.0.0 # BSD oslotest>=3.2.0 # Apache-2.0 requests-mock>=1.2.0 # Apache-2.0 stestr>=1.0.0 # Apache-2.0