diff --git a/cloudbaseinit/tests/metadata/services/osconfigdrive/test_factory.py b/cloudbaseinit/tests/metadata/services/osconfigdrive/test_factory.py index 93ec80a10..05562b1d3 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 7489a0b16..f81e1804d 100644 --- a/cloudbaseinit/tests/metadata/services/osconfigdrive/test_windows.py +++ b/cloudbaseinit/tests/metadata/services/osconfigdrive/test_windows.py @@ -17,11 +17,7 @@ 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 3c78465a7..364aa63a4 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 d8c77653d..c6ee3dfa3 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 0a23d7860..eae2bf710 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 ef9397e29..78c96ce66 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 9e730891d..738ff0b66 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 a2b162a9e..f107d5c02 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 9e11e7e25..fab36b0a3 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 b21217578..1d7750363 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 eb4ae372c..6c2a5480b 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 1f5cd2685..3640fd1ce 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 114a9a0c2..c07713f0b 100644 --- a/cloudbaseinit/tests/metadata/services/test_nocloudservice.py +++ b/cloudbaseinit/tests/metadata/services/test_nocloudservice.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.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 583902112..1c11795de 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 4008fa2ec..1b480d1ce 100644 --- a/cloudbaseinit/tests/metadata/services/test_ovfservice.py +++ b/cloudbaseinit/tests/metadata/services/test_ovfservice.py @@ -16,10 +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 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 2f59e5653..8553e7fb3 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 6929fb3f2..a2dcab735 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 8dc7a3578..a827f9d09 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 1bc3ea543..719a0d1ff 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 51b0ad6de..e2e2d8c76 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 e8e5f63a2..c80680a46 100644 --- a/cloudbaseinit/tests/osutils/test_windows.py +++ b/cloudbaseinit/tests/osutils/test_windows.py @@ -17,14 +17,10 @@ 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 7f365a5e4..2a808ba17 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 c58bf9dd4..79ff294e7 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 0d473d3a4..068161aa0 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 668c539f0..b654484c5 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 3a9ca3faf..d42da89a0 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 75df0739c..18c268513 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 b1d78e59d..5962a1043 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 c256f7a7c..d36210fe4 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 5fad7cd28..bb262c76d 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 ed005c74c..0b21abd11 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 8b5c22fe6..139cda6fe 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 488ea9f10..b7782e9c4 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 c734b9089..63854c6a5 100644 --- a/cloudbaseinit/tests/plugins/common/test_userdata.py +++ b/cloudbaseinit/tests/plugins/common/test_userdata.py @@ -17,11 +17,7 @@ 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 c1b5c1ff6..3dc1f397a 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 408c5a29e..3911ee4a4 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 49bfdba21..c4039640e 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 a84e2ba8a..d3e0270ba 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 30ac4889b..1dc3567ea 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 75dcbcf7c..42a76e92d 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 6ed4c7688..27fc33a37 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 c769e5d49..e106567d9 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 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 a43cfd996..f67129d9f 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 9cb15f5b0..825b1e8d7 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 0da646646..6b1415610 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 e9da21e8e..b45c064cc 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 9df3574f6..db18284da 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 7abc7609c..38f60d8c4 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 ac5f5d818..8969c5650 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 e7b28e40f..6b24cbe3c 100644 --- a/cloudbaseinit/tests/plugins/windows/test_azureguestagent.py +++ b/cloudbaseinit/tests/plugins/windows/test_azureguestagent.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 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 3055c90d9..440b1b9b8 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 19f432770..6c92dc8d6 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 13f2fc4bd..0fff21d5b 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 129cb3652..529e44a1a 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 7d23e57aa..6d8827034 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 2db4a072c..b398f6185 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 d3f0638c6..719e8e75d 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 6e13af139..ae2cd8f80 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 783125ec2..73de5dff8 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 75f2dc05e..0a3850c78 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 0668be146..287213db7 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 3038f4d64..b42015305 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 b61de9f36..c902b94b2 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 ffd0d09c4..3d408b567 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 307d9e944..d51927724 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 94225e34e..9cd8a9031 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 fdea01c3b..6431c1b55 100644 --- a/cloudbaseinit/tests/testutils.py +++ b/cloudbaseinit/tests/testutils.py @@ -19,11 +19,7 @@ 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 a7f5868e7..cbc26c485 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 0bf19f3c5..3038ae27a 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 d9e49aaee..bb46323fe 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 5a9113092..45bd0e0e8 100644 --- a/cloudbaseinit/tests/utils/test_dhcp.py +++ b/cloudbaseinit/tests/utils/test_dhcp.py @@ -16,11 +16,7 @@ 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 ad65a56fa..4ced4a942 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 c89614b8e..82709d59d 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 bd8d9b56e..f895dab35 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 fe1086eaa..e9166fb1e 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 da09ce0b6..c0fc68dbe 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 1dc9d2c6b..86de22f9a 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 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 83bd3362c..bd7c901eb 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 36a09aa06..5052b6167 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 cea31f57a..cef733e83 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 3d7d4ee74..3fb7cfc04 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 408e2b126..d10fec089 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 9940cb3c5..b2b7a64e9 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 ac0b40887..3bc01ce9c 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 c34c59461..e1014eade 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 679677b95..dd38bf90f 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 c01b10099..e116d19ef 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 1aff9037a..51dd7b502 100644 --- a/cloudbaseinit/tests/utils/windows/test_timezone.py +++ b/cloudbaseinit/tests/utils/windows/test_timezone.py @@ -16,11 +16,7 @@ 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 42d59b2f1..e6ad331bd 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 ea2349118..bce5e6685 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 f46dca9c8..e1d9c8fb6 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 4ce0d0959..5026f54a4 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 d2855ae17..2465ac2c2 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 fe821168a..d319c754c 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 a604ab1cb..12cf251ef 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