Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions tests/unittests/sources/test_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
from cloudinit.sources import DataSourceVMware as VMware
from cloudinit.sources import DataSourceVultr as Vultr
from cloudinit.sources import DataSourceWSL as WSL
from tests.unittests import helpers as test_helpers

DEFAULT_LOCAL = [
AliYun.DataSourceAliYunLocal,
Expand Down Expand Up @@ -87,7 +86,7 @@
]


class ExpectedDataSources(test_helpers.TestCase):
class TestExpectedDataSources:
builtin_list = settings.CFG_BUILTIN["datasource_list"]
deps_local = [sources.DEP_FILESYSTEM]
deps_network = [sources.DEP_FILESYSTEM, sources.DEP_NETWORK]
Expand All @@ -104,7 +103,7 @@ def test_expected_default_local_sources_found(self):
self.deps_local,
self.pkg_list,
)
self.assertEqual(set(DEFAULT_LOCAL), set(found))
assert set(DEFAULT_LOCAL) == set(found)

@patch.object(
importer,
Expand All @@ -117,7 +116,7 @@ def test_expected_default_network_sources_found(self):
self.deps_network,
self.pkg_list,
)
self.assertEqual(set(DEFAULT_NETWORK), set(found))
assert set(DEFAULT_NETWORK) == set(found)

@patch.object(
importer,
Expand All @@ -130,20 +129,20 @@ def test_expected_nondefault_network_sources_found(self):
self.deps_network,
self.pkg_list,
)
self.assertEqual(set([AliYun.DataSourceAliYun]), set(found))
assert set([AliYun.DataSourceAliYun]) == set(found)


class TestDataSourceInvariants(test_helpers.TestCase):
class TestDataSourceInvariants:
def test_data_sources_have_valid_network_config_sources(self):
for ds in DEFAULT_LOCAL + DEFAULT_NETWORK:
for cfg_src in ds.network_config_sources:
fail_msg = (
"{} has an invalid network_config_sources entry:"
" {}".format(str(ds), cfg_src)
)
self.assertTrue(
isinstance(cfg_src, sources.NetworkConfigSource), fail_msg
)
assert isinstance(
cfg_src, sources.NetworkConfigSource
), fail_msg

def test_expected_dsname_defined(self):
for ds in DEFAULT_LOCAL + DEFAULT_NETWORK:
Expand All @@ -152,5 +151,5 @@ def test_expected_dsname_defined(self):
str(ds), str(ds.dsname)
)
)
self.assertNotEqual(ds.dsname, DataSource.dsname, fail_msg)
self.assertIsNotNone(ds.dsname)
assert ds.dsname != DataSource.dsname, fail_msg
assert ds.dsname is not None