Merge branch 'main' into workflows

Author: mouse-reeve

tests/test_all.py

@@ -11,6 +11,7 @@
 
 import os
 import tempfile
+from unittest.mock import patch  # pylint: disable=ungrouped-imports
 
 from django import forms
 from django.contrib.admin.sites import AdminSite
@@ -309,7 +310,8 @@ def test_image_resubmit_save_admin(self):
         setattr(resubmit_req, "_messages", messages)
         resubmit_req.user = self.user
         resubmit_req._dont_enforce_csrf_checks = True
-        saved_obj = testadmin.add_view(resubmit_req)  # <=== BUG here
+        with patch("django.contrib.admin.models.LogEntryManager.log_action"):
+            saved_obj = testadmin.add_view(resubmit_req)  # <=== BUG here
         self.assertEqual(saved_obj.admin_upload_image.read(), PNG)
         self.assertEqual(1, 1)
 
@@ -332,6 +334,7 @@ def test_file_resubmit_save_admin(self):
         setattr(resubmit_req, "_messages", messages)
         resubmit_req.user = self.user
         resubmit_req._dont_enforce_csrf_checks = True
-        saved_obj = testadmin.add_view(resubmit_req)  # <=== BUG here
+        with patch("django.contrib.admin.models.LogEntryManager.log_action"):
+            saved_obj = testadmin.add_view(resubmit_req)  # <=== BUG here
         self.assertEqual(saved_obj.admin_upload_file.read(), self.temporary_content)
         self.assertEqual(1, 1)