Fix no-translation-key test and report CPI validation errors as well

home/import_content_pages.py

@@ -232,8 +232,12 @@ def create_content_page_index_from_row(self, row: "ContentRow") -> None:
         if row.translation_tag or locale != self.default_locale():
             index.translation_key = row.translation_tag
         locale = self.locale_from_display_name(row.locale)
-        with contextlib.suppress(NodeAlreadySaved):
-            self.home_page(locale).add_child(instance=index)
+        try:
+            with contextlib.suppress(NodeAlreadySaved):
+                self.home_page(locale).add_child(instance=index)
+        except ValidationError as err:
+            # FIXME: Find a better way to represent this.
+            raise ImportException(f"Validation error: {err}")
 
         index.save_revision().publish()
 

home/tests/test_content_import_export.py

@@ -11,7 +11,6 @@
 
 import pytest
 from django.core import serializers  # type: ignore
-from django.core.exceptions import ValidationError  # type: ignore
 from django.core.files.images import ImageFile  # type: ignore
 from openpyxl import load_workbook
 from pytest_django.fixtures import SettingsWrapper
@@ -821,13 +820,23 @@ def test_no_translation_key_nondefault(self, newcsv_impexp: ImportExport) -> Non
         HomePage.add_root(locale=pt, title="Home (pt)", slug="home-pt")
 
         # A ContentPageIndex without a translation key fails
-        with pytest.raises(ValidationError):
+        with pytest.raises(ImportException) as e:
             newcsv_impexp.import_file("no-translation-key-cpi.csv")
 
+        assert e.value.row_num == 4
+        # FIXME: Find a better way to represent this.
+        assert "translation_key" in e.value.message
+        assert "“” is not a valid UUID." in e.value.message
+
         # A ContentPage without a translation key fails
-        with pytest.raises(ValidationError):
+        with pytest.raises(ImportException) as e:
             newcsv_impexp.import_file("no-translation-key-cp.csv")
 
+        assert e.value.row_num == 5
+        # FIXME: Find a better way to represent this.
+        assert "translation_key" in e.value.message
+        assert "“” is not a valid UUID." in e.value.message
+
     def test_invalid_locale_name(self, newcsv_impexp: ImportExport) -> None:
         """
         Importing pages with invalid locale names should raise an error that results