From ee55c043c26a3e135e898792fb051a64d960559b Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Sat, 18 Apr 2020 11:58:31 -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: I7498ea2353cccca7b23d9ef74015a566ac431f90 Signed-off-by: Sean McGinnis --- keystoneclient/tests/unit/auth/test_cli.py | 2 +- keystoneclient/tests/unit/auth/test_conf.py | 2 +- keystoneclient/tests/unit/auth/test_default_cli.py | 2 +- keystoneclient/tests/unit/auth/test_identity_common.py | 2 +- keystoneclient/tests/unit/auth/test_identity_v2.py | 2 +- keystoneclient/tests/unit/auth/test_identity_v3.py | 2 +- keystoneclient/tests/unit/auth/test_password.py | 2 +- keystoneclient/tests/unit/auth/utils.py | 2 +- keystoneclient/tests/unit/test_cms.py | 2 +- keystoneclient/tests/unit/test_https.py | 2 +- keystoneclient/tests/unit/test_keyring.py | 2 +- keystoneclient/tests/unit/test_session.py | 2 +- keystoneclient/tests/unit/v3/test_oauth1.py | 3 ++- keystoneclient/tests/unit/v3/test_users.py | 2 +- test-requirements.txt | 1 - 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/keystoneclient/tests/unit/auth/test_cli.py b/keystoneclient/tests/unit/auth/test_cli.py index b6fefa7c7..b2a2f6ae8 100644 --- a/keystoneclient/tests/unit/auth/test_cli.py +++ b/keystoneclient/tests/unit/auth/test_cli.py @@ -11,10 +11,10 @@ # under the License. import argparse +from unittest import mock import uuid import fixtures -import mock from oslo_config import cfg from keystoneclient.auth import base diff --git a/keystoneclient/tests/unit/auth/test_conf.py b/keystoneclient/tests/unit/auth/test_conf.py index 47bf75900..4d2f4cd64 100644 --- a/keystoneclient/tests/unit/auth/test_conf.py +++ b/keystoneclient/tests/unit/auth/test_conf.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock import uuid -import mock from oslo_config import cfg from oslo_config import fixture as config import stevedore diff --git a/keystoneclient/tests/unit/auth/test_default_cli.py b/keystoneclient/tests/unit/auth/test_default_cli.py index cb4603dc4..8afd2cde7 100644 --- a/keystoneclient/tests/unit/auth/test_default_cli.py +++ b/keystoneclient/tests/unit/auth/test_default_cli.py @@ -11,9 +11,9 @@ # under the License. import argparse +from unittest import mock import uuid -import mock from keystoneclient.auth.identity.generic import cli from keystoneclient import exceptions diff --git a/keystoneclient/tests/unit/auth/test_identity_common.py b/keystoneclient/tests/unit/auth/test_identity_common.py index be8a062de..798a55270 100644 --- a/keystoneclient/tests/unit/auth/test_identity_common.py +++ b/keystoneclient/tests/unit/auth/test_identity_common.py @@ -12,11 +12,11 @@ import abc import datetime +from unittest import mock import uuid from keystoneauth1 import fixture from keystoneauth1 import plugin -import mock from oslo_utils import timeutils import six diff --git a/keystoneclient/tests/unit/auth/test_identity_v2.py b/keystoneclient/tests/unit/auth/test_identity_v2.py index a180135c9..84f4f5194 100644 --- a/keystoneclient/tests/unit/auth/test_identity_v2.py +++ b/keystoneclient/tests/unit/auth/test_identity_v2.py @@ -12,9 +12,9 @@ import argparse import copy +from unittest import mock import uuid -import mock from keystoneclient.auth.identity import v2 from keystoneclient import exceptions diff --git a/keystoneclient/tests/unit/auth/test_identity_v3.py b/keystoneclient/tests/unit/auth/test_identity_v3.py index 776551be0..fe7815ed2 100644 --- a/keystoneclient/tests/unit/auth/test_identity_v3.py +++ b/keystoneclient/tests/unit/auth/test_identity_v3.py @@ -12,10 +12,10 @@ import argparse import copy +from unittest import mock import uuid from keystoneauth1 import fixture -import mock from keystoneclient import access from keystoneclient.auth.identity import v3 diff --git a/keystoneclient/tests/unit/auth/test_password.py b/keystoneclient/tests/unit/auth/test_password.py index 020eb124c..93d2fb8ca 100644 --- a/keystoneclient/tests/unit/auth/test_password.py +++ b/keystoneclient/tests/unit/auth/test_password.py @@ -11,9 +11,9 @@ # under the License. import argparse +from unittest import mock import uuid -import mock from keystoneclient.auth.identity.generic import password from keystoneclient.auth.identity import v2 diff --git a/keystoneclient/tests/unit/auth/utils.py b/keystoneclient/tests/unit/auth/utils.py index b6931728b..1e346e35c 100644 --- a/keystoneclient/tests/unit/auth/utils.py +++ b/keystoneclient/tests/unit/auth/utils.py @@ -11,10 +11,10 @@ # under the License. import functools +from unittest import mock import uuid from keystoneauth1 import fixture -import mock from oslo_config import cfg from keystoneclient import access diff --git a/keystoneclient/tests/unit/test_cms.py b/keystoneclient/tests/unit/test_cms.py index 11078aeec..2671bcb49 100644 --- a/keystoneclient/tests/unit/test_cms.py +++ b/keystoneclient/tests/unit/test_cms.py @@ -13,8 +13,8 @@ import errno import os import subprocess +from unittest import mock -import mock import testresources from testtools import matchers diff --git a/keystoneclient/tests/unit/test_https.py b/keystoneclient/tests/unit/test_https.py index 4e8d260cf..315a17aaa 100644 --- a/keystoneclient/tests/unit/test_https.py +++ b/keystoneclient/tests/unit/test_https.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import requests +from unittest import mock from keystoneclient import httpclient from keystoneclient.tests.unit import utils diff --git a/keystoneclient/tests/unit/test_keyring.py b/keystoneclient/tests/unit/test_keyring.py index 7d30d980c..0a5bf7150 100644 --- a/keystoneclient/tests/unit/test_keyring.py +++ b/keystoneclient/tests/unit/test_keyring.py @@ -11,8 +11,8 @@ # under the License. import datetime +from unittest import mock -import mock from oslo_utils import timeutils from keystoneclient import access diff --git a/keystoneclient/tests/unit/test_session.py b/keystoneclient/tests/unit/test_session.py index bf10aa359..14cfe3149 100644 --- a/keystoneclient/tests/unit/test_session.py +++ b/keystoneclient/tests/unit/test_session.py @@ -15,9 +15,9 @@ import argparse import itertools import logging +from unittest import mock import uuid -import mock from oslo_config import cfg from oslo_config import fixture as config from oslo_serialization import jsonutils diff --git a/keystoneclient/tests/unit/v3/test_oauth1.py b/keystoneclient/tests/unit/v3/test_oauth1.py index 644e8a809..3e7913177 100644 --- a/keystoneclient/tests/unit/v3/test_oauth1.py +++ b/keystoneclient/tests/unit/v3/test_oauth1.py @@ -11,10 +11,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +from unittest import mock + import fixtures import uuid -import mock import six from six.moves.urllib import parse as urlparse from testtools import matchers diff --git a/keystoneclient/tests/unit/v3/test_users.py b/keystoneclient/tests/unit/v3/test_users.py index e0a34461e..a7f03f9ce 100644 --- a/keystoneclient/tests/unit/v3/test_users.py +++ b/keystoneclient/tests/unit/v3/test_users.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock import uuid from keystoneclient import exceptions diff --git a/test-requirements.txt b/test-requirements.txt index d9e19726a..88e9b8c39 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,7 +10,6 @@ fixtures>=3.0.0 # Apache-2.0/BSD keyring>=5.5.1,<19.0.0;python_version=='2.7' # MIT/PSF keyring>=5.5.1;python_version>='3.4' # MIT/PSF lxml!=3.7.0,>=3.4.1 # BSD -mock>=2.0.0 # BSD oauthlib>=0.6.2 # BSD os-client-config>=1.28.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0