simplify warmup

Author: valentijnscholten

unittests/test_importers_performance.py

@@ -3,6 +3,7 @@
 from unittest.mock import patch
 
 from crum import impersonate
+from django.contrib.contenttypes.models import ContentType
 from django.utils import timezone
 
 from dojo.decorators import dojo_async_task_counter
@@ -39,6 +40,12 @@ def setUp(self):
         self.system_settings(enable_webhooks_notifications=False)
         self.system_settings(enable_product_grade=False)
         self.system_settings(enable_github=False)
+        # Warm up ContentType cache for relevant models. This is needed if we want to be able to run the test in isolation
+        # As part of the test suite the ContentTYpe ids will already be cached and won't affect the query count.
+        # But if we run the test in isolation, the ContentType ids will not be cached and will result in more queries.
+        # By warming up the cache here, these queries are executed before we start counting queries
+        for model in [Development_Environment, Dojo_User, Endpoint, Endpoint_Status, Engagement, Finding, Product, Product_Type, User]:
+            ContentType.objects.get_for_model(model)
 
     @contextmanager
     def assertNumAsyncTask(self, num):
@@ -80,45 +87,6 @@ def import_reimport_performance(self, expected_num_queries1, expected_num_async_
         lead, _ = User.objects.get_or_create(username="admin")
         environment, _ = Development_Environment.objects.get_or_create(name="Development")
 
-        # first we do a bogus import to make sure any caches are loaded.
-        # without this the number of queries will be higher as the audit log will load content_type ids from the db
-
-        engagement_dummy, _created = Engagement.objects.get_or_create(
-            name="Test Create Dummy Engagement",
-            product=product,
-            target_start=timezone.now(),
-            target_end=timezone.now(),
-        )
-        import_options = {
-            "user": lead,
-            "lead": lead,
-            "scan_date": None,
-            "environment": environment,
-            "minimum_severity": "Info",
-            "active": True,
-            "verified": True,
-            "sync": True,
-            "scan_type": NPM_AUDIT_SCAN_TYPE,
-            "engagement": engagement_dummy,
-        }
-        importer = DefaultImporter(**import_options)
-        test, _, _len_new_findings, _len_closed_findings, _, _, _ = importer.process_scan(NPM_AUDIT_NO_VULN_FILENAME.open(encoding="utf-8"))
-
-        # if True:
-        #     exit(0)  # this is to make sure the importers are not run when running the tests in the IDE, as it will take too long
-
-        finding = Finding.objects.filter(test=test).first()
-
-        endpoint = Endpoint.objects.create(host="foo.bar", product=product)
-        Endpoint_Status.objects.create(
-                finding=finding,
-                endpoint=endpoint,
-        )
-
-        finding.endpoints.add(endpoint)
-        finding.title = "Dummy finding to ensure audit log is created"
-        finding.save()
-
         # first import the subset which missed one finding and a couple of endpoints on some of the findings
         with (
             self.subTest("import1"), impersonate(Dojo_User.objects.get(username="admin")),
@@ -185,7 +153,7 @@ def import_reimport_performance(self, expected_num_queries1, expected_num_async_
 
     def test_import_reimport_reimport_performance(self):
         self.import_reimport_performance(
-            expected_num_queries1=602,
+            expected_num_queries1=604,
             expected_num_async_tasks1=15,
             expected_num_queries2=489,
             expected_num_async_tasks2=23,