From 507d1c61e3b94721c1a5e806e9250591d7502a10 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Sat, 18 Apr 2020 11:59: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: I72c472e13b4fc96aa81a1cab4a9f30c3df118107 Signed-off-by: Sean McGinnis --- config_tempest/tests/base.py | 3 ++- config_tempest/tests/services/test_aws.py | 2 +- config_tempest/tests/services/test_base.py | 2 +- config_tempest/tests/services/test_compute.py | 2 +- config_tempest/tests/services/test_horizon.py | 2 +- config_tempest/tests/services/test_identity.py | 3 ++- config_tempest/tests/services/test_image.py | 3 ++- config_tempest/tests/services/test_network.py | 2 +- config_tempest/tests/services/test_object_storage.py | 2 +- config_tempest/tests/services/test_services.py | 2 +- config_tempest/tests/services/test_volume.py | 2 +- config_tempest/tests/test_accounts.py | 2 +- config_tempest/tests/test_clients.py | 3 ++- config_tempest/tests/test_config_tempest.py | 3 ++- config_tempest/tests/test_credentials.py | 3 ++- config_tempest/tests/test_flavors.py | 3 ++- config_tempest/tests/test_profile.py | 2 +- config_tempest/tests/test_tempest_conf.py | 2 +- config_tempest/tests/test_users.py | 2 +- 19 files changed, 26 insertions(+), 19 deletions(-) diff --git a/config_tempest/tests/base.py b/config_tempest/tests/base.py index 427a91b1..46709de8 100644 --- a/config_tempest/tests/base.py +++ b/config_tempest/tests/base.py @@ -15,10 +15,11 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from fixtures import MonkeyPatch import json import logging -import mock from oslotest import base from config_tempest.clients import ClientManager diff --git a/config_tempest/tests/services/test_aws.py b/config_tempest/tests/services/test_aws.py index 5fad030b..9e59bb55 100644 --- a/config_tempest/tests/services/test_aws.py +++ b/config_tempest/tests/services/test_aws.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from config_tempest.services.aws import Ec2Service from config_tempest.services.aws import S3Service diff --git a/config_tempest/tests/services/test_base.py b/config_tempest/tests/services/test_base.py index cbb532f3..7b04e73d 100644 --- a/config_tempest/tests/services/test_base.py +++ b/config_tempest/tests/services/test_base.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from config_tempest.services.base import Service from config_tempest.services.base import VersionedService diff --git a/config_tempest/tests/services/test_compute.py b/config_tempest/tests/services/test_compute.py index 97be964e..7e9b845b 100644 --- a/config_tempest/tests/services/test_compute.py +++ b/config_tempest/tests/services/test_compute.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from config_tempest.services.compute import ComputeService from config_tempest.tempest_conf import TempestConf diff --git a/config_tempest/tests/services/test_horizon.py b/config_tempest/tests/services/test_horizon.py index e5ba40bd..fc1bdb71 100644 --- a/config_tempest/tests/services/test_horizon.py +++ b/config_tempest/tests/services/test_horizon.py @@ -14,9 +14,9 @@ # under the License. from ssl import CertificateError +from unittest import mock from fixtures import MonkeyPatch -import mock from config_tempest.services import horizon from config_tempest.tests.base import BaseConfigTempestTest diff --git a/config_tempest/tests/services/test_identity.py b/config_tempest/tests/services/test_identity.py index 686c059e..49d9fa43 100644 --- a/config_tempest/tests/services/test_identity.py +++ b/config_tempest/tests/services/test_identity.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from fixtures import MonkeyPatch -import mock from config_tempest.services.identity import IdentityService from config_tempest.tempest_conf import TempestConf diff --git a/config_tempest/tests/services/test_image.py b/config_tempest/tests/services/test_image.py index 0e4f3395..6ebf9837 100644 --- a/config_tempest/tests/services/test_image.py +++ b/config_tempest/tests/services/test_image.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from fixtures import MonkeyPatch -import mock from config_tempest.services.image import ImageService from config_tempest.tempest_conf import TempestConf diff --git a/config_tempest/tests/services/test_network.py b/config_tempest/tests/services/test_network.py index 9d32becb..f21af89e 100644 --- a/config_tempest/tests/services/test_network.py +++ b/config_tempest/tests/services/test_network.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from config_tempest.services.network import NetworkService from config_tempest.tempest_conf import TempestConf diff --git a/config_tempest/tests/services/test_object_storage.py b/config_tempest/tests/services/test_object_storage.py index a6b0f77d..dabc7ff8 100644 --- a/config_tempest/tests/services/test_object_storage.py +++ b/config_tempest/tests/services/test_object_storage.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from config_tempest import main from config_tempest.services.object_storage import ObjectStorageService diff --git a/config_tempest/tests/services/test_services.py b/config_tempest/tests/services/test_services.py index 0afcc5a0..9aaad7db 100644 --- a/config_tempest/tests/services/test_services.py +++ b/config_tempest/tests/services/test_services.py @@ -15,7 +15,7 @@ from config_tempest.services.services import Services from config_tempest.tests.base import BaseConfigTempestTest -import mock +from unittest import mock class TestServices(BaseConfigTempestTest): diff --git a/config_tempest/tests/services/test_volume.py b/config_tempest/tests/services/test_volume.py index 53f61ee2..1c684004 100644 --- a/config_tempest/tests/services/test_volume.py +++ b/config_tempest/tests/services/test_volume.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from config_tempest.services import volume from config_tempest.tempest_conf import TempestConf diff --git a/config_tempest/tests/test_accounts.py b/config_tempest/tests/test_accounts.py index f9a5e759..7564395b 100644 --- a/config_tempest/tests/test_accounts.py +++ b/config_tempest/tests/test_accounts.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import os +from unittest import mock from config_tempest import accounts from config_tempest import main diff --git a/config_tempest/tests/test_clients.py b/config_tempest/tests/test_clients.py index 42b4346c..69cb87c6 100644 --- a/config_tempest/tests/test_clients.py +++ b/config_tempest/tests/test_clients.py @@ -15,8 +15,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from fixtures import MonkeyPatch -import mock from config_tempest.clients import ClientManager from config_tempest.clients import ProjectsClient diff --git a/config_tempest/tests/test_config_tempest.py b/config_tempest/tests/test_config_tempest.py index efbe3f81..52e311d8 100644 --- a/config_tempest/tests/test_config_tempest.py +++ b/config_tempest/tests/test_config_tempest.py @@ -15,8 +15,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from fixtures import MonkeyPatch -import mock from config_tempest.clients import ClientManager from config_tempest import main as tool diff --git a/config_tempest/tests/test_credentials.py b/config_tempest/tests/test_credentials.py index b48f2894..64459f9c 100644 --- a/config_tempest/tests/test_credentials.py +++ b/config_tempest/tests/test_credentials.py @@ -15,8 +15,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from fixtures import MonkeyPatch -import mock from config_tempest.tests.base import BaseConfigTempestTest diff --git a/config_tempest/tests/test_flavors.py b/config_tempest/tests/test_flavors.py index 8216f23a..79281a18 100644 --- a/config_tempest/tests/test_flavors.py +++ b/config_tempest/tests/test_flavors.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from fixtures import MonkeyPatch -import mock from config_tempest import constants as C from config_tempest.flavors import Flavors diff --git a/config_tempest/tests/test_profile.py b/config_tempest/tests/test_profile.py index 2f4ca9e2..71f3d3e4 100644 --- a/config_tempest/tests/test_profile.py +++ b/config_tempest/tests/test_profile.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from config_tempest import profile from config_tempest.tests.base import BaseConfigTempestTest diff --git a/config_tempest/tests/test_tempest_conf.py b/config_tempest/tests/test_tempest_conf.py index 1f118622..7ea2de3a 100644 --- a/config_tempest/tests/test_tempest_conf.py +++ b/config_tempest/tests/test_tempest_conf.py @@ -15,7 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from config_tempest import tempest_conf from config_tempest.tests.base import BaseConfigTempestTest diff --git a/config_tempest/tests/test_users.py b/config_tempest/tests/test_users.py index 29add390..1e28c39b 100644 --- a/config_tempest/tests/test_users.py +++ b/config_tempest/tests/test_users.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from config_tempest.tests.base import BaseConfigTempestTest from config_tempest.users import Users