Adapt unit tests for GardenLinux feature changes

Signed-off-by: Tobias Wolf <[email protected]>
On-behalf-of: SAP <[email protected]>

Author: NotTheEvilOne

src/gardenlinux/features/cname.py

@@ -268,7 +268,7 @@ def release_metadata_string(self) -> str:
 BUG_REPORT_URL="{GL_BUG_REPORT_URL}"
 GARDENLINUX_CNAME="{self.cname}"
 GARDENLINUX_FEATURES="{self.feature_set}"
-GARDENLINUX_FEATURES_PLATFORMS="{platform}"
+GARDENLINUX_FEATURES_PLATFORM="{platform}"
 GARDENLINUX_FEATURES_ELEMENTS="{elements}"
 GARDENLINUX_FEATURES_FLAGS="{flags}"
 GARDENLINUX_VERSION="{self.version}"
@@ -339,7 +339,7 @@ def load_from_release_file(self, release_file: PathLike | str) -> None:
             "GARDENLINUX_FEATURES",
             "GARDENLINUX_FEATURES_ELEMENTS",
             "GARDENLINUX_FEATURES_FLAGS",
-            "GARDENLINUX_FEATURES_PLATFORMS",
+            "GARDENLINUX_FEATURES_PLATFORM",
             "GARDENLINUX_VERSION",
         ):
             if not release_config.has_option(UNNAMED_SECTION, release_field):
@@ -384,13 +384,9 @@ def load_from_release_file(self, release_file: PathLike | str) -> None:
             UNNAMED_SECTION, "GARDENLINUX_FEATURES_FLAGS"
         ).split(",")
 
-        platforms = release_config.get(
-            UNNAMED_SECTION, "GARDENLINUX_FEATURES_PLATFORMS"
-        ).split(",")
-
-        assert len(platforms) < 2, "Only one platform is supported"
-
-        self._feature_platform_cached = platforms[0]
+        self._feature_platform_cached = release_config.get(
+            UNNAMED_SECTION, "GARDENLINUX_FEATURES_PLATFORM"
+        )
 
     def save_to_release_file(
         self, release_file: PathLike | str, overwrite: Optional[bool] = False

test-data/gardenlinux

@@ -12,32 +12,76 @@
             "aws-gardener_prod",
             {
                 "platform": ["aws"],
-                "element": ["log", "sap", "ssh", "base", "server", "cloud", "gardener"],
-                "flag": ["_boot", "_nopkg", "_prod", "_slim"],
+                "element": [
+                    "log",
+                    "sap",
+                    "ssh",
+                    "base",
+                    "server",
+                    "cloud",
+                    "multipath",
+                    "iscsi",
+                    "nvme",
+                    "gardener",
+                ],
+                "flag": ["_fwcfg", "_legacy", "_nopkg", "_prod", "_slim"],
             },
         ),
         (
             "gcp-gardener_prod",
             {
                 "platform": ["gcp"],
-                "element": ["log", "sap", "ssh", "base", "server", "cloud", "gardener"],
-                "flag": ["_boot", "_nopkg", "_prod", "_slim"],
+                "element": [
+                    "log",
+                    "sap",
+                    "ssh",
+                    "base",
+                    "server",
+                    "cloud",
+                    "multipath",
+                    "iscsi",
+                    "nvme",
+                    "gardener",
+                ],
+                "flag": ["_fwcfg", "_legacy", "_nopkg", "_prod", "_slim"],
             },
         ),
         (
             "azure-gardener_prod",
             {
                 "platform": ["azure"],
-                "element": ["log", "sap", "ssh", "base", "server", "cloud", "gardener"],
-                "flag": ["_boot", "_nopkg", "_prod", "_slim"],
+                "element": [
+                    "log",
+                    "sap",
+                    "ssh",
+                    "base",
+                    "server",
+                    "cloud",
+                    "multipath",
+                    "iscsi",
+                    "nvme",
+                    "gardener",
+                ],
+                "flag": ["_fwcfg", "_legacy", "_nopkg", "_prod", "_slim"],
             },
         ),
         (
             "ali-gardener_prod",
             {
                 "platform": ["ali"],
-                "element": ["log", "sap", "ssh", "base", "server", "cloud", "gardener"],
-                "flag": ["_boot", "_nopkg", "_prod", "_slim"],
+                "element": [
+                    "log",
+                    "sap",
+                    "ssh",
+                    "base",
+                    "server",
+                    "cloud",
+                    "multipath",
+                    "iscsi",
+                    "nvme",
+                    "gardener",
+                ],
+                "flag": ["_fwcfg", "_legacy", "_nopkg", "_prod", "_slim"],
             },
         ),
         (
@@ -54,7 +98,7 @@
                     "chost",
                     "khost",
                 ],
-                "flag": ["_boot", "_dev", "_selinux", "_slim"],
+                "flag": ["_dev", "_fwcfg", "_legacy", "_selinux", "_slim"],
             },
         ),
     ],

tests/features/test_features_parser.py

@@ -402,10 +402,7 @@ def test_main_with_exclude_cname_print_elements(monkeypatch, capsys):
     # Assert
     captured = capsys.readouterr().out.strip()
 
-    assert (
-        "log,sap,ssh,base,server,gardener"
-        == captured
-    )
+    assert "log,sap,ssh,base,server,multipath,iscsi,nvme,gardener" == captured
 
 
 def test_main_with_exclude_cname_print_features(monkeypatch, capsys):
@@ -420,7 +417,7 @@ def test_main_with_exclude_cname_print_features(monkeypatch, capsys):
             "--cname",
             "kvm-gardener_prod",
             "--ignore",
-            "cloud",
+            "log",
             "--arch",
             "amd64",
             "--version",
@@ -438,6 +435,6 @@ def test_main_with_exclude_cname_print_features(monkeypatch, capsys):
     captured = capsys.readouterr().out.strip()
 
     assert (
-        "log,sap,ssh,_boot,_ignite,kvm,_nopkg,_prod,_slim,base,server,gardener"
+        "sap,ssh,_fwcfg,_ignite,_legacy,_nopkg,_prod,_slim,base,server,cloud,kvm,multipath,iscsi,nvme,gardener"
         == captured
     )

tests/features/test_main.py

@@ -26,7 +26,7 @@ def get_container_amd64_release_metadata(version, commit_hash):
 BUG_REPORT_URL="{GL_BUG_REPORT_URL}"
 GARDENLINUX_CNAME="container-amd64-today-local"
 GARDENLINUX_FEATURES="_slim,base,container"
-GARDENLINUX_FEATURES_PLATFORMS="container"
+GARDENLINUX_FEATURES_PLATFORM="container"
 GARDENLINUX_FEATURES_ELEMENTS="base"
 GARDENLINUX_FEATURES_FLAGS="_slim"
 GARDENLINUX_VERSION="today"