From c01a7a74f05c6db16357bc06a75a12db308f8196 Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Mon, 3 Jun 2024 14:34:18 +0000 Subject: [PATCH] tests cleanup: Removes mock import checks In Python 3, the mock module is now part of the unittest module. We no longer support Python 2, so there's no reason for the import checks. Change-Id: I7b4d68cba4b587ad9f0121058ba615a9bb0aec93 --- .../metadata/services/osconfigdrive/test_factory.py | 6 +----- .../metadata/services/osconfigdrive/test_windows.py | 6 +----- .../tests/metadata/services/test_azureservice.py | 5 +---- cloudbaseinit/tests/metadata/services/test_base.py | 2 +- .../tests/metadata/services/test_baseconfigdrive.py | 6 +----- .../tests/metadata/services/test_baseopenstackservice.py | 6 +----- cloudbaseinit/tests/metadata/services/test_cloudstack.py | 6 +----- .../tests/metadata/services/test_configdrive.py | 6 +----- cloudbaseinit/tests/metadata/services/test_ec2service.py | 6 +----- cloudbaseinit/tests/metadata/services/test_gceservice.py | 6 +----- .../tests/metadata/services/test_httpservice.py | 6 +----- .../tests/metadata/services/test_maasservice.py | 6 +----- .../tests/metadata/services/test_nocloudservice.py | 6 +----- .../tests/metadata/services/test_opennebulaservice.py | 6 +----- cloudbaseinit/tests/metadata/services/test_ovfservice.py | 5 +---- cloudbaseinit/tests/metadata/services/test_packet.py | 6 +----- .../metadata/services/test_vmwareguestinfoservice.py | 9 ++------- cloudbaseinit/tests/metadata/test_factory.py | 6 +----- cloudbaseinit/tests/osutils/test_base.py | 6 +----- cloudbaseinit/tests/osutils/test_factory.py | 6 +----- cloudbaseinit/tests/osutils/test_windows.py | 6 +----- cloudbaseinit/tests/plugins/common/test_createuser.py | 6 +----- cloudbaseinit/tests/plugins/common/test_ephemeraldisk.py | 6 +----- cloudbaseinit/tests/plugins/common/test_execcmd.py | 6 +----- cloudbaseinit/tests/plugins/common/test_fileexecutils.py | 6 +----- cloudbaseinit/tests/plugins/common/test_localscripts.py | 6 +----- cloudbaseinit/tests/plugins/common/test_mtu.py | 6 +----- cloudbaseinit/tests/plugins/common/test_networkconfig.py | 6 +----- cloudbaseinit/tests/plugins/common/test_ntpclient.py | 6 +----- cloudbaseinit/tests/plugins/common/test_sethostname.py | 6 +----- .../tests/plugins/common/test_setuserpassword.py | 7 +------ cloudbaseinit/tests/plugins/common/test_sshpublickeys.py | 6 +----- cloudbaseinit/tests/plugins/common/test_trim.py | 6 +----- cloudbaseinit/tests/plugins/common/test_userdata.py | 6 +----- cloudbaseinit/tests/plugins/common/test_userdatautils.py | 6 +----- .../userdataplugins/cloudconfigplugins/test_groups.py | 5 +---- .../userdataplugins/cloudconfigplugins/test_runcmd.py | 6 +----- .../cloudconfigplugins/test_set_hostname.py | 6 +----- .../userdataplugins/cloudconfigplugins/test_set_ntp.py | 6 +----- .../cloudconfigplugins/test_set_timezone.py | 6 +----- .../userdataplugins/cloudconfigplugins/test_users.py | 5 +---- .../cloudconfigplugins/test_write_files.py | 6 +----- .../plugins/common/userdataplugins/test_cloudboothook.py | 6 +----- .../plugins/common/userdataplugins/test_cloudconfig.py | 6 +----- .../tests/plugins/common/userdataplugins/test_factory.py | 6 +----- .../tests/plugins/common/userdataplugins/test_heat.py | 6 +----- .../plugins/common/userdataplugins/test_parthandler.py | 6 +----- .../plugins/common/userdataplugins/test_shellscript.py | 7 +------ cloudbaseinit/tests/plugins/test_factory.py | 6 +----- .../tests/plugins/windows/test_azureguestagent.py | 6 +----- cloudbaseinit/tests/plugins/windows/test_bootconfig.py | 6 +----- cloudbaseinit/tests/plugins/windows/test_certificates.py | 6 +----- cloudbaseinit/tests/plugins/windows/test_createuser.py | 6 +----- .../tests/plugins/windows/test_displayidletimeout.py | 6 +----- .../tests/plugins/windows/test_extendvolumes.py | 6 +----- cloudbaseinit/tests/plugins/windows/test_licensing.py | 6 +----- cloudbaseinit/tests/plugins/windows/test_ntpclient.py | 6 +----- cloudbaseinit/tests/plugins/windows/test_pagefiles.py | 6 +----- cloudbaseinit/tests/plugins/windows/test_rdp.py | 6 +----- cloudbaseinit/tests/plugins/windows/test_sanpolicy.py | 6 +----- cloudbaseinit/tests/plugins/windows/test_updates.py | 6 +----- .../tests/plugins/windows/test_winrmcertificateauth.py | 6 +----- .../tests/plugins/windows/test_winrmlistener.py | 6 +----- cloudbaseinit/tests/test_exception.py | 5 +---- cloudbaseinit/tests/test_init.py | 6 +----- cloudbaseinit/tests/test_version.py | 3 +-- cloudbaseinit/tests/testutils.py | 6 +----- .../tests/utils/template_engine/test_factory.py | 5 +---- .../tests/utils/template_engine/test_jinja2_template.py | 5 +---- cloudbaseinit/tests/utils/test_classloader.py | 6 +----- cloudbaseinit/tests/utils/test_dhcp.py | 6 +----- cloudbaseinit/tests/utils/test_hostname.py | 6 +----- cloudbaseinit/tests/utils/test_log.py | 6 +----- cloudbaseinit/tests/utils/test_network.py | 6 +----- cloudbaseinit/tests/utils/test_retry_decorator.py | 2 +- .../tests/utils/windows/storage/test_factory.py | 6 +----- .../utils/windows/storage/test_vds_storage_manager.py | 6 +----- .../utils/windows/storage/test_wsm_storage_manager.py | 6 +----- cloudbaseinit/tests/utils/windows/test_bootconfig.py | 6 +----- cloudbaseinit/tests/utils/windows/test_disk.py | 6 +----- cloudbaseinit/tests/utils/windows/test_licensing.py | 6 +----- cloudbaseinit/tests/utils/windows/test_netlbfo.py | 6 +----- cloudbaseinit/tests/utils/windows/test_network.py | 6 +----- cloudbaseinit/tests/utils/windows/test_powercfg.py | 6 +----- cloudbaseinit/tests/utils/windows/test_privilege.py | 6 +----- cloudbaseinit/tests/utils/windows/test_rdp.py | 6 +----- cloudbaseinit/tests/utils/windows/test_security.py | 6 +----- cloudbaseinit/tests/utils/windows/test_timezone.py | 6 +----- cloudbaseinit/tests/utils/windows/test_updates.py | 6 +----- cloudbaseinit/tests/utils/windows/test_vds.py | 6 +----- cloudbaseinit/tests/utils/windows/test_vfat.py | 6 +----- cloudbaseinit/tests/utils/windows/test_winrmconfig.py | 6 +----- cloudbaseinit/tests/utils/windows/test_wmi_loader.py | 6 +----- cloudbaseinit/tests/utils/windows/test_ws2_32.py | 6 +----- cloudbaseinit/tests/utils/windows/test_x509.py | 6 +----- 95 files changed, 96 insertions(+), 461 deletions(-) diff --git a/cloudbaseinit/tests/metadata/services/osconfigdrive/test_factory.py b/cloudbaseinit/tests/metadata/services/osconfigdrive/test_factory.py index 93ec80a1..05562b1d 100644 --- a/cloudbaseinit/tests/metadata/services/osconfigdrive/test_factory.py +++ b/cloudbaseinit/tests/metadata/services/osconfigdrive/test_factory.py @@ -14,11 +14,7 @@ import sys import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.metadata.services.osconfigdrive import factory diff --git a/cloudbaseinit/tests/metadata/services/osconfigdrive/test_windows.py b/cloudbaseinit/tests/metadata/services/osconfigdrive/test_windows.py index 7489a0b1..f81e1804 100644 --- a/cloudbaseinit/tests/metadata/services/osconfigdrive/test_windows.py +++ b/cloudbaseinit/tests/metadata/services/osconfigdrive/test_windows.py @@ -17,11 +17,7 @@ import importlib import itertools import os import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import exception diff --git a/cloudbaseinit/tests/metadata/services/test_azureservice.py b/cloudbaseinit/tests/metadata/services/test_azureservice.py index 3c78465a..364aa63a 100644 --- a/cloudbaseinit/tests/metadata/services/test_azureservice.py +++ b/cloudbaseinit/tests/metadata/services/test_azureservice.py @@ -15,10 +15,7 @@ import importlib import os import unittest -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import exception diff --git a/cloudbaseinit/tests/metadata/services/test_base.py b/cloudbaseinit/tests/metadata/services/test_base.py index d8c77653..c6ee3dfa 100644 --- a/cloudbaseinit/tests/metadata/services/test_base.py +++ b/cloudbaseinit/tests/metadata/services/test_base.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import requests import unittest +import unittest.mock as mock from cloudbaseinit import exception from cloudbaseinit.metadata.services import base diff --git a/cloudbaseinit/tests/metadata/services/test_baseconfigdrive.py b/cloudbaseinit/tests/metadata/services/test_baseconfigdrive.py index 0a23d786..eae2bf71 100644 --- a/cloudbaseinit/tests/metadata/services/test_baseconfigdrive.py +++ b/cloudbaseinit/tests/metadata/services/test_baseconfigdrive.py @@ -16,11 +16,7 @@ import importlib import os import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import exception from cloudbaseinit.metadata.services import baseconfigdrive diff --git a/cloudbaseinit/tests/metadata/services/test_baseopenstackservice.py b/cloudbaseinit/tests/metadata/services/test_baseopenstackservice.py index ef9397e2..78c96ce6 100644 --- a/cloudbaseinit/tests/metadata/services/test_baseopenstackservice.py +++ b/cloudbaseinit/tests/metadata/services/test_baseopenstackservice.py @@ -16,14 +16,10 @@ import functools import posixpath import unittest +import unittest.mock as mock import netaddr -try: - import unittest.mock as mock -except ImportError: - import mock - from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import exception from cloudbaseinit.metadata.services import base diff --git a/cloudbaseinit/tests/metadata/services/test_cloudstack.py b/cloudbaseinit/tests/metadata/services/test_cloudstack.py index 9e730891..738ff0b6 100644 --- a/cloudbaseinit/tests/metadata/services/test_cloudstack.py +++ b/cloudbaseinit/tests/metadata/services/test_cloudstack.py @@ -15,13 +15,9 @@ import functools import socket import unittest +import unittest.mock as mock import urllib -try: - import unittest.mock as mock -except ImportError: - import mock - from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit.metadata.services import base from cloudbaseinit.metadata.services import cloudstack diff --git a/cloudbaseinit/tests/metadata/services/test_configdrive.py b/cloudbaseinit/tests/metadata/services/test_configdrive.py index a2b162a9..f107d5c0 100644 --- a/cloudbaseinit/tests/metadata/services/test_configdrive.py +++ b/cloudbaseinit/tests/metadata/services/test_configdrive.py @@ -15,11 +15,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.metadata.services import baseconfigdrive from cloudbaseinit.tests import testutils diff --git a/cloudbaseinit/tests/metadata/services/test_ec2service.py b/cloudbaseinit/tests/metadata/services/test_ec2service.py index 9e11e7e2..fab36b0a 100644 --- a/cloudbaseinit/tests/metadata/services/test_ec2service.py +++ b/cloudbaseinit/tests/metadata/services/test_ec2service.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit.metadata.services import ec2service diff --git a/cloudbaseinit/tests/metadata/services/test_gceservice.py b/cloudbaseinit/tests/metadata/services/test_gceservice.py index b2121757..1d775036 100644 --- a/cloudbaseinit/tests/metadata/services/test_gceservice.py +++ b/cloudbaseinit/tests/metadata/services/test_gceservice.py @@ -15,11 +15,7 @@ import ddt import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit.tests import testutils diff --git a/cloudbaseinit/tests/metadata/services/test_httpservice.py b/cloudbaseinit/tests/metadata/services/test_httpservice.py index eb4ae372..6c2a5480 100644 --- a/cloudbaseinit/tests/metadata/services/test_httpservice.py +++ b/cloudbaseinit/tests/metadata/services/test_httpservice.py @@ -14,13 +14,9 @@ import os import unittest +import unittest.mock as mock from urllib import error -try: - import unittest.mock as mock -except ImportError: - import mock - from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit.metadata.services import base from cloudbaseinit.metadata.services import httpservice diff --git a/cloudbaseinit/tests/metadata/services/test_maasservice.py b/cloudbaseinit/tests/metadata/services/test_maasservice.py index 1f5cd268..3640fd1c 100644 --- a/cloudbaseinit/tests/metadata/services/test_maasservice.py +++ b/cloudbaseinit/tests/metadata/services/test_maasservice.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import exception diff --git a/cloudbaseinit/tests/metadata/services/test_nocloudservice.py b/cloudbaseinit/tests/metadata/services/test_nocloudservice.py index 114a9a0c..c07713f0 100644 --- a/cloudbaseinit/tests/metadata/services/test_nocloudservice.py +++ b/cloudbaseinit/tests/metadata/services/test_nocloudservice.py @@ -16,11 +16,7 @@ import ddt import importlib import os import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.metadata.services import base from cloudbaseinit.models import network as nm diff --git a/cloudbaseinit/tests/metadata/services/test_opennebulaservice.py b/cloudbaseinit/tests/metadata/services/test_opennebulaservice.py index 58390211..1c11795d 100644 --- a/cloudbaseinit/tests/metadata/services/test_opennebulaservice.py +++ b/cloudbaseinit/tests/metadata/services/test_opennebulaservice.py @@ -16,11 +16,7 @@ import re import textwrap import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.metadata.services import base from cloudbaseinit.metadata.services import opennebulaservice diff --git a/cloudbaseinit/tests/metadata/services/test_ovfservice.py b/cloudbaseinit/tests/metadata/services/test_ovfservice.py index 4008fa2e..1b480d1c 100644 --- a/cloudbaseinit/tests/metadata/services/test_ovfservice.py +++ b/cloudbaseinit/tests/metadata/services/test_ovfservice.py @@ -16,10 +16,7 @@ import base64 import importlib import os import unittest -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit.metadata.services import base diff --git a/cloudbaseinit/tests/metadata/services/test_packet.py b/cloudbaseinit/tests/metadata/services/test_packet.py index 2f59e565..8553e7fb 100644 --- a/cloudbaseinit/tests/metadata/services/test_packet.py +++ b/cloudbaseinit/tests/metadata/services/test_packet.py @@ -14,13 +14,9 @@ import importlib import unittest +import unittest.mock as mock from urllib import error -try: - import unittest.mock as mock -except ImportError: - import mock - from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import exception from cloudbaseinit.tests import testutils diff --git a/cloudbaseinit/tests/metadata/services/test_vmwareguestinfoservice.py b/cloudbaseinit/tests/metadata/services/test_vmwareguestinfoservice.py index 6929fb3f..a2dcab73 100644 --- a/cloudbaseinit/tests/metadata/services/test_vmwareguestinfoservice.py +++ b/cloudbaseinit/tests/metadata/services/test_vmwareguestinfoservice.py @@ -14,20 +14,15 @@ import importlib import unittest +import unittest.mock as mock import ddt -from cloudbaseinit.utils import serialization - -try: - import unittest.mock as mock -except ImportError: - import mock - from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import exception from cloudbaseinit.models import network as network_model from cloudbaseinit.tests import testutils +from cloudbaseinit.utils import serialization CONF = cloudbaseinit_conf.CONF diff --git a/cloudbaseinit/tests/metadata/test_factory.py b/cloudbaseinit/tests/metadata/test_factory.py index 8dc7a357..a827f9d0 100644 --- a/cloudbaseinit/tests/metadata/test_factory.py +++ b/cloudbaseinit/tests/metadata/test_factory.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import exception from cloudbaseinit.metadata import factory diff --git a/cloudbaseinit/tests/osutils/test_base.py b/cloudbaseinit/tests/osutils/test_base.py index 1bc3ea54..719a0d1f 100755 --- a/cloudbaseinit/tests/osutils/test_base.py +++ b/cloudbaseinit/tests/osutils/test_base.py @@ -15,11 +15,7 @@ import subprocess import sys import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.osutils import base diff --git a/cloudbaseinit/tests/osutils/test_factory.py b/cloudbaseinit/tests/osutils/test_factory.py index 51b0ad6d..e2e2d8c7 100644 --- a/cloudbaseinit/tests/osutils/test_factory.py +++ b/cloudbaseinit/tests/osutils/test_factory.py @@ -14,11 +14,7 @@ import os import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.osutils import factory diff --git a/cloudbaseinit/tests/osutils/test_windows.py b/cloudbaseinit/tests/osutils/test_windows.py index e8e5f63a..c80680a4 100644 --- a/cloudbaseinit/tests/osutils/test_windows.py +++ b/cloudbaseinit/tests/osutils/test_windows.py @@ -17,14 +17,10 @@ import contextlib import functools import importlib import os +import unittest.mock as mock import netaddr -try: - import unittest.mock as mock -except ImportError: - import mock - from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import exception from cloudbaseinit.tests import fake diff --git a/cloudbaseinit/tests/plugins/common/test_createuser.py b/cloudbaseinit/tests/plugins/common/test_createuser.py index 7f365a5e..2a808ba1 100644 --- a/cloudbaseinit/tests/plugins/common/test_createuser.py +++ b/cloudbaseinit/tests/plugins/common/test_createuser.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit.plugins.common import base diff --git a/cloudbaseinit/tests/plugins/common/test_ephemeraldisk.py b/cloudbaseinit/tests/plugins/common/test_ephemeraldisk.py index c58bf9dd..79ff294e 100644 --- a/cloudbaseinit/tests/plugins/common/test_ephemeraldisk.py +++ b/cloudbaseinit/tests/plugins/common/test_ephemeraldisk.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import exception diff --git a/cloudbaseinit/tests/plugins/common/test_execcmd.py b/cloudbaseinit/tests/plugins/common/test_execcmd.py index 0d473d3a..068161aa 100644 --- a/cloudbaseinit/tests/plugins/common/test_execcmd.py +++ b/cloudbaseinit/tests/plugins/common/test_execcmd.py @@ -16,11 +16,7 @@ import os import textwrap import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import execcmd diff --git a/cloudbaseinit/tests/plugins/common/test_fileexecutils.py b/cloudbaseinit/tests/plugins/common/test_fileexecutils.py index 668c539f..b654484c 100644 --- a/cloudbaseinit/tests/plugins/common/test_fileexecutils.py +++ b/cloudbaseinit/tests/plugins/common/test_fileexecutils.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.plugins.common import fileexecutils from cloudbaseinit.tests import testutils diff --git a/cloudbaseinit/tests/plugins/common/test_localscripts.py b/cloudbaseinit/tests/plugins/common/test_localscripts.py index 3a9ca3fa..d42da89a 100644 --- a/cloudbaseinit/tests/plugins/common/test_localscripts.py +++ b/cloudbaseinit/tests/plugins/common/test_localscripts.py @@ -14,11 +14,7 @@ import os import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import localscripts diff --git a/cloudbaseinit/tests/plugins/common/test_mtu.py b/cloudbaseinit/tests/plugins/common/test_mtu.py index 75df0739..18c26851 100644 --- a/cloudbaseinit/tests/plugins/common/test_mtu.py +++ b/cloudbaseinit/tests/plugins/common/test_mtu.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import mtu diff --git a/cloudbaseinit/tests/plugins/common/test_networkconfig.py b/cloudbaseinit/tests/plugins/common/test_networkconfig.py index b1d78e59..5962a104 100644 --- a/cloudbaseinit/tests/plugins/common/test_networkconfig.py +++ b/cloudbaseinit/tests/plugins/common/test_networkconfig.py @@ -15,11 +15,7 @@ import functools import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import exception from cloudbaseinit.models import network as network_model diff --git a/cloudbaseinit/tests/plugins/common/test_ntpclient.py b/cloudbaseinit/tests/plugins/common/test_ntpclient.py index c256f7a7..d36210fe 100644 --- a/cloudbaseinit/tests/plugins/common/test_ntpclient.py +++ b/cloudbaseinit/tests/plugins/common/test_ntpclient.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import ntpclient diff --git a/cloudbaseinit/tests/plugins/common/test_sethostname.py b/cloudbaseinit/tests/plugins/common/test_sethostname.py index 5fad7cd2..bb262c76 100644 --- a/cloudbaseinit/tests/plugins/common/test_sethostname.py +++ b/cloudbaseinit/tests/plugins/common/test_sethostname.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import sethostname diff --git a/cloudbaseinit/tests/plugins/common/test_setuserpassword.py b/cloudbaseinit/tests/plugins/common/test_setuserpassword.py index ed005c74..0b21abd1 100644 --- a/cloudbaseinit/tests/plugins/common/test_setuserpassword.py +++ b/cloudbaseinit/tests/plugins/common/test_setuserpassword.py @@ -13,12 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock - +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import constant diff --git a/cloudbaseinit/tests/plugins/common/test_sshpublickeys.py b/cloudbaseinit/tests/plugins/common/test_sshpublickeys.py index 8b5c22fe..139cda6f 100644 --- a/cloudbaseinit/tests/plugins/common/test_sshpublickeys.py +++ b/cloudbaseinit/tests/plugins/common/test_sshpublickeys.py @@ -14,11 +14,7 @@ import os import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import exception from cloudbaseinit.plugins.common import base diff --git a/cloudbaseinit/tests/plugins/common/test_trim.py b/cloudbaseinit/tests/plugins/common/test_trim.py index 488ea9f1..b7782e9c 100644 --- a/cloudbaseinit/tests/plugins/common/test_trim.py +++ b/cloudbaseinit/tests/plugins/common/test_trim.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import trim diff --git a/cloudbaseinit/tests/plugins/common/test_userdata.py b/cloudbaseinit/tests/plugins/common/test_userdata.py index c734b908..63854c6a 100644 --- a/cloudbaseinit/tests/plugins/common/test_userdata.py +++ b/cloudbaseinit/tests/plugins/common/test_userdata.py @@ -17,11 +17,7 @@ import pkgutil import tempfile import textwrap import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import exception from cloudbaseinit.metadata.services import base as metadata_services_base diff --git a/cloudbaseinit/tests/plugins/common/test_userdatautils.py b/cloudbaseinit/tests/plugins/common/test_userdatautils.py index c1b5c1ff..3dc1f397 100644 --- a/cloudbaseinit/tests/plugins/common/test_userdatautils.py +++ b/cloudbaseinit/tests/plugins/common/test_userdatautils.py @@ -15,11 +15,7 @@ import os import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.plugins.common import execcmd from cloudbaseinit.plugins.common import userdatautils diff --git a/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_groups.py b/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_groups.py index 408c5a29..3911ee4a 100644 --- a/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_groups.py +++ b/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_groups.py @@ -13,11 +13,8 @@ # under the License. import unittest +import unittest.mock as mock -try: - import unittest.mock as mock -except ImportError: - import mock from oslo_config import cfg from cloudbaseinit import exception diff --git a/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_runcmd.py b/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_runcmd.py index 49bfdba2..c4039640 100644 --- a/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_runcmd.py +++ b/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_runcmd.py @@ -14,11 +14,7 @@ import os import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from oslo_config import cfg diff --git a/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_set_hostname.py b/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_set_hostname.py index a84e2ba8..d3e0270b 100644 --- a/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_set_hostname.py +++ b/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_set_hostname.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from oslo_config import cfg diff --git a/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_set_ntp.py b/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_set_ntp.py index 30ac4889..1dc3567e 100644 --- a/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_set_ntp.py +++ b/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_set_ntp.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from oslo_config import cfg diff --git a/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_set_timezone.py b/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_set_timezone.py index 75dcbcf7..42a76e92 100644 --- a/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_set_timezone.py +++ b/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_set_timezone.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.plugins.common.userdataplugins import cloudconfig from cloudbaseinit.plugins.common.userdataplugins.cloudconfigplugins import ( diff --git a/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_users.py b/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_users.py index 6ed4c768..27fc33a3 100644 --- a/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_users.py +++ b/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_users.py @@ -13,11 +13,8 @@ # under the License. import unittest +import unittest.mock as mock -try: - import unittest.mock as mock -except ImportError: - import mock from oslo_config import cfg from cloudbaseinit import exception diff --git a/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_write_files.py b/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_write_files.py index c769e5d4..e106567d 100644 --- a/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_write_files.py +++ b/cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_write_files.py @@ -17,11 +17,7 @@ import sys import tempfile import textwrap import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import exception diff --git a/cloudbaseinit/tests/plugins/common/userdataplugins/test_cloudboothook.py b/cloudbaseinit/tests/plugins/common/userdataplugins/test_cloudboothook.py index a43cfd99..f67129d9 100644 --- a/cloudbaseinit/tests/plugins/common/userdataplugins/test_cloudboothook.py +++ b/cloudbaseinit/tests/plugins/common/userdataplugins/test_cloudboothook.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.plugins.common.userdataplugins import cloudboothook diff --git a/cloudbaseinit/tests/plugins/common/userdataplugins/test_cloudconfig.py b/cloudbaseinit/tests/plugins/common/userdataplugins/test_cloudconfig.py index 9cb15f5b..825b1e8d 100644 --- a/cloudbaseinit/tests/plugins/common/userdataplugins/test_cloudconfig.py +++ b/cloudbaseinit/tests/plugins/common/userdataplugins/test_cloudconfig.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit.plugins.common.userdataplugins import cloudconfig diff --git a/cloudbaseinit/tests/plugins/common/userdataplugins/test_factory.py b/cloudbaseinit/tests/plugins/common/userdataplugins/test_factory.py index 0da64664..6b141561 100644 --- a/cloudbaseinit/tests/plugins/common/userdataplugins/test_factory.py +++ b/cloudbaseinit/tests/plugins/common/userdataplugins/test_factory.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.plugins.common.userdataplugins import factory diff --git a/cloudbaseinit/tests/plugins/common/userdataplugins/test_heat.py b/cloudbaseinit/tests/plugins/common/userdataplugins/test_heat.py index e9da21e8..b45c064c 100644 --- a/cloudbaseinit/tests/plugins/common/userdataplugins/test_heat.py +++ b/cloudbaseinit/tests/plugins/common/userdataplugins/test_heat.py @@ -15,11 +15,7 @@ import os import sys import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit.plugins.common.userdataplugins import heat diff --git a/cloudbaseinit/tests/plugins/common/userdataplugins/test_parthandler.py b/cloudbaseinit/tests/plugins/common/userdataplugins/test_parthandler.py index 9df3574f..db18284d 100644 --- a/cloudbaseinit/tests/plugins/common/userdataplugins/test_parthandler.py +++ b/cloudbaseinit/tests/plugins/common/userdataplugins/test_parthandler.py @@ -14,11 +14,7 @@ import os import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.plugins.common.userdataplugins import parthandler diff --git a/cloudbaseinit/tests/plugins/common/userdataplugins/test_shellscript.py b/cloudbaseinit/tests/plugins/common/userdataplugins/test_shellscript.py index 7abc7609..38f60d8c 100644 --- a/cloudbaseinit/tests/plugins/common/userdataplugins/test_shellscript.py +++ b/cloudbaseinit/tests/plugins/common/userdataplugins/test_shellscript.py @@ -14,12 +14,7 @@ import os import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock - +import unittest.mock as mock from cloudbaseinit.plugins.common.userdataplugins import shellscript from cloudbaseinit.tests import testutils diff --git a/cloudbaseinit/tests/plugins/test_factory.py b/cloudbaseinit/tests/plugins/test_factory.py index ac5f5d81..8969c565 100644 --- a/cloudbaseinit/tests/plugins/test_factory.py +++ b/cloudbaseinit/tests/plugins/test_factory.py @@ -14,11 +14,7 @@ import itertools import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit.plugins.common import base diff --git a/cloudbaseinit/tests/plugins/windows/test_azureguestagent.py b/cloudbaseinit/tests/plugins/windows/test_azureguestagent.py index e7b28e40..6b24cbe3 100644 --- a/cloudbaseinit/tests/plugins/windows/test_azureguestagent.py +++ b/cloudbaseinit/tests/plugins/windows/test_azureguestagent.py @@ -16,11 +16,7 @@ import datetime import importlib import os import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import exception diff --git a/cloudbaseinit/tests/plugins/windows/test_bootconfig.py b/cloudbaseinit/tests/plugins/windows/test_bootconfig.py index 3055c90d..440b1b9b 100644 --- a/cloudbaseinit/tests/plugins/windows/test_bootconfig.py +++ b/cloudbaseinit/tests/plugins/windows/test_bootconfig.py @@ -14,11 +14,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import constant diff --git a/cloudbaseinit/tests/plugins/windows/test_certificates.py b/cloudbaseinit/tests/plugins/windows/test_certificates.py index 19f43277..6c92dc8d 100644 --- a/cloudbaseinit/tests/plugins/windows/test_certificates.py +++ b/cloudbaseinit/tests/plugins/windows/test_certificates.py @@ -14,11 +14,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import constant from cloudbaseinit import exception diff --git a/cloudbaseinit/tests/plugins/windows/test_createuser.py b/cloudbaseinit/tests/plugins/windows/test_createuser.py index 13f2fc4b..0fff21d5 100644 --- a/cloudbaseinit/tests/plugins/windows/test_createuser.py +++ b/cloudbaseinit/tests/plugins/windows/test_createuser.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.plugins.windows import createuser from cloudbaseinit.tests import testutils diff --git a/cloudbaseinit/tests/plugins/windows/test_displayidletimeout.py b/cloudbaseinit/tests/plugins/windows/test_displayidletimeout.py index 129cb365..529e44a1 100644 --- a/cloudbaseinit/tests/plugins/windows/test_displayidletimeout.py +++ b/cloudbaseinit/tests/plugins/windows/test_displayidletimeout.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit.plugins.common import base diff --git a/cloudbaseinit/tests/plugins/windows/test_extendvolumes.py b/cloudbaseinit/tests/plugins/windows/test_extendvolumes.py index 7d23e57a..6d882703 100644 --- a/cloudbaseinit/tests/plugins/windows/test_extendvolumes.py +++ b/cloudbaseinit/tests/plugins/windows/test_extendvolumes.py @@ -15,11 +15,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.plugins.common import base from cloudbaseinit.tests import testutils diff --git a/cloudbaseinit/tests/plugins/windows/test_licensing.py b/cloudbaseinit/tests/plugins/windows/test_licensing.py index 2db4a072..b398f618 100644 --- a/cloudbaseinit/tests/plugins/windows/test_licensing.py +++ b/cloudbaseinit/tests/plugins/windows/test_licensing.py @@ -14,11 +14,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.plugins.common import base from cloudbaseinit.tests import testutils diff --git a/cloudbaseinit/tests/plugins/windows/test_ntpclient.py b/cloudbaseinit/tests/plugins/windows/test_ntpclient.py index d3f0638c..719e8e75 100644 --- a/cloudbaseinit/tests/plugins/windows/test_ntpclient.py +++ b/cloudbaseinit/tests/plugins/windows/test_ntpclient.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import exception diff --git a/cloudbaseinit/tests/plugins/windows/test_pagefiles.py b/cloudbaseinit/tests/plugins/windows/test_pagefiles.py index 6e13af13..ae2cd8f8 100644 --- a/cloudbaseinit/tests/plugins/windows/test_pagefiles.py +++ b/cloudbaseinit/tests/plugins/windows/test_pagefiles.py @@ -14,11 +14,7 @@ import os import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import exception diff --git a/cloudbaseinit/tests/plugins/windows/test_rdp.py b/cloudbaseinit/tests/plugins/windows/test_rdp.py index 783125ec..73de5dff 100644 --- a/cloudbaseinit/tests/plugins/windows/test_rdp.py +++ b/cloudbaseinit/tests/plugins/windows/test_rdp.py @@ -14,11 +14,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit.plugins.common import base diff --git a/cloudbaseinit/tests/plugins/windows/test_sanpolicy.py b/cloudbaseinit/tests/plugins/windows/test_sanpolicy.py index 75f2dc05..0a3850c7 100644 --- a/cloudbaseinit/tests/plugins/windows/test_sanpolicy.py +++ b/cloudbaseinit/tests/plugins/windows/test_sanpolicy.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import constant from cloudbaseinit.plugins.windows import sanpolicy diff --git a/cloudbaseinit/tests/plugins/windows/test_updates.py b/cloudbaseinit/tests/plugins/windows/test_updates.py index 0668be14..287213db 100644 --- a/cloudbaseinit/tests/plugins/windows/test_updates.py +++ b/cloudbaseinit/tests/plugins/windows/test_updates.py @@ -14,11 +14,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit.plugins.common import base diff --git a/cloudbaseinit/tests/plugins/windows/test_winrmcertificateauth.py b/cloudbaseinit/tests/plugins/windows/test_winrmcertificateauth.py index 3038f4d6..b4201530 100644 --- a/cloudbaseinit/tests/plugins/windows/test_winrmcertificateauth.py +++ b/cloudbaseinit/tests/plugins/windows/test_winrmcertificateauth.py @@ -14,11 +14,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import exception from cloudbaseinit.plugins.common import base diff --git a/cloudbaseinit/tests/plugins/windows/test_winrmlistener.py b/cloudbaseinit/tests/plugins/windows/test_winrmlistener.py index b61de9f3..c902b94b 100644 --- a/cloudbaseinit/tests/plugins/windows/test_winrmlistener.py +++ b/cloudbaseinit/tests/plugins/windows/test_winrmlistener.py @@ -14,11 +14,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit.plugins.common import base diff --git a/cloudbaseinit/tests/test_exception.py b/cloudbaseinit/tests/test_exception.py index ffd0d09c..3d408b56 100644 --- a/cloudbaseinit/tests/test_exception.py +++ b/cloudbaseinit/tests/test_exception.py @@ -12,10 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import exception from cloudbaseinit.tests import testutils diff --git a/cloudbaseinit/tests/test_init.py b/cloudbaseinit/tests/test_init.py index 307d9e94..d5192772 100644 --- a/cloudbaseinit/tests/test_init.py +++ b/cloudbaseinit/tests/test_init.py @@ -14,11 +14,7 @@ import sys import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import init diff --git a/cloudbaseinit/tests/test_version.py b/cloudbaseinit/tests/test_version.py index 94225e34..9cd8a903 100644 --- a/cloudbaseinit/tests/test_version.py +++ b/cloudbaseinit/tests/test_version.py @@ -14,8 +14,7 @@ import importlib import unittest - -import mock +import unittest.mock as mock from cloudbaseinit.tests import testutils diff --git a/cloudbaseinit/tests/testutils.py b/cloudbaseinit/tests/testutils.py index fdea01c3..6431c1b5 100644 --- a/cloudbaseinit/tests/testutils.py +++ b/cloudbaseinit/tests/testutils.py @@ -19,11 +19,7 @@ import os import shutil import tempfile import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from oslo_log import log as oslo_logging diff --git a/cloudbaseinit/tests/utils/template_engine/test_factory.py b/cloudbaseinit/tests/utils/template_engine/test_factory.py index a7f5868e..cbc26c48 100644 --- a/cloudbaseinit/tests/utils/template_engine/test_factory.py +++ b/cloudbaseinit/tests/utils/template_engine/test_factory.py @@ -12,11 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -try: - import unittest.mock as mock -except ImportError: - import mock import unittest +import unittest.mock as mock from cloudbaseinit.utils.template_engine import factory diff --git a/cloudbaseinit/tests/utils/template_engine/test_jinja2_template.py b/cloudbaseinit/tests/utils/template_engine/test_jinja2_template.py index 0bf19f3c..3038ae27 100644 --- a/cloudbaseinit/tests/utils/template_engine/test_jinja2_template.py +++ b/cloudbaseinit/tests/utils/template_engine/test_jinja2_template.py @@ -15,10 +15,7 @@ import ddt import unittest -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.utils.template_engine.jinja2_template import ( Jinja2TemplateEngine) diff --git a/cloudbaseinit/tests/utils/test_classloader.py b/cloudbaseinit/tests/utils/test_classloader.py index d9e49aae..bb46323f 100644 --- a/cloudbaseinit/tests/utils/test_classloader.py +++ b/cloudbaseinit/tests/utils/test_classloader.py @@ -15,11 +15,7 @@ import os import tempfile import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.utils import classloader diff --git a/cloudbaseinit/tests/utils/test_dhcp.py b/cloudbaseinit/tests/utils/test_dhcp.py index 5a911309..45bd0e0e 100644 --- a/cloudbaseinit/tests/utils/test_dhcp.py +++ b/cloudbaseinit/tests/utils/test_dhcp.py @@ -16,11 +16,7 @@ import netifaces import socket import struct import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.tests import testutils from cloudbaseinit.utils import dhcp diff --git a/cloudbaseinit/tests/utils/test_hostname.py b/cloudbaseinit/tests/utils/test_hostname.py index ad65a56f..4ced4a94 100644 --- a/cloudbaseinit/tests/utils/test_hostname.py +++ b/cloudbaseinit/tests/utils/test_hostname.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit.tests import testutils diff --git a/cloudbaseinit/tests/utils/test_log.py b/cloudbaseinit/tests/utils/test_log.py index c89614b8..82709d59 100644 --- a/cloudbaseinit/tests/utils/test_log.py +++ b/cloudbaseinit/tests/utils/test_log.py @@ -14,11 +14,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf diff --git a/cloudbaseinit/tests/utils/test_network.py b/cloudbaseinit/tests/utils/test_network.py index bd8d9b56..f895dab3 100644 --- a/cloudbaseinit/tests/utils/test_network.py +++ b/cloudbaseinit/tests/utils/test_network.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit.tests import testutils diff --git a/cloudbaseinit/tests/utils/test_retry_decorator.py b/cloudbaseinit/tests/utils/test_retry_decorator.py index fe1086ea..e9166fb1 100644 --- a/cloudbaseinit/tests/utils/test_retry_decorator.py +++ b/cloudbaseinit/tests/utils/test_retry_decorator.py @@ -17,8 +17,8 @@ """ Unit tests for the utils.retry_decorator module. """ -import mock import unittest +import unittest.mock as mock import cloudbaseinit.utils.retry_decorator as retry_decorator diff --git a/cloudbaseinit/tests/utils/windows/storage/test_factory.py b/cloudbaseinit/tests/utils/windows/storage/test_factory.py index da09ce0b..c0fc68db 100644 --- a/cloudbaseinit/tests/utils/windows/storage/test_factory.py +++ b/cloudbaseinit/tests/utils/windows/storage/test_factory.py @@ -16,11 +16,7 @@ import ctypes as _ # noqa import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock MODPATH = "cloudbaseinit.utils.windows.storage.factory" diff --git a/cloudbaseinit/tests/utils/windows/storage/test_vds_storage_manager.py b/cloudbaseinit/tests/utils/windows/storage/test_vds_storage_manager.py index 1dc9d2c6..86de22f9 100644 --- a/cloudbaseinit/tests/utils/windows/storage/test_vds_storage_manager.py +++ b/cloudbaseinit/tests/utils/windows/storage/test_vds_storage_manager.py @@ -17,11 +17,7 @@ import ctypes.util import importlib import re import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock class TestVDSStorageManager(unittest.TestCase): diff --git a/cloudbaseinit/tests/utils/windows/storage/test_wsm_storage_manager.py b/cloudbaseinit/tests/utils/windows/storage/test_wsm_storage_manager.py index 83bd3362..bd7c901e 100644 --- a/cloudbaseinit/tests/utils/windows/storage/test_wsm_storage_manager.py +++ b/cloudbaseinit/tests/utils/windows/storage/test_wsm_storage_manager.py @@ -15,11 +15,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import exception from cloudbaseinit.tests import testutils diff --git a/cloudbaseinit/tests/utils/windows/test_bootconfig.py b/cloudbaseinit/tests/utils/windows/test_bootconfig.py index 36a09aa0..5052b616 100644 --- a/cloudbaseinit/tests/utils/windows/test_bootconfig.py +++ b/cloudbaseinit/tests/utils/windows/test_bootconfig.py @@ -14,11 +14,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import exception from cloudbaseinit.tests import testutils diff --git a/cloudbaseinit/tests/utils/windows/test_disk.py b/cloudbaseinit/tests/utils/windows/test_disk.py index cea31f57..cef733e8 100644 --- a/cloudbaseinit/tests/utils/windows/test_disk.py +++ b/cloudbaseinit/tests/utils/windows/test_disk.py @@ -15,11 +15,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import exception from cloudbaseinit.tests import testutils diff --git a/cloudbaseinit/tests/utils/windows/test_licensing.py b/cloudbaseinit/tests/utils/windows/test_licensing.py index 3d7d4ee7..3fb7cfc0 100644 --- a/cloudbaseinit/tests/utils/windows/test_licensing.py +++ b/cloudbaseinit/tests/utils/windows/test_licensing.py @@ -14,11 +14,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import exception from cloudbaseinit.tests import testutils diff --git a/cloudbaseinit/tests/utils/windows/test_netlbfo.py b/cloudbaseinit/tests/utils/windows/test_netlbfo.py index 408e2b12..d10fec08 100644 --- a/cloudbaseinit/tests/utils/windows/test_netlbfo.py +++ b/cloudbaseinit/tests/utils/windows/test_netlbfo.py @@ -14,11 +14,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import exception from cloudbaseinit.models import network as network_model diff --git a/cloudbaseinit/tests/utils/windows/test_network.py b/cloudbaseinit/tests/utils/windows/test_network.py index 9940cb3c..b2b7a64e 100644 --- a/cloudbaseinit/tests/utils/windows/test_network.py +++ b/cloudbaseinit/tests/utils/windows/test_network.py @@ -14,11 +14,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import exception as cbinit_exception diff --git a/cloudbaseinit/tests/utils/windows/test_powercfg.py b/cloudbaseinit/tests/utils/windows/test_powercfg.py index ac0b4088..3bc01ce9 100644 --- a/cloudbaseinit/tests/utils/windows/test_powercfg.py +++ b/cloudbaseinit/tests/utils/windows/test_powercfg.py @@ -13,11 +13,7 @@ # under the License. import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import exception from cloudbaseinit.utils.windows import powercfg diff --git a/cloudbaseinit/tests/utils/windows/test_privilege.py b/cloudbaseinit/tests/utils/windows/test_privilege.py index c34c5946..e1014ead 100644 --- a/cloudbaseinit/tests/utils/windows/test_privilege.py +++ b/cloudbaseinit/tests/utils/windows/test_privilege.py @@ -14,11 +14,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock class TestPrivilege(unittest.TestCase): diff --git a/cloudbaseinit/tests/utils/windows/test_rdp.py b/cloudbaseinit/tests/utils/windows/test_rdp.py index 679677b9..dd38bf90 100644 --- a/cloudbaseinit/tests/utils/windows/test_rdp.py +++ b/cloudbaseinit/tests/utils/windows/test_rdp.py @@ -14,11 +14,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import exception from cloudbaseinit.tests import testutils diff --git a/cloudbaseinit/tests/utils/windows/test_security.py b/cloudbaseinit/tests/utils/windows/test_security.py index c01b1009..e116d19e 100644 --- a/cloudbaseinit/tests/utils/windows/test_security.py +++ b/cloudbaseinit/tests/utils/windows/test_security.py @@ -14,11 +14,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.tests import testutils diff --git a/cloudbaseinit/tests/utils/windows/test_timezone.py b/cloudbaseinit/tests/utils/windows/test_timezone.py index 1aff9037..51dd7b50 100644 --- a/cloudbaseinit/tests/utils/windows/test_timezone.py +++ b/cloudbaseinit/tests/utils/windows/test_timezone.py @@ -16,11 +16,7 @@ import importlib import os import struct import unittest -try: - import unittest.mock as mock -except ImportError: - import mock - +import unittest.mock as mock from cloudbaseinit import exception diff --git a/cloudbaseinit/tests/utils/windows/test_updates.py b/cloudbaseinit/tests/utils/windows/test_updates.py index 42d59b2f..e6ad331b 100644 --- a/cloudbaseinit/tests/utils/windows/test_updates.py +++ b/cloudbaseinit/tests/utils/windows/test_updates.py @@ -14,11 +14,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock MODPATH = "cloudbaseinit.utils.windows.updates" diff --git a/cloudbaseinit/tests/utils/windows/test_vds.py b/cloudbaseinit/tests/utils/windows/test_vds.py index ea234911..bce5e668 100644 --- a/cloudbaseinit/tests/utils/windows/test_vds.py +++ b/cloudbaseinit/tests/utils/windows/test_vds.py @@ -14,11 +14,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock class WindowsVdsUtilsTests(unittest.TestCase): diff --git a/cloudbaseinit/tests/utils/windows/test_vfat.py b/cloudbaseinit/tests/utils/windows/test_vfat.py index f46dca9c..e1d9c8fb 100644 --- a/cloudbaseinit/tests/utils/windows/test_vfat.py +++ b/cloudbaseinit/tests/utils/windows/test_vfat.py @@ -14,11 +14,7 @@ import os import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import exception from cloudbaseinit.tests import testutils diff --git a/cloudbaseinit/tests/utils/windows/test_winrmconfig.py b/cloudbaseinit/tests/utils/windows/test_winrmconfig.py index 4ce0d095..5026f54a 100644 --- a/cloudbaseinit/tests/utils/windows/test_winrmconfig.py +++ b/cloudbaseinit/tests/utils/windows/test_winrmconfig.py @@ -14,13 +14,9 @@ import importlib import unittest +import unittest.mock as mock from xml.sax import saxutils -try: - import unittest.mock as mock -except ImportError: - import mock - from cloudbaseinit import exception from cloudbaseinit.tests import fake diff --git a/cloudbaseinit/tests/utils/windows/test_wmi_loader.py b/cloudbaseinit/tests/utils/windows/test_wmi_loader.py index d2855ae1..2465ac2c 100644 --- a/cloudbaseinit/tests/utils/windows/test_wmi_loader.py +++ b/cloudbaseinit/tests/utils/windows/test_wmi_loader.py @@ -15,11 +15,7 @@ import importlib import os import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit import exception diff --git a/cloudbaseinit/tests/utils/windows/test_ws2_32.py b/cloudbaseinit/tests/utils/windows/test_ws2_32.py index fe821168..d319c754 100644 --- a/cloudbaseinit/tests/utils/windows/test_ws2_32.py +++ b/cloudbaseinit/tests/utils/windows/test_ws2_32.py @@ -14,11 +14,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock class WS2_32UtilsTests(unittest.TestCase): diff --git a/cloudbaseinit/tests/utils/windows/test_x509.py b/cloudbaseinit/tests/utils/windows/test_x509.py index a604ab1c..12cf251e 100644 --- a/cloudbaseinit/tests/utils/windows/test_x509.py +++ b/cloudbaseinit/tests/utils/windows/test_x509.py @@ -14,11 +14,7 @@ import importlib import unittest - -try: - import unittest.mock as mock -except ImportError: - import mock +import unittest.mock as mock from cloudbaseinit.utils import x509constants