x/cloudbase-init
Code Issues Proposed changes

tests cleanup: Removes mock import checks

Browse Source 
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
This commit is contained in:
Claudiu Belu
2024-06-03 14:34:18 +00:00
parent 00ece4bbac
commit c01a7a74f0
95 changed files with 96 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cloudbaseinit/tests/metadata/services/osconfigdrive/test_factory.py
View File

@@ -14,11 +14,7 @@
import sys import sys
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.metadata.services.osconfigdrive import factory from cloudbaseinit.metadata.services.osconfigdrive import factory

6
cloudbaseinit/tests/metadata/services/osconfigdrive/test_windows.py
View File

@@ -17,11 +17,7 @@ import importlib
import itertools import itertools
import os import os
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit import exception from cloudbaseinit import exception

5
cloudbaseinit/tests/metadata/services/test_azureservice.py
View File

@@ -15,10 +15,7 @@
import importlib import importlib
import os import os
import unittest import unittest
try: import unittest.mock as mock
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit import exception from cloudbaseinit import exception

2
cloudbaseinit/tests/metadata/services/test_base.py
View File

@@ -12,9 +12,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import mock
import requests import requests
import unittest import unittest
import unittest.mock as mock
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.metadata.services import base from cloudbaseinit.metadata.services import base

6
cloudbaseinit/tests/metadata/services/test_baseconfigdrive.py
View File

@@ -16,11 +16,7 @@
import importlib import importlib
import os import os
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.metadata.services import baseconfigdrive from cloudbaseinit.metadata.services import baseconfigdrive

6
cloudbaseinit/tests/metadata/services/test_baseopenstackservice.py
View File

@@ -16,14 +16,10 @@
import functools import functools
import posixpath import posixpath
import unittest import unittest
import unittest.mock as mock
import netaddr import netaddr
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.metadata.services import base from cloudbaseinit.metadata.services import base

6
cloudbaseinit/tests/metadata/services/test_cloudstack.py
View File

@@ -15,13 +15,9 @@
import functools import functools
import socket import socket
import unittest import unittest
import unittest.mock as mock
import urllib import urllib
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit.metadata.services import base from cloudbaseinit.metadata.services import base
from cloudbaseinit.metadata.services import cloudstack from cloudbaseinit.metadata.services import cloudstack

6
cloudbaseinit/tests/metadata/services/test_configdrive.py
View File

@@ -15,11 +15,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.metadata.services import baseconfigdrive from cloudbaseinit.metadata.services import baseconfigdrive
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils

6
cloudbaseinit/tests/metadata/services/test_ec2service.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit.metadata.services import ec2service from cloudbaseinit.metadata.services import ec2service

6
cloudbaseinit/tests/metadata/services/test_gceservice.py
View File

@@ -15,11 +15,7 @@
import ddt import ddt
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils

6
cloudbaseinit/tests/metadata/services/test_httpservice.py
View File

@@ -14,13 +14,9 @@
import os import os
import unittest import unittest
import unittest.mock as mock
from urllib import error from urllib import error
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit.metadata.services import base from cloudbaseinit.metadata.services import base
from cloudbaseinit.metadata.services import httpservice from cloudbaseinit.metadata.services import httpservice

6
cloudbaseinit/tests/metadata/services/test_maasservice.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit import exception from cloudbaseinit import exception

6
cloudbaseinit/tests/metadata/services/test_nocloudservice.py
View File

@@ -16,11 +16,7 @@ import ddt
import importlib import importlib
import os import os
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.metadata.services import base from cloudbaseinit.metadata.services import base
from cloudbaseinit.models import network as nm from cloudbaseinit.models import network as nm

6
cloudbaseinit/tests/metadata/services/test_opennebulaservice.py
View File

@@ -16,11 +16,7 @@
import re import re
import textwrap import textwrap
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.metadata.services import base from cloudbaseinit.metadata.services import base
from cloudbaseinit.metadata.services import opennebulaservice from cloudbaseinit.metadata.services import opennebulaservice

5
cloudbaseinit/tests/metadata/services/test_ovfservice.py
View File

@@ -16,10 +16,7 @@ import base64
import importlib import importlib
import os import os
import unittest import unittest
try: import unittest.mock as mock
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit.metadata.services import base from cloudbaseinit.metadata.services import base

6
cloudbaseinit/tests/metadata/services/test_packet.py
View File

@@ -14,13 +14,9 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
from urllib import error from urllib import error
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils

9
cloudbaseinit/tests/metadata/services/test_vmwareguestinfoservice.py
View File

@@ -14,20 +14,15 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
import ddt 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 conf as cloudbaseinit_conf
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.models import network as network_model from cloudbaseinit.models import network as network_model
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils
from cloudbaseinit.utils import serialization
CONF = cloudbaseinit_conf.CONF CONF = cloudbaseinit_conf.CONF

6
cloudbaseinit/tests/metadata/test_factory.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.metadata import factory from cloudbaseinit.metadata import factory

6
cloudbaseinit/tests/osutils/test_base.py
View File

@@ -15,11 +15,7 @@
import subprocess import subprocess
import sys import sys
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.osutils import base from cloudbaseinit.osutils import base

6
cloudbaseinit/tests/osutils/test_factory.py
View File

@@ -14,11 +14,7 @@
import os import os
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.osutils import factory from cloudbaseinit.osutils import factory

6
cloudbaseinit/tests/osutils/test_windows.py
View File

@@ -17,14 +17,10 @@ import contextlib
import functools import functools
import importlib import importlib
import os import os
import unittest.mock as mock
import netaddr import netaddr
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.tests import fake from cloudbaseinit.tests import fake

6
cloudbaseinit/tests/plugins/common/test_createuser.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import base

6
cloudbaseinit/tests/plugins/common/test_ephemeraldisk.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit import exception from cloudbaseinit import exception

6
cloudbaseinit/tests/plugins/common/test_execcmd.py
View File

@@ -16,11 +16,7 @@
import os import os
import textwrap import textwrap
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import base
from cloudbaseinit.plugins.common import execcmd from cloudbaseinit.plugins.common import execcmd

6
cloudbaseinit/tests/plugins/common/test_fileexecutils.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.plugins.common import fileexecutils from cloudbaseinit.plugins.common import fileexecutils
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils

6
cloudbaseinit/tests/plugins/common/test_localscripts.py
View File

@@ -14,11 +14,7 @@
import os import os
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import base
from cloudbaseinit.plugins.common import localscripts from cloudbaseinit.plugins.common import localscripts

6
cloudbaseinit/tests/plugins/common/test_mtu.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import base
from cloudbaseinit.plugins.common import mtu from cloudbaseinit.plugins.common import mtu

6
cloudbaseinit/tests/plugins/common/test_networkconfig.py
View File

@@ -15,11 +15,7 @@
import functools import functools
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.models import network as network_model from cloudbaseinit.models import network as network_model

6
cloudbaseinit/tests/plugins/common/test_ntpclient.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import base
from cloudbaseinit.plugins.common import ntpclient from cloudbaseinit.plugins.common import ntpclient

6
cloudbaseinit/tests/plugins/common/test_sethostname.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import base
from cloudbaseinit.plugins.common import sethostname from cloudbaseinit.plugins.common import sethostname

7
cloudbaseinit/tests/plugins/common/test_setuserpassword.py
View File

@@ -13,12 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit import constant from cloudbaseinit import constant

6
cloudbaseinit/tests/plugins/common/test_sshpublickeys.py
View File

@@ -14,11 +14,7 @@
import os import os
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import base

6
cloudbaseinit/tests/plugins/common/test_trim.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import base
from cloudbaseinit.plugins.common import trim from cloudbaseinit.plugins.common import trim

6
cloudbaseinit/tests/plugins/common/test_userdata.py
View File

@@ -17,11 +17,7 @@ import pkgutil
import tempfile import tempfile
import textwrap import textwrap
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.metadata.services import base as metadata_services_base from cloudbaseinit.metadata.services import base as metadata_services_base

6
cloudbaseinit/tests/plugins/common/test_userdatautils.py
View File

@@ -15,11 +15,7 @@
import os import os
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.plugins.common import execcmd from cloudbaseinit.plugins.common import execcmd
from cloudbaseinit.plugins.common import userdatautils from cloudbaseinit.plugins.common import userdatautils

5
cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_groups.py
View File

@@ -13,11 +13,8 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from oslo_config import cfg from oslo_config import cfg
from cloudbaseinit import exception from cloudbaseinit import exception

6
cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_runcmd.py
View File

@@ -14,11 +14,7 @@
import os import os
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from oslo_config import cfg from oslo_config import cfg

6
cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_set_hostname.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from oslo_config import cfg from oslo_config import cfg

6
cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_set_ntp.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from oslo_config import cfg from oslo_config import cfg

6
cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_set_timezone.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.plugins.common.userdataplugins import cloudconfig from cloudbaseinit.plugins.common.userdataplugins import cloudconfig
from cloudbaseinit.plugins.common.userdataplugins.cloudconfigplugins import ( from cloudbaseinit.plugins.common.userdataplugins.cloudconfigplugins import (

5
cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_users.py
View File

@@ -13,11 +13,8 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from oslo_config import cfg from oslo_config import cfg
from cloudbaseinit import exception from cloudbaseinit import exception

6
cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_write_files.py
View File

@@ -17,11 +17,7 @@ import sys
import tempfile import tempfile
import textwrap import textwrap
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit import exception from cloudbaseinit import exception

6
cloudbaseinit/tests/plugins/common/userdataplugins/test_cloudboothook.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.plugins.common.userdataplugins import cloudboothook from cloudbaseinit.plugins.common.userdataplugins import cloudboothook

6
cloudbaseinit/tests/plugins/common/userdataplugins/test_cloudconfig.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit.plugins.common.userdataplugins import cloudconfig from cloudbaseinit.plugins.common.userdataplugins import cloudconfig

6
cloudbaseinit/tests/plugins/common/userdataplugins/test_factory.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.plugins.common.userdataplugins import factory from cloudbaseinit.plugins.common.userdataplugins import factory

6
cloudbaseinit/tests/plugins/common/userdataplugins/test_heat.py
View File

@@ -15,11 +15,7 @@
import os import os
import sys import sys
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit.plugins.common.userdataplugins import heat from cloudbaseinit.plugins.common.userdataplugins import heat

6
cloudbaseinit/tests/plugins/common/userdataplugins/test_parthandler.py
View File

@@ -14,11 +14,7 @@
import os import os
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.plugins.common.userdataplugins import parthandler from cloudbaseinit.plugins.common.userdataplugins import parthandler

7
cloudbaseinit/tests/plugins/common/userdataplugins/test_shellscript.py
View File

@@ -14,12 +14,7 @@
import os import os
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.plugins.common.userdataplugins import shellscript from cloudbaseinit.plugins.common.userdataplugins import shellscript
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils

6
cloudbaseinit/tests/plugins/test_factory.py
View File

@@ -14,11 +14,7 @@
import itertools import itertools
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import base

6
cloudbaseinit/tests/plugins/windows/test_azureguestagent.py
View File

@@ -16,11 +16,7 @@ import datetime
import importlib import importlib
import os import os
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit import exception from cloudbaseinit import exception

6
cloudbaseinit/tests/plugins/windows/test_bootconfig.py
View File

@@ -14,11 +14,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit import constant from cloudbaseinit import constant

6
cloudbaseinit/tests/plugins/windows/test_certificates.py
View File

@@ -14,11 +14,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import constant from cloudbaseinit import constant
from cloudbaseinit import exception from cloudbaseinit import exception

6
cloudbaseinit/tests/plugins/windows/test_createuser.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.plugins.windows import createuser from cloudbaseinit.plugins.windows import createuser
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils

6
cloudbaseinit/tests/plugins/windows/test_displayidletimeout.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import base

6
cloudbaseinit/tests/plugins/windows/test_extendvolumes.py
View File

@@ -15,11 +15,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import base
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils

6
cloudbaseinit/tests/plugins/windows/test_licensing.py
View File

@@ -14,11 +14,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import base
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils

6
cloudbaseinit/tests/plugins/windows/test_ntpclient.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit import exception from cloudbaseinit import exception

6
cloudbaseinit/tests/plugins/windows/test_pagefiles.py
View File

@@ -14,11 +14,7 @@
import os import os
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit import exception from cloudbaseinit import exception

6
cloudbaseinit/tests/plugins/windows/test_rdp.py
View File

@@ -14,11 +14,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import base

6
cloudbaseinit/tests/plugins/windows/test_sanpolicy.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import constant from cloudbaseinit import constant
from cloudbaseinit.plugins.windows import sanpolicy from cloudbaseinit.plugins.windows import sanpolicy

6
cloudbaseinit/tests/plugins/windows/test_updates.py
View File

@@ -14,11 +14,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import base

6
cloudbaseinit/tests/plugins/windows/test_winrmcertificateauth.py
View File

@@ -14,11 +14,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import base

6
cloudbaseinit/tests/plugins/windows/test_winrmlistener.py
View File

@@ -14,11 +14,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit.plugins.common import base from cloudbaseinit.plugins.common import base

5
cloudbaseinit/tests/test_exception.py
View File

@@ -12,10 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
try: import unittest.mock as mock
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils

6
cloudbaseinit/tests/test_init.py
View File

@@ -14,11 +14,7 @@
import sys import sys
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit import init from cloudbaseinit import init

3
cloudbaseinit/tests/test_version.py
View File

@@ -14,8 +14,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
import mock
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils

6
cloudbaseinit/tests/testutils.py
View File

@@ -19,11 +19,7 @@ import os
import shutil import shutil
import tempfile import tempfile
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from oslo_log import log as oslo_logging from oslo_log import log as oslo_logging

5
cloudbaseinit/tests/utils/template_engine/test_factory.py
View File

@@ -12,11 +12,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
try:
import unittest.mock as mock
except ImportError:
import mock
import unittest import unittest
import unittest.mock as mock
from cloudbaseinit.utils.template_engine import factory from cloudbaseinit.utils.template_engine import factory

5
cloudbaseinit/tests/utils/template_engine/test_jinja2_template.py
View File

@@ -15,10 +15,7 @@
import ddt import ddt
import unittest import unittest
try: import unittest.mock as mock
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.utils.template_engine.jinja2_template import ( from cloudbaseinit.utils.template_engine.jinja2_template import (
Jinja2TemplateEngine) Jinja2TemplateEngine)

6
cloudbaseinit/tests/utils/test_classloader.py
View File

@@ -15,11 +15,7 @@
import os import os
import tempfile import tempfile
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.utils import classloader from cloudbaseinit.utils import classloader

6
cloudbaseinit/tests/utils/test_dhcp.py
View File

@@ -16,11 +16,7 @@ import netifaces
import socket import socket
import struct import struct
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils
from cloudbaseinit.utils import dhcp from cloudbaseinit.utils import dhcp

6
cloudbaseinit/tests/utils/test_hostname.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils

6
cloudbaseinit/tests/utils/test_log.py
View File

@@ -14,11 +14,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf

6
cloudbaseinit/tests/utils/test_network.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import conf as cloudbaseinit_conf from cloudbaseinit import conf as cloudbaseinit_conf
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils

2
cloudbaseinit/tests/utils/test_retry_decorator.py
View File

@@ -17,8 +17,8 @@
""" """
Unit tests for the utils.retry_decorator module. Unit tests for the utils.retry_decorator module.
""" """
import mock
import unittest import unittest
import unittest.mock as mock
import cloudbaseinit.utils.retry_decorator as retry_decorator import cloudbaseinit.utils.retry_decorator as retry_decorator

6
cloudbaseinit/tests/utils/windows/storage/test_factory.py
View File

@@ -16,11 +16,7 @@
import ctypes as _ # noqa import ctypes as _ # noqa
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
MODPATH = "cloudbaseinit.utils.windows.storage.factory" MODPATH = "cloudbaseinit.utils.windows.storage.factory"

6
cloudbaseinit/tests/utils/windows/storage/test_vds_storage_manager.py
View File

@@ -17,11 +17,7 @@ import ctypes.util
import importlib import importlib
import re import re
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
class TestVDSStorageManager(unittest.TestCase): class TestVDSStorageManager(unittest.TestCase):

6
cloudbaseinit/tests/utils/windows/storage/test_wsm_storage_manager.py
View File

@@ -15,11 +15,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils

6
cloudbaseinit/tests/utils/windows/test_bootconfig.py
View File

@@ -14,11 +14,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils

6
cloudbaseinit/tests/utils/windows/test_disk.py
View File

@@ -15,11 +15,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils

6
cloudbaseinit/tests/utils/windows/test_licensing.py
View File

@@ -14,11 +14,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils

6
cloudbaseinit/tests/utils/windows/test_netlbfo.py
View File

@@ -14,11 +14,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.models import network as network_model from cloudbaseinit.models import network as network_model

6
cloudbaseinit/tests/utils/windows/test_network.py
View File

@@ -14,11 +14,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import exception as cbinit_exception from cloudbaseinit import exception as cbinit_exception

6
cloudbaseinit/tests/utils/windows/test_powercfg.py
View File

@@ -13,11 +13,7 @@
# under the License. # under the License.
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.utils.windows import powercfg from cloudbaseinit.utils.windows import powercfg

6
cloudbaseinit/tests/utils/windows/test_privilege.py
View File

@@ -14,11 +14,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
class TestPrivilege(unittest.TestCase): class TestPrivilege(unittest.TestCase):

6
cloudbaseinit/tests/utils/windows/test_rdp.py
View File

@@ -14,11 +14,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils

6
cloudbaseinit/tests/utils/windows/test_security.py
View File

@@ -14,11 +14,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils

6
cloudbaseinit/tests/utils/windows/test_timezone.py
View File

@@ -16,11 +16,7 @@ import importlib
import os import os
import struct import struct
import unittest import unittest
try: import unittest.mock as mock
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import exception from cloudbaseinit import exception

6
cloudbaseinit/tests/utils/windows/test_updates.py
View File

@@ -14,11 +14,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
MODPATH = "cloudbaseinit.utils.windows.updates" MODPATH = "cloudbaseinit.utils.windows.updates"

6
cloudbaseinit/tests/utils/windows/test_vds.py
View File

@@ -14,11 +14,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
class WindowsVdsUtilsTests(unittest.TestCase): class WindowsVdsUtilsTests(unittest.TestCase):

6
cloudbaseinit/tests/utils/windows/test_vfat.py
View File

@@ -14,11 +14,7 @@
import os import os
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.tests import testutils from cloudbaseinit.tests import testutils

6
cloudbaseinit/tests/utils/windows/test_winrmconfig.py
View File

@@ -14,13 +14,9 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
from xml.sax import saxutils from xml.sax import saxutils
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import exception from cloudbaseinit import exception
from cloudbaseinit.tests import fake from cloudbaseinit.tests import fake

6
cloudbaseinit/tests/utils/windows/test_wmi_loader.py
View File

@@ -15,11 +15,7 @@
import importlib import importlib
import os import os
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit import exception from cloudbaseinit import exception

6
cloudbaseinit/tests/utils/windows/test_ws2_32.py
View File

@@ -14,11 +14,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
class WS2_32UtilsTests(unittest.TestCase): class WS2_32UtilsTests(unittest.TestCase):

6
cloudbaseinit/tests/utils/windows/test_x509.py
View File

@@ -14,11 +14,7 @@
import importlib import importlib
import unittest import unittest
import unittest.mock as mock
try:
import unittest.mock as mock
except ImportError:
import mock
from cloudbaseinit.utils import x509constants from cloudbaseinit.utils import x509constants