diff options
author | Sean McGinnis <sean.mcginnis@gmail.com> | 2020-04-18 11:58:08 -0500 |
---|---|---|
committer | Sean McGinnis <sean.mcginnis@gmail.com> | 2020-04-18 11:58:08 -0500 |
commit | 6a045884cb090bbc1daf1af853a243452a7aab16 (patch) | |
tree | a2cb71b0b0aec41e20c5dd706753c5c95216f0f5 /glanceclient | |
parent | 53254753c444ee6ebd50d93b20adbb87cea329bb (diff) | |
download | python-glanceclient-6a045884cb090bbc1daf1af853a243452a7aab16.tar.gz |
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: I446ee142c7a17446372c910f7f2a36d55df18e04
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
Diffstat (limited to 'glanceclient')
-rw-r--r-- | glanceclient/tests/unit/test_exc.py | 2 | ||||
-rw-r--r-- | glanceclient/tests/unit/test_http.py | 2 | ||||
-rw-r--r-- | glanceclient/tests/unit/test_shell.py | 2 | ||||
-rw-r--r-- | glanceclient/tests/unit/test_ssl.py | 2 | ||||
-rw-r--r-- | glanceclient/tests/unit/test_utils.py | 2 | ||||
-rw-r--r-- | glanceclient/tests/unit/v1/test_shell.py | 3 | ||||
-rw-r--r-- | glanceclient/tests/unit/v2/test_images.py | 2 | ||||
-rw-r--r-- | glanceclient/tests/unit/v2/test_shell_v2.py | 3 |
8 files changed, 10 insertions, 8 deletions
diff --git a/glanceclient/tests/unit/test_exc.py b/glanceclient/tests/unit/test_exc.py index 9a2d01f..fa7bf07 100644 --- a/glanceclient/tests/unit/test_exc.py +++ b/glanceclient/tests/unit/test_exc.py @@ -12,8 +12,8 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -import mock import testtools +from unittest import mock from glanceclient import exc diff --git a/glanceclient/tests/unit/test_http.py b/glanceclient/tests/unit/test_http.py index b2035c9..0cf8f5b 100644 --- a/glanceclient/tests/unit/test_http.py +++ b/glanceclient/tests/unit/test_http.py @@ -15,12 +15,12 @@ import functools import json import logging +from unittest import mock import uuid import fixtures from keystoneauth1 import session from keystoneauth1 import token_endpoint -import mock from oslo_utils import encodeutils import requests from requests_mock.contrib import fixture diff --git a/glanceclient/tests/unit/test_shell.py b/glanceclient/tests/unit/test_shell.py index 3027e46..b23591f 100644 --- a/glanceclient/tests/unit/test_shell.py +++ b/glanceclient/tests/unit/test_shell.py @@ -21,12 +21,12 @@ import logging import os import sys import traceback +from unittest import mock import uuid import fixtures from keystoneauth1 import exceptions as ks_exc from keystoneauth1 import fixture as ks_fixture -import mock from requests_mock.contrib import fixture as rm_fixture import six diff --git a/glanceclient/tests/unit/test_ssl.py b/glanceclient/tests/unit/test_ssl.py index 323ac9d..320dfde 100644 --- a/glanceclient/tests/unit/test_ssl.py +++ b/glanceclient/tests/unit/test_ssl.py @@ -14,8 +14,8 @@ # under the License. import os +from unittest import mock -import mock import six import ssl import testtools diff --git a/glanceclient/tests/unit/test_utils.py b/glanceclient/tests/unit/test_utils.py index 3ef585a..6128d6c 100644 --- a/glanceclient/tests/unit/test_utils.py +++ b/glanceclient/tests/unit/test_utils.py @@ -14,8 +14,8 @@ # under the License. import sys +from unittest import mock -import mock from oslo_utils import encodeutils from requests import Response import six diff --git a/glanceclient/tests/unit/v1/test_shell.py b/glanceclient/tests/unit/v1/test_shell.py index a3bd29b..5476a2f 100644 --- a/glanceclient/tests/unit/v1/test_shell.py +++ b/glanceclient/tests/unit/v1/test_shell.py @@ -17,12 +17,13 @@ import argparse import json import os +from unittest import mock + import six import subprocess import tempfile import testtools -import mock from glanceclient import exc from glanceclient import shell diff --git a/glanceclient/tests/unit/v2/test_images.py b/glanceclient/tests/unit/v2/test_images.py index 99926de..fee7d49 100644 --- a/glanceclient/tests/unit/v2/test_images.py +++ b/glanceclient/tests/unit/v2/test_images.py @@ -15,8 +15,8 @@ import errno import hashlib -import mock import testtools +from unittest import mock from glanceclient import exc from glanceclient.tests.unit.v2 import base diff --git a/glanceclient/tests/unit/v2/test_shell_v2.py b/glanceclient/tests/unit/v2/test_shell_v2.py index 9d10ff2..9c19551 100644 --- a/glanceclient/tests/unit/v2/test_shell_v2.py +++ b/glanceclient/tests/unit/v2/test_shell_v2.py @@ -16,8 +16,9 @@ import argparse from copy import deepcopy import json -import mock import os +from unittest import mock + import six import sys import tempfile |