Raise from exception + improve wording

opsmill · Sep 11, 2024 · d4a3095 · d4a3095
1 parent aa3e390
commit d4a3095
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/backend/infrahub/core/schema_manager.py b/backend/infrahub/core/schema_manager.py
@@ -903,12 +903,12 @@ def validate_menu_placements(self) -> None:
             if node.menu_placement:
                 try:
                     placement_node = self.get(name=node.menu_placement, duplicate=False)
-                except SchemaNotFoundError:
+                except SchemaNotFoundError as exc:
                     raise SchemaNotFoundError(
                         branch_name=self.name,
                         identifier=node.menu_placement,
-                        message=f"{node.kind} refers an unexisting menu placement node: {node.menu_placement}.",
-                    )
+                        message=f"{node.kind} refers to an invalid menu placement node: {node.menu_placement}.",
+                    ) from exc
                 if node == placement_node:
                     raise ValueError(f"{node.kind}: cannot be placed under itself in the menu") from None
 

diff --git a/backend/tests/integration/schema_lifecycle/test_schema_missing_menu_placement.py b/backend/tests/integration/schema_lifecycle/test_schema_missing_menu_placement.py
@@ -26,5 +26,5 @@ async def test_schema_missing_menu_placement(self, client: InfrahubClient):
         assert response.errors["errors"][0]["extensions"]["code"] == 422
         assert (
             response.errors["errors"][0]["message"]
-            == "InfraBNode refers an unexisting menu placement node: UnexistingNode."
+            == "InfraBNode refers to an invalid menu placement node: UnexistingNode."
         )
diff --git a/backend/tests/unit/core/schema_manager/test_manager_schema.py b/backend/tests/unit/core/schema_manager/test_manager_schema.py
@@ -838,7 +838,7 @@ async def test_schema_branch_validate_menu_placement():
     with pytest.raises(SchemaNotFoundError) as exc:
         schema.validate_menu_placements()
 
-    assert exc.value.message == "TestSubObject refers an unexisting menu placement node: NoSuchObject."
+    assert exc.value.message == "TestSubObject refers to an invalid menu placement node: NoSuchObject."
 
 
 async def test_schema_branch_validate_same_node_menu_placement():