Tests: Properly catch all invalid artifacts

Author: ByteOtter

src/gardenlinux/s3/s3_artifacts.py

@@ -192,6 +192,18 @@ def upload_from_directory(
             "paths": [],
         }
 
+        # Catch any invalid artifacts
+        bad_files = [
+            f
+            for f in artifacts_dir.iterdir()
+            if not f.name.startswith(cname)
+            and f.suffix not in [".release", ".requirements"]
+        ]
+        if bad_files:
+            raise RuntimeError(
+                f"Artifact name '{bad_files[0].name}' does not start with cname '{cname}'"
+            )
+
         for artifact in artifacts_dir.iterdir():
             if not artifact.match(f"{cname}*"):
                 continue

tests/s3/test_s3_artifacts.py

@@ -161,17 +161,6 @@ def test_upload_from_directory_arch_none_raises(monkeypatch, 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"):
@@ -260,6 +249,8 @@ def test_upload_from_directory_commit_mismatch_raises(s3_setup):
     bad_data = RELEASE_DATA.replace("abc123", "wrong")
     release_path.write_text(bad_data)
     artifacts = S3Artifacts(env.bucket_name)
+
+    # Act / Assert
     with pytest.raises(RuntimeError, match="Commit ID"):
         artifacts.upload_from_directory(env.cname, env.tmp_path)