From d61886da0a062546340dd959a71541afa60a47d6 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 20 Jan 2025 18:07:48 +0900 Subject: [PATCH] Replace third party mock ... by the builtin unittest.mock module, to reduce external dependencies. Change-Id: Id29822674672cd1a1231fcb627722c3949be2682 --- test-requirements.txt | 1 - tobiko/tests/unit/_patch.py | 3 +-- tobiko/tests/unit/openstack/_case.py | 2 +- tobiko/tests/unit/openstack/heat/test_client.py | 3 ++- tobiko/tests/unit/openstack/heat/test_stack.py | 2 +- tobiko/tests/unit/openstack/keystone/test_session.py | 3 ++- tobiko/tests/unit/openstack/octavia/test_client.py | 2 +- tobiko/tests/unit/openstack/test_client.py | 2 +- tobiko/tests/unit/openstack/tests/test_neutron.py | 2 +- tobiko/tests/unit/shell/test_ssh.py | 2 +- tobiko/tests/unit/test_config.py | 3 +-- tobiko/tests/unit/test_conftest.py | 3 ++- tobiko/tests/unit/test_fixture.py | 2 +- tobiko/tests/unit/test_retry.py | 2 +- tobiko/tests/unit/test_time.py | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 8da3dbaa5..612e40ba8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,6 +1,5 @@ # Test cases requirements -mock>=3.0.5 # BSD pytest>=7.2.0 # MIT pytest-html>=4.1.1 # MIT pytest-xdist[psutil]>=3.5.0 # MIT diff --git a/tobiko/tests/unit/_patch.py b/tobiko/tests/unit/_patch.py index 2af157ebf..32969e157 100644 --- a/tobiko/tests/unit/_patch.py +++ b/tobiko/tests/unit/_patch.py @@ -14,8 +14,7 @@ from __future__ import absolute_import import time - -import mock +from unittest import mock import tobiko from tobiko import common diff --git a/tobiko/tests/unit/openstack/_case.py b/tobiko/tests/unit/openstack/_case.py index 15364a13b..7227f0621 100644 --- a/tobiko/tests/unit/openstack/_case.py +++ b/tobiko/tests/unit/openstack/_case.py @@ -14,7 +14,7 @@ # under the License. from __future__ import absolute_import -import mock +from unittest import mock from tobiko.tests.unit.openstack import _keystone from tobiko.tests import unit diff --git a/tobiko/tests/unit/openstack/heat/test_client.py b/tobiko/tests/unit/openstack/heat/test_client.py index 6d7fa5257..c2b01e2bf 100644 --- a/tobiko/tests/unit/openstack/heat/test_client.py +++ b/tobiko/tests/unit/openstack/heat/test_client.py @@ -13,8 +13,9 @@ # under the License. from __future__ import absolute_import +from unittest import mock + from heatclient.v1 import client as heatclient -import mock from tobiko.openstack import keystone from tobiko.openstack import heat diff --git a/tobiko/tests/unit/openstack/heat/test_stack.py b/tobiko/tests/unit/openstack/heat/test_stack.py index ffeb6f50f..2d3f5aaee 100644 --- a/tobiko/tests/unit/openstack/heat/test_stack.py +++ b/tobiko/tests/unit/openstack/heat/test_stack.py @@ -15,10 +15,10 @@ from __future__ import absolute_import from collections import abc import time +from unittest import mock from heatclient.v1 import client as heatclient from heatclient import exc -import mock import tobiko from tobiko.openstack import heat diff --git a/tobiko/tests/unit/openstack/keystone/test_session.py b/tobiko/tests/unit/openstack/keystone/test_session.py index 4dae220b7..cc8536014 100644 --- a/tobiko/tests/unit/openstack/keystone/test_session.py +++ b/tobiko/tests/unit/openstack/keystone/test_session.py @@ -14,8 +14,9 @@ # under the License. from __future__ import absolute_import +from unittest import mock + from keystoneauth1 import session as keystonesession -import mock from tobiko.openstack import keystone from tobiko.tests.unit import openstack diff --git a/tobiko/tests/unit/openstack/octavia/test_client.py b/tobiko/tests/unit/openstack/octavia/test_client.py index 712afe2fa..9cc988084 100644 --- a/tobiko/tests/unit/openstack/octavia/test_client.py +++ b/tobiko/tests/unit/openstack/octavia/test_client.py @@ -14,9 +14,9 @@ from __future__ import absolute_import import inspect +from unittest import mock from keystoneclient.v3 import endpoints -import mock from octaviaclient.api.v2 import octavia as octaviaclient from tobiko.openstack import keystone diff --git a/tobiko/tests/unit/openstack/test_client.py b/tobiko/tests/unit/openstack/test_client.py index 47c8ccc30..3a35a1cbb 100644 --- a/tobiko/tests/unit/openstack/test_client.py +++ b/tobiko/tests/unit/openstack/test_client.py @@ -15,9 +15,9 @@ from __future__ import absolute_import import inspect +from unittest import mock from keystoneauth1 import session as _session -import mock import tobiko from tobiko.openstack import _client diff --git a/tobiko/tests/unit/openstack/tests/test_neutron.py b/tobiko/tests/unit/openstack/tests/test_neutron.py index 7e3e91f04..719fd0b8e 100644 --- a/tobiko/tests/unit/openstack/tests/test_neutron.py +++ b/tobiko/tests/unit/openstack/tests/test_neutron.py @@ -14,7 +14,7 @@ # under the License. from __future__ import absolute_import -import mock +from unittest import mock from tobiko.openstack import tests from tobiko.tests.unit import openstack diff --git a/tobiko/tests/unit/shell/test_ssh.py b/tobiko/tests/unit/shell/test_ssh.py index d08afbc80..c2f7126e8 100644 --- a/tobiko/tests/unit/shell/test_ssh.py +++ b/tobiko/tests/unit/shell/test_ssh.py @@ -17,8 +17,8 @@ from __future__ import absolute_import import io import os +from unittest import mock -import mock import paramiko import tobiko diff --git a/tobiko/tests/unit/test_config.py b/tobiko/tests/unit/test_config.py index 24ad40141..1f687246e 100644 --- a/tobiko/tests/unit/test_config.py +++ b/tobiko/tests/unit/test_config.py @@ -15,8 +15,7 @@ from __future__ import absolute_import import os - -import mock +from unittest import mock from tobiko.tests import unit from tobiko import config diff --git a/tobiko/tests/unit/test_conftest.py b/tobiko/tests/unit/test_conftest.py index ee6e63d49..19f04e09e 100644 --- a/tobiko/tests/unit/test_conftest.py +++ b/tobiko/tests/unit/test_conftest.py @@ -13,8 +13,9 @@ # under the License. from __future__ import absolute_import +from unittest import mock + from oslo_log import log -import mock import tobiko from tobiko.tests import unit diff --git a/tobiko/tests/unit/test_fixture.py b/tobiko/tests/unit/test_fixture.py index 644a72974..f6c56216c 100644 --- a/tobiko/tests/unit/test_fixture.py +++ b/tobiko/tests/unit/test_fixture.py @@ -16,9 +16,9 @@ from __future__ import absolute_import import os import sys import unittest +from unittest import mock import fixtures -import mock import testtools from testtools import content diff --git a/tobiko/tests/unit/test_retry.py b/tobiko/tests/unit/test_retry.py index 7565e0a12..1f28f46d3 100644 --- a/tobiko/tests/unit/test_retry.py +++ b/tobiko/tests/unit/test_retry.py @@ -14,8 +14,8 @@ from __future__ import absolute_import import itertools +from unittest import mock -import mock import testtools import tobiko diff --git a/tobiko/tests/unit/test_time.py b/tobiko/tests/unit/test_time.py index 2d30b3d01..802d1c7e7 100644 --- a/tobiko/tests/unit/test_time.py +++ b/tobiko/tests/unit/test_time.py @@ -13,7 +13,7 @@ # under the License. from __future__ import absolute_import -import mock +from unittest import mock import tobiko from tobiko.tests import unit