fix query counts

Author: valentijnscholten

unittests/test_importers_performance.py

@@ -172,9 +172,6 @@ def import_reimport_performance(self, expected_num_queries1, expected_num_async_
             reimporter = DefaultReImporter(**reimport_options)
             test, _, _len_new_findings, _len_closed_findings, _, _, _ = reimporter.process_scan(scan)
 
-    # patch the we_want_async decorator to always return True so we don't depend on block_execution flag shenanigans
-    # @patch("dojo.decorators.we_want_async", return_value=True)
-    # def test_import_reimport_reimport_performance_async(self, mock):
     @override_settings(ENABLE_AUDITLOG=True, AUDITLOG_TYPE="django-auditlog")
     def test_import_reimport_reimport_performance_async(self):
         # Ensure django-auditlog is properly configured for this test
@@ -191,38 +188,27 @@ def test_import_reimport_reimport_performance_async(self):
             expected_num_async_tasks3=20,
         )
 
-    # @patch("dojo.decorators.we_want_async", return_value=False)
-    # def test_import_reimport_reimport_performance_no_async(self, mock):
-    @override_settings(ENABLE_AUDITLOG=True, AUDITLOG_TYPE="django-auditlog")
-    def test_import_reimport_reimport_performance_no_async(self):
+    @override_settings(ENABLE_AUDITLOG=True, AUDITLOG_TYPE="django-pghistory")
+    def test_import_reimport_reimport_performance_pghistory_async(self):
         """
-        This test checks the performance of the importers when they are run in sync mode.
-        The reason for this is that we also want to be aware of when a PR affects the number of queries
-        or async tasks created by a background task.
-        The impersonate context manager above does not work as expected for disabling async,
-        so we patch the we_want_async decorator to always return False.
+        This test checks the performance of the importers when using django-pghistory with async enabled.
+        Query counts will need to be determined by running the test initially.
         """
-        # Ensure django-auditlog is properly configured for this test
         from dojo.auditlog import configure_audit_system, configure_pghistory_triggers
         configure_audit_system()
         configure_pghistory_triggers()
 
-        testuser = User.objects.get(username="admin")
-        testuser.usercontactinfo.block_execution = True
-        testuser.usercontactinfo.save()
         self.import_reimport_performance(
-            expected_num_queries1=682,
+            expected_num_queries1=648,
             expected_num_async_tasks1=10,
-            expected_num_queries2=615,
+            expected_num_queries2=603,
             expected_num_async_tasks2=22,
-            expected_num_queries3=297,
+            expected_num_queries3=287,
             expected_num_async_tasks3=20,
         )
 
-    # @patch("dojo.decorators.we_want_async", return_value=False)
-    # def test_import_reimport_reimport_performance_no_async_with_product_grading(self, mock):
     @override_settings(ENABLE_AUDITLOG=True, AUDITLOG_TYPE="django-auditlog")
-    def test_import_reimport_reimport_performance_no_async_with_product_grading(self):
+    def test_import_reimport_reimport_performance_no_async(self):
         """
         This test checks the performance of the importers when they are run in sync mode.
         The reason for this is that we also want to be aware of when a PR affects the number of queries
@@ -238,57 +224,63 @@ def test_import_reimport_reimport_performance_no_async_with_product_grading(self
         testuser = User.objects.get(username="admin")
         testuser.usercontactinfo.block_execution = True
         testuser.usercontactinfo.save()
-        self.system_settings(enable_product_grade=True)
-
         self.import_reimport_performance(
-            expected_num_queries1=666,
+            expected_num_queries1=682,
             expected_num_async_tasks1=10,
-            expected_num_queries2=630,
+            expected_num_queries2=615,
             expected_num_async_tasks2=22,
-            expected_num_queries3=312,
+            expected_num_queries3=297,
             expected_num_async_tasks3=20,
         )
 
-    # New pghistory performance tests
     @override_settings(ENABLE_AUDITLOG=True, AUDITLOG_TYPE="django-pghistory")
-    def test_import_reimport_reimport_performance_pghistory_async(self):
+    def test_import_reimport_reimport_performance_pghistory_no_async(self):
         """
-        This test checks the performance of the importers when using django-pghistory with async enabled.
+        This test checks the performance of the importers when using django-pghistory with async disabled.
         Query counts will need to be determined by running the test initially.
         """
         from dojo.auditlog import configure_audit_system, configure_pghistory_triggers
         configure_audit_system()
         configure_pghistory_triggers()
 
+        testuser = User.objects.get(username="admin")
+        testuser.usercontactinfo.block_execution = True
+        testuser.usercontactinfo.save()
+
         self.import_reimport_performance(
             expected_num_queries1=648,
             expected_num_async_tasks1=10,
-            expected_num_queries2=603,
+            expected_num_queries2=608,
             expected_num_async_tasks2=22,
-            expected_num_queries3=287,
+            expected_num_queries3=292,
             expected_num_async_tasks3=20,
         )
 
-    @override_settings(ENABLE_AUDITLOG=True, AUDITLOG_TYPE="django-pghistory")
-    def test_import_reimport_reimport_performance_pghistory_no_async(self):
+    @override_settings(ENABLE_AUDITLOG=True, AUDITLOG_TYPE="django-auditlog")
+    def test_import_reimport_reimport_performance_no_async_with_product_grading(self):
         """
-        This test checks the performance of the importers when using django-pghistory with async disabled.
-        Query counts will need to be determined by running the test initially.
+        This test checks the performance of the importers when they are run in sync mode.
+        The reason for this is that we also want to be aware of when a PR affects the number of queries
+        or async tasks created by a background task.
+        The impersonate context manager above does not work as expected for disabling async,
+        so we patch the we_want_async decorator to always return False.
         """
+        # Ensure django-auditlog is properly configured for this test
         from dojo.auditlog import configure_audit_system, configure_pghistory_triggers
         configure_audit_system()
         configure_pghistory_triggers()
 
         testuser = User.objects.get(username="admin")
         testuser.usercontactinfo.block_execution = True
         testuser.usercontactinfo.save()
+        self.system_settings(enable_product_grade=True)
 
         self.import_reimport_performance(
-            expected_num_queries1=648,
+            expected_num_queries1=666,
             expected_num_async_tasks1=10,
-            expected_num_queries2=608,
+            expected_num_queries2=630,
             expected_num_async_tasks2=22,
-            expected_num_queries3=292,
+            expected_num_queries3=312,
             expected_num_async_tasks3=20,
         )