fix tests

Author: valentijnscholten

dojo/product/signals.py

@@ -13,6 +13,7 @@
 from dojo.models import Product
 from dojo.notifications.helper import create_notification
 from dojo.pghistory_models import DojoEvents
+from dojo.utils import get_current_user
 
 labels = get_labels()
 
@@ -61,9 +62,14 @@ def product_post_delete(sender, instance, **kwargs):
                 ).order_by("-id").first():
                     user = le.actor
 
+            if not user:
+                current_user = get_current_user()
+                user = current_user
+
             # Update description with user if found
             if user:
-                description = labels.ASSET_DELETE_WITH_NAME_WITH_USER_SUCCESS_MESSAGE % {"name": instance.name, "user": le.actor}
+                description = labels.ASSET_DELETE_WITH_NAME_WITH_USER_SUCCESS_MESSAGE % {"name": instance.name, "user": user}
+
         create_notification(event="product_deleted",  # template does not exists, it will default to "other" but this event name needs to stay because of unit testing
                             title=_("Deletion of %(name)s") % {"name": instance.name},
                             description=description,

dojo/product_type/signals.py

@@ -70,7 +70,8 @@ def product_type_post_delete(sender, instance, **kwargs):
 
             # Update description with user if found
             if user:
-                description = labels.ORG_DELETE_WITH_NAME_SUCCESS_MESSAGE % {"name": instance.name}
+                description = labels.ORG_DELETE_WITH_NAME_WITH_USER_SUCCESS_MESSAGE % {"name": instance.name, "user": user}
+
         create_notification(event="product_type_deleted",  # template does not exists, it will default to "other" but this event name needs to stay because of unit testing
                             title=_("Deletion of %(name)s") % {"name": instance.name},
                             description=description,

unittests/test_importers_performance.py

@@ -198,9 +198,9 @@ def test_import_reimport_reimport_performance_pghistory_async(self):
         configure_pghistory_triggers()
 
         self.import_reimport_performance(
-            expected_num_queries1=646,
+            expected_num_queries1=559,
             expected_num_async_tasks1=10,
-            expected_num_queries2=599,
+            expected_num_queries2=491,
             expected_num_async_tasks2=22,
             expected_num_queries3=284,
             expected_num_async_tasks3=20,
@@ -244,9 +244,9 @@ def test_import_reimport_reimport_performance_pghistory_no_async(self):
         testuser.usercontactinfo.save()
 
         self.import_reimport_performance(
-            expected_num_queries1=646,
+            expected_num_queries1=559,
             expected_num_async_tasks1=10,
-            expected_num_queries2=604,
+            expected_num_queries2=496,
             expected_num_async_tasks2=22,
             expected_num_queries3=289,
             expected_num_async_tasks3=20,
@@ -293,9 +293,9 @@ def test_import_reimport_reimport_performance_pghistory_no_async_with_product_gr
         self.system_settings(enable_product_grade=True)
 
         self.import_reimport_performance(
-            expected_num_queries1=647,
+            expected_num_queries1=560,
             expected_num_async_tasks1=11,
-            expected_num_queries2=605,
+            expected_num_queries2=497,
             expected_num_async_tasks2=23,
             expected_num_queries3=290,
             expected_num_async_tasks3=21,