From 11577d6cf075a6f8260ea1ff5a026a6b3616d51b Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Sat, 18 Apr 2020 11:57:24 -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: I7268264d3e2c98474604ec5f46298d36b7d32f18 Signed-off-by: Sean McGinnis Co-Authored-By: zhurong --- aodhclient/tests/unit/test_alarm_cli.py | 2 +- aodhclient/tests/unit/test_alarm_history.py | 2 +- aodhclient/tests/unit/test_alarm_manager.py | 2 +- aodhclient/tests/unit/test_exceptions.py | 3 ++- aodhclient/tests/unit/test_quota.py | 2 +- aodhclient/tests/unit/test_shell.py | 2 +- setup.cfg | 1 - 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/aodhclient/tests/unit/test_alarm_cli.py b/aodhclient/tests/unit/test_alarm_cli.py index 04c7f55..3848eb4 100644 --- a/aodhclient/tests/unit/test_alarm_cli.py +++ b/aodhclient/tests/unit/test_alarm_cli.py @@ -14,8 +14,8 @@ # under the License. import argparse +from unittest import mock -import mock import testtools from aodhclient.v2 import alarm_cli diff --git a/aodhclient/tests/unit/test_alarm_history.py b/aodhclient/tests/unit/test_alarm_history.py index 0787202..7a9c682 100644 --- a/aodhclient/tests/unit/test_alarm_history.py +++ b/aodhclient/tests/unit/test_alarm_history.py @@ -14,7 +14,7 @@ # under the License. -import mock +from unittest import mock import testtools diff --git a/aodhclient/tests/unit/test_alarm_manager.py b/aodhclient/tests/unit/test_alarm_manager.py index 79b5001..7f8d978 100644 --- a/aodhclient/tests/unit/test_alarm_manager.py +++ b/aodhclient/tests/unit/test_alarm_manager.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import testtools +from unittest import mock from aodhclient.v2 import alarm diff --git a/aodhclient/tests/unit/test_exceptions.py b/aodhclient/tests/unit/test_exceptions.py index 2fe53fb..5be346f 100644 --- a/aodhclient/tests/unit/test_exceptions.py +++ b/aodhclient/tests/unit/test_exceptions.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslotest import base from aodhclient import exceptions diff --git a/aodhclient/tests/unit/test_quota.py b/aodhclient/tests/unit/test_quota.py index 1d13fe8..e842452 100644 --- a/aodhclient/tests/unit/test_quota.py +++ b/aodhclient/tests/unit/test_quota.py @@ -11,8 +11,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import testtools +from unittest import mock from aodhclient import exceptions from aodhclient.v2 import quota_cli diff --git a/aodhclient/tests/unit/test_shell.py b/aodhclient/tests/unit/test_shell.py index a172690..70ce7a8 100644 --- a/aodhclient/tests/unit/test_shell.py +++ b/aodhclient/tests/unit/test_shell.py @@ -13,9 +13,9 @@ # under the License. import sys +from unittest import mock from keystoneauth1 import exceptions -import mock import six import testtools diff --git a/setup.cfg b/setup.cfg index 5bc284d..e098ed8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -32,7 +32,6 @@ test = testtools>=1.4.0 pifpaf[gnocchi]>=0.23 gnocchi[postgresql,file] - mock>=1.2 # BSD [entry_points] console_scripts =