Adapt unit tests for GardenLinux feature changes

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

Author: NotTheEvilOne

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"

tests/features/test_metadata_main.py

@@ -22,7 +22,7 @@ class S3Env:
 
 
 def make_cname(
-    flavor: str = "kvm-container",
+    flavor: str = "container",
     arch: str = "amd64",
     version: str = "1234.1",
     commit: str = "abc123",

tests/s3/conftest.py

@@ -7,7 +7,7 @@
 
 
 @pytest.mark.parametrize(
-    "argv,expected_method",
+    "argv, expected_method, expected_args, expected_kwargs",
     [
         (
             [
@@ -21,6 +21,8 @@
                 "download-artifacts-from-bucket",
             ],
             "download_to_directory",
+            ["test-cname", "some/path"],
+            {},
         ),
         (
             [
@@ -34,10 +36,14 @@
                 "upload-artifacts-to-bucket",
             ],
             "upload_from_directory",
+            ["test-cname", "some/path"],
+            {"dry_run": False},
         ),
     ],
 )
-def test_main_calls_correct_artifacts(argv, expected_method):
+def test_main_calls_correct_artifacts(
+    argv, expected_method, expected_args, expected_kwargs
+):
     with patch.object(sys, "argv", argv):
         with patch.object(s3m, "S3Artifacts") as mock_s3_cls:
             mock_instance = MagicMock()
@@ -46,6 +52,6 @@ def test_main_calls_correct_artifacts(argv, expected_method):
             s3m.main()
 
             method = getattr(mock_instance, expected_method)
-            method.assert_called_once_with("test-cname", "some/path")
+            method.assert_called_once_with(*expected_args, **expected_kwargs)
 
             mock_s3_cls.assert_called_once_with("test-bucket")

tests/s3/test_main.py

@@ -9,10 +9,14 @@
 from gardenlinux.s3.s3_artifacts import S3Artifacts
 
 RELEASE_DATA = """
+    GARDENLINUX_CNAME = container-amd64-1234.1-abc123
     GARDENLINUX_VERSION = 1234.1
     GARDENLINUX_COMMIT_ID = abc123
     GARDENLINUX_COMMIT_ID_LONG = abc123long
     GARDENLINUX_FEATURES = _usi,_trustedboot
+    GARDENLINUX_FEATURES_ELEMENTS =
+    GARDENLINUX_FEATURES_FLAGS = _usi,_trustedboot
+    GARDENLINUX_FEATURES_PLATFORM = container
     """
 
 
@@ -101,7 +105,7 @@ def test_upload_from_directory_success(s3_setup):
     release_path = env.tmp_path / f"{env.cname}.release"
     release_path.write_text(RELEASE_DATA)
 
-    for filename in [f"{env.cname}-file1", f"{env.cname}-file2"]:
+    for filename in [f"{env.cname}-file1", f"{env.cname}-file2", "container"]:
         (env.tmp_path / filename).write_bytes(b"dummy content")
 
     # Act
@@ -124,7 +128,7 @@ def test_upload_from_directory_success(s3_setup):
         Bucket=env.bucket_name, Key=f"objects/{env.cname}/{env.cname}-file1"
     )
     tags = {tag["Key"]: tag["Value"] for tag in raw_tags_response["TagSet"]}
-    assert tags["platform"] == "container+kvm"
+    assert tags["platform"] == "container"
 
 
 def test_upload_from_directory_with_delete(s3_setup):
@@ -160,30 +164,6 @@ def test_upload_from_directory_with_delete(s3_setup):
     assert f"meta/singles/{env.cname}" in keys
 
 
-def test_upload_from_directory_arch_none_raises(monkeypatch, s3_setup):
-    """Raise RuntimeError when CName has no arch"""
-    # Arrange
-    env = s3_setup
-    release_path = env.tmp_path / f"{env.cname}.release"
-    release_path.write_text(RELEASE_DATA)
-
-    # Monkeypatch CName to simulate missing architecture
-    import gardenlinux.s3.s3_artifacts as s3art
-
-    class DummyCName:
-        arch = None
-
-        def __init__(self, cname):
-            pass
-
-    monkeypatch.setattr(s3art, "CName", DummyCName)
-
-    # Act / Assert
-    artifacts = S3Artifacts(env.bucket_name)
-    with pytest.raises(RuntimeError, match="Architecture could not be determined"):
-        artifacts.upload_from_directory(env.cname, env.tmp_path)
-
-
 def test_upload_from_directory_invalid_dir_raises(s3_setup):
     """Raise RuntimeError if artifacts_dir is invalid"""
     env = s3_setup
@@ -204,41 +184,20 @@ def test_upload_from_directory_version_mismatch_raises(s3_setup):
     artifacts = S3Artifacts(env.bucket_name)
 
     # Act / Assert
-    with pytest.raises(RuntimeError, match="Version"):
+    with pytest.raises(RuntimeError, match="failed consistency check"):
         artifacts.upload_from_directory(env.cname, env.tmp_path)
 
 
-def test_upload_from_directory_none_version_raises(monkeypatch, s3_setup):
+def test_upload_from_directory_succeeds_because_of_release_file(monkeypatch, s3_setup):
     """
     Raise RuntimeError if CName.version is None.
     """
     # Arrange
     env = s3_setup
-    (env.tmp_path / f"{env.cname}.release").write_text(RELEASE_DATA)
-
-    import gardenlinux.s3.s3_artifacts as s3art
-
-    # Monkeypatch CName to force Cname.version to be None and avoid
-    # class internal error checks
-    class DummyCName:
-        arch = "amd64"
-        version = None
-        commit_id = "abc123"
-        platform = "aws"
-
-        def __init__(self, cname):
-            pass
+    (env.tmp_path / f"container.release").write_text(RELEASE_DATA)
 
-    monkeypatch.setattr(s3art, "CName", DummyCName)
-
-    artifacts = s3art.S3Artifacts(env.bucket_name)
-
-    # Act / Assert
-    with pytest.raises(
-        RuntimeError,
-        match="Release file data and given cname conflict detected: Version None",
-    ):
-        artifacts.upload_from_directory(env.cname, env.tmp_path)
+    artifacts = S3Artifacts(env.bucket_name)
+    artifacts.upload_from_directory("container", env.tmp_path)
 
 
 def test_upload_from_directory_invalid_artifact_name(s3_setup):
@@ -273,7 +232,7 @@ def test_upload_from_directory_commit_mismatch_raises(s3_setup):
     artifacts = S3Artifacts(env.bucket_name)
 
     # Act / Assert
-    with pytest.raises(RuntimeError, match="Commit ID"):
+    with pytest.raises(RuntimeError, match="failed consistency check"):
         artifacts.upload_from_directory(env.cname, env.tmp_path)