✅ [#565] Fix coverage

Queryset is never empty; django admin already checks this when
performing an action.

Author: CharString

src/objects/core/admin.py

@@ -226,14 +226,10 @@ def import_from_file_view(self, request: HttpRequest) -> HttpResponse:
             {"form": form, "source": "file"},
         )
 
-    @admin.action(description="Export selected objecttypes as a file")
+    @admin.action(description=_("Export selected objecttypes as a file"))
     def export_objecttypes_action(
         self, request: HttpRequest, queryset: models.QuerySet[ObjectType]
-    ) -> HttpResponse | None:
-        if not queryset.exists():
-            self.message_user(request, "No objecttypes selected for export.")
-            return None
-
+    ) -> HttpResponse:
         output = io.BytesIO()
         export_data(output, objecttypes=queryset)
 

src/objects/core/import_export.py

@@ -114,8 +114,10 @@ def _strip_uuid(data: object):
             return [_strip_uuid(m) for m in members]
         case {"uuid": _, **rest}:
             return rest
-        case _:
-            return data
+        case _:  # pragma: no cover
+            raise Exception(
+                "If you want to reuse this for whatever you're doing, make it recursive"
+            )
 
 
 @transaction.atomic
@@ -181,12 +183,13 @@ def import_upload(
                     report_error_to_user(
                         _("{file} is not a supported file type").format(file=file.name),
                     )
-                except Exception:
+                except Exception:  # pragma: no cover
                     report_error_to_user(
                         _(
                             "Something unexpected happened during import.\n"
-                            "If you think the file should be correct, "
-                            "please include the file in your bug report.\n"
+                            "Please try again. If it fails again and you think "
+                            "the file should be correct, please include the "
+                            "file in your bug report.\n"
                         ).format()
                     )
                     logger.exception("unhandled import exception")
@@ -197,7 +200,7 @@ def import_upload(
                 for f in fs
                 for resource in import_upload(f, keep_uuid, report_error_to_user)
             }
-        case _:  # pragma: no-cover
+        case _:  # pragma: no cover
             logger.exception("unexected type in upload", contents=file)
             raise SuspiciousFileOperation("Unexpected type in upload")
 

src/objects/core/tests/test_export_import.py

@@ -1,13 +1,14 @@
 import json
 from io import BytesIO
 
+from django.core.files.uploadedfile import SimpleUploadedFile
 import hypothesis.strategies as st
 import jsonschema_specifications
 from hypothesis import HealthCheck, given, settings
 from hypothesis.extra.django import TestCase, from_model
 from hypothesis_jsonschema import from_schema
 
-from ..import_export import export_data, import_data
+from ..import_export import export_data, import_data, import_upload
 from ..models import ObjectType, ObjectTypeVersion
 from ..utils import check_json_schema
 
@@ -267,3 +268,31 @@ def test_export_import_with_new_uuid(self, original_type: ObjectType) -> None:
             assert imported_version.json_schema == original_version.json_schema
             assert imported_version.status == original_version.status
             assert imported_version.published_at == original_version.published_at
+
+
+    @given(objecttypes(), objecttypes())
+    @settings(suppress_health_check=[HealthCheck.too_slow])
+    def test_import_upload_list_of_files(self, ot1, ot2):
+        output1 = BytesIO()
+        output2 = BytesIO()
+
+        export_data(output1, objecttypes=[ot1])
+        export_data(output2, objecttypes=[ot2])
+
+        file1 = SimpleUploadedFile(
+            "file1.zip", output1.getvalue(), content_type="application/zip"
+        )
+        file2 = SimpleUploadedFile(
+            "file2.zip", output2.getvalue(), content_type="application/zip"
+        )
+
+        ObjectType.objects.all().delete()
+
+        errors = []
+        def report_error(msg):
+            errors.append(msg)
+
+        import_upload([file1, file2], keep_uuid=True, report_error_to_user=report_error)
+
+        assert set(ObjectType.objects.all().values_list("name", flat=True)) == {ot1.name.strip(), ot2.name.strip()}
+        assert errors == []