fixup! fix: don't raise CraftValidationErrors in validators

canonical · Jun 21, 2024 · 445e6cc · 445e6cc
1 parent 73806b6
commit 445e6cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/rockcraft/models/project.py b/rockcraft/models/project.py
@@ -183,9 +183,7 @@ def _validate_all_platforms(cls, platforms: dict[str, Any]) -> dict[str, Any]:
             try:
                 platform = Platform(**platform).dict()
             except pydantic.ValidationError as err:
-                errors = []
-                for err_dict in err.errors():
-                    errors.append(err_dict["msg"])
+                errors = [err_dict["msg"] for err_dict in err.errors()]
                 full_errors = ",".join(errors)
                 raise ValueError(f"{error_prefix}: {full_errors}") from None
 

diff --git a/tests/spread/rockcraft/invalid-name/task.yaml b/tests/spread/rockcraft/invalid-name/task.yaml
@@ -4,5 +4,5 @@ execute: |
   for name in a_a a@a a--a aa-
   do
     sed "s/placeholder-name/$name/" rockcraft.orig.yaml  > rockcraft.yaml
-    rockcraft pack 2>&1 >/dev/null | MATCH "Invalid name for rock"
+    rockcraft pack 2>&1 >/dev/null | MATCH "invalid name for rock"
   done