From c72fd3c32f4a75dde63b8f7cd94e3aff0182bede Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Sat, 18 Apr 2020 11:58:46 -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: Ia6c5910a2e37d5f53e194f4cefdf57dae4dde5b2 Signed-off-by: Sean McGinnis --- mistralclient/tests/unit/base.py | 3 ++- mistralclient/tests/unit/test_client.py | 2 +- mistralclient/tests/unit/test_httpclient.py | 2 +- mistralclient/tests/unit/test_shell.py | 2 +- mistralclient/tests/unit/v2/base.py | 2 +- mistralclient/tests/unit/v2/test_cli_action_execs.py | 2 +- mistralclient/tests/unit/v2/test_cli_actions.py | 3 ++- mistralclient/tests/unit/v2/test_cli_cron_triggers.py | 2 +- mistralclient/tests/unit/v2/test_cli_environments.py | 2 +- mistralclient/tests/unit/v2/test_cli_event_triggers.py | 2 +- mistralclient/tests/unit/v2/test_cli_executions.py | 2 +- mistralclient/tests/unit/v2/test_cli_members.py | 2 +- mistralclient/tests/unit/v2/test_cli_services.py | 2 +- mistralclient/tests/unit/v2/test_cli_tasks.py | 3 ++- mistralclient/tests/unit/v2/test_cli_workbooks.py | 2 +- mistralclient/tests/unit/v2/test_cli_workflows.py | 3 ++- test-requirements.txt | 1 - 17 files changed, 20 insertions(+), 17 deletions(-) diff --git a/mistralclient/tests/unit/base.py b/mistralclient/tests/unit/base.py index 4fdb3dc6..d05ff568 100644 --- a/mistralclient/tests/unit/base.py +++ b/mistralclient/tests/unit/base.py @@ -12,7 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + from oslotest import base from requests_mock.contrib import fixture diff --git a/mistralclient/tests/unit/test_client.py b/mistralclient/tests/unit/test_client.py index b8754ce1..55dc3a44 100644 --- a/mistralclient/tests/unit/test_client.py +++ b/mistralclient/tests/unit/test_client.py @@ -15,8 +15,8 @@ import os import tempfile +from unittest import mock -import mock from oslo_serialization import jsonutils from oslo_utils import uuidutils from oslotest import base diff --git a/mistralclient/tests/unit/test_httpclient.py b/mistralclient/tests/unit/test_httpclient.py index 2b9696eb..35757365 100644 --- a/mistralclient/tests/unit/test_httpclient.py +++ b/mistralclient/tests/unit/test_httpclient.py @@ -14,8 +14,8 @@ import base64 import copy +from unittest import mock -import mock from six.moves.urllib import parse as urlparse from oslo_utils import uuidutils diff --git a/mistralclient/tests/unit/test_shell.py b/mistralclient/tests/unit/test_shell.py index 61823ae3..642b9e47 100644 --- a/mistralclient/tests/unit/test_shell.py +++ b/mistralclient/tests/unit/test_shell.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock import mistralclient.tests.unit.base_shell_test as base diff --git a/mistralclient/tests/unit/v2/base.py b/mistralclient/tests/unit/v2/base.py index 5e961a4e..640c284a 100644 --- a/mistralclient/tests/unit/v2/base.py +++ b/mistralclient/tests/unit/v2/base.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from mistralclient.api.v2 import client from mistralclient.tests.unit import base diff --git a/mistralclient/tests/unit/v2/test_cli_action_execs.py b/mistralclient/tests/unit/v2/test_cli_action_execs.py index 691aee74..1c94d447 100644 --- a/mistralclient/tests/unit/v2/test_cli_action_execs.py +++ b/mistralclient/tests/unit/v2/test_cli_action_execs.py @@ -16,10 +16,10 @@ import copy import sys +from unittest import mock import six -import mock from oslo_serialization import jsonutils diff --git a/mistralclient/tests/unit/v2/test_cli_actions.py b/mistralclient/tests/unit/v2/test_cli_actions.py index 95f04eb8..dd9dd339 100644 --- a/mistralclient/tests/unit/v2/test_cli_actions.py +++ b/mistralclient/tests/unit/v2/test_cli_actions.py @@ -15,7 +15,8 @@ # under the License. # -import mock +from unittest import mock + import six from mistralclient.api.v2 import actions diff --git a/mistralclient/tests/unit/v2/test_cli_cron_triggers.py b/mistralclient/tests/unit/v2/test_cli_cron_triggers.py index 7c15243a..6174bbf6 100644 --- a/mistralclient/tests/unit/v2/test_cli_cron_triggers.py +++ b/mistralclient/tests/unit/v2/test_cli_cron_triggers.py @@ -14,7 +14,7 @@ # under the License. # -import mock +from unittest import mock from mistralclient.api.v2 import cron_triggers from mistralclient.commands.v2 import cron_triggers as cron_triggers_cmd diff --git a/mistralclient/tests/unit/v2/test_cli_environments.py b/mistralclient/tests/unit/v2/test_cli_environments.py index 8188a03e..82a258d1 100644 --- a/mistralclient/tests/unit/v2/test_cli_environments.py +++ b/mistralclient/tests/unit/v2/test_cli_environments.py @@ -16,10 +16,10 @@ import copy import datetime import os import tempfile +from unittest import mock from oslo_serialization import jsonutils -import mock import yaml from mistralclient.api.v2 import environments diff --git a/mistralclient/tests/unit/v2/test_cli_event_triggers.py b/mistralclient/tests/unit/v2/test_cli_event_triggers.py index f670c356..c3ea8c05 100644 --- a/mistralclient/tests/unit/v2/test_cli_event_triggers.py +++ b/mistralclient/tests/unit/v2/test_cli_event_triggers.py @@ -14,7 +14,7 @@ # under the License. # -import mock +from unittest import mock from mistralclient.api.v2 import event_triggers from mistralclient.commands.v2 import event_triggers as event_triggers_cmd diff --git a/mistralclient/tests/unit/v2/test_cli_executions.py b/mistralclient/tests/unit/v2/test_cli_executions.py index 9af5c237..7305ccdb 100644 --- a/mistralclient/tests/unit/v2/test_cli_executions.py +++ b/mistralclient/tests/unit/v2/test_cli_executions.py @@ -16,8 +16,8 @@ # under the License. # -import mock import pkg_resources as pkg +from unittest import mock from oslo_serialization import jsonutils diff --git a/mistralclient/tests/unit/v2/test_cli_members.py b/mistralclient/tests/unit/v2/test_cli_members.py index f37e120c..066c6b33 100644 --- a/mistralclient/tests/unit/v2/test_cli_members.py +++ b/mistralclient/tests/unit/v2/test_cli_members.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from mistralclient.api.v2 import members from mistralclient.commands.v2 import members as member_cmd diff --git a/mistralclient/tests/unit/v2/test_cli_services.py b/mistralclient/tests/unit/v2/test_cli_services.py index 09e4e862..534abe93 100644 --- a/mistralclient/tests/unit/v2/test_cli_services.py +++ b/mistralclient/tests/unit/v2/test_cli_services.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from mistralclient.api.v2 import services from mistralclient.commands.v2 import services as service_cmd diff --git a/mistralclient/tests/unit/v2/test_cli_tasks.py b/mistralclient/tests/unit/v2/test_cli_tasks.py index 94597aee..76aac3aa 100644 --- a/mistralclient/tests/unit/v2/test_cli_tasks.py +++ b/mistralclient/tests/unit/v2/test_cli_tasks.py @@ -15,9 +15,10 @@ # under the License. # +from unittest import mock + from oslo_serialization import jsonutils -import mock from mistralclient.api.v2.executions import Execution from mistralclient.api.v2 import tasks diff --git a/mistralclient/tests/unit/v2/test_cli_workbooks.py b/mistralclient/tests/unit/v2/test_cli_workbooks.py index c4a97cc4..47b47ec2 100644 --- a/mistralclient/tests/unit/v2/test_cli_workbooks.py +++ b/mistralclient/tests/unit/v2/test_cli_workbooks.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from mistralclient.api.v2 import workbooks from mistralclient.commands.v2 import workbooks as workbook_cmd diff --git a/mistralclient/tests/unit/v2/test_cli_workflows.py b/mistralclient/tests/unit/v2/test_cli_workflows.py index 59177187..3fd0dde0 100644 --- a/mistralclient/tests/unit/v2/test_cli_workflows.py +++ b/mistralclient/tests/unit/v2/test_cli_workflows.py @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + import six from mistralclient.api.v2 import workflows diff --git a/test-requirements.txt b/test-requirements.txt index 2cc2012f..51e02a9d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,7 +4,6 @@ coverage>=4.0 # Apache-2.0 hacking>=1.1.0 # Apache-2.0 python-openstackclient>=3.12.0 # Apache-2.0 -mock>=2.0.0 # BSD oslotest>=3.2.0 # Apache-2.0 requests-mock>=1.2.0 # Apache-2.0 tempest>=17.1.0 # Apache-2.0