From 993563f6101115b2514a76a067ce55b30c5c0cc9 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Sat, 18 Apr 2020 11:59:50 -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: I564357caf5982a0db9be01c77e9e8c42bee932d6 Signed-off-by: Sean McGinnis --- test-requirements.txt | 1 - vitrageclient/tests/cli/test_event_post.py | 2 +- vitrageclient/tests/cli/test_topology_show.py | 2 +- vitrageclient/tests/test_template.py | 3 ++- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index b02bc41..076fdc7 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,4 +9,3 @@ oslotest>=3.3.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD testscenarios>=0.5.0 # Apache-2.0/BSD testtools>=2.3.0 # MIT -mock>=2.0.0 # BSD diff --git a/vitrageclient/tests/cli/test_event_post.py b/vitrageclient/tests/cli/test_event_post.py index 35d629e..8bae9b8 100644 --- a/vitrageclient/tests/cli/test_event_post.py +++ b/vitrageclient/tests/cli/test_event_post.py @@ -14,10 +14,10 @@ from argparse import ArgumentParser from argparse import ArgumentTypeError +from unittest import mock # noinspection PyPackageRequirements from datetime import datetime -import mock from testtools import ExpectedException from vitrageclient.tests.cli.base import CliTestCase diff --git a/vitrageclient/tests/cli/test_topology_show.py b/vitrageclient/tests/cli/test_topology_show.py index c74a877..1b9cb52 100644 --- a/vitrageclient/tests/cli/test_topology_show.py +++ b/vitrageclient/tests/cli/test_topology_show.py @@ -13,11 +13,11 @@ # under the License. from argparse import ArgumentParser from argparse import ArgumentTypeError +from unittest import mock import json # noinspection PyPackageRequirements -import mock # noinspection PyPackageRequirements import six from testtools import ExpectedException diff --git a/vitrageclient/tests/test_template.py b/vitrageclient/tests/test_template.py index 69fb4fb..936c568 100644 --- a/vitrageclient/tests/test_template.py +++ b/vitrageclient/tests/test_template.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 vitrageclient import exceptions as exc