supporting changes

Author: valentijnscholten

unittests/dojo_test_case.py

@@ -499,7 +499,7 @@ def __init__(self, *args, **kwargs):
 
     def login_as_admin(self):
         testuser = self.get_test_admin()
-        token = Token.objects.get(user=testuser)
+        token, _ = Token.objects.get_or_create(user=testuser)
         self.client = APIClient()
         self.client.credentials(HTTP_AUTHORIZATION="Token " + token.key)
 

unittests/test_import_reimport.py

@@ -10,8 +10,6 @@
 from django.test.client import Client
 from django.urls import reverse
 from django.utils import timezone
-from rest_framework.authtoken.models import Token
-from rest_framework.test import APIClient
 
 from dojo.models import Finding, Test, Test_Type, User
 
@@ -1751,10 +1749,7 @@ def setUp(self):
         testuser = User.objects.get(username="admin")
         testuser.usercontactinfo.block_execution = True
         testuser.usercontactinfo.save()
-
-        token = Token.objects.get(user=testuser)
-        self.client = APIClient()
-        self.client.credentials(HTTP_AUTHORIZATION="Token " + token.key)
+        self.login_as_admin()
         # self.url = reverse(self.viewname + '-list')
 
     # Statistics only available in API Response
@@ -2029,10 +2024,7 @@ def setUp(self):
         testuser = User.objects.get(username="admin")
         testuser.usercontactinfo.block_execution = True
         testuser.usercontactinfo.save()
-
-        token = Token.objects.get(user=testuser)
-        self.client = APIClient()
-        self.client.credentials(HTTP_AUTHORIZATION="Token " + token.key)
+        self.login_as_admin()
         # self.url = reverse(self.viewname + '-list')
 
         self.client_ui = Client()

unittests/test_importers_performance.py

@@ -34,9 +34,6 @@
 STACK_HAWK_SUBSET_FILENAME = get_unit_tests_scans_path("stackhawk") / "stackhawk_many_vul_without_duplicated_findings_subset.json"
 STACK_HAWK_SCAN_TYPE = "StackHawk HawkScan"
 
-NPM_AUDIT_NO_VULN_FILENAME = get_unit_tests_scans_path("npm_audit") / "one_vuln.json"
-NPM_AUDIT_SCAN_TYPE = "NPM Audit Scan"
-
 
 class TestDojoImporterPerformance(DojoTestCase):
 
@@ -58,7 +55,7 @@ def setUp(self):
             ContentType.objects.get_for_model(model)
 
     @contextmanager
-    def assertNumAsyncTask(self, num):
+    def _assertNumAsyncTask(self, num):
         dojo_async_task_counter.start()
         try:
             yield
@@ -82,7 +79,7 @@ def assertNumAsyncTask(self, num):
         )
         logger.debug(msg)
 
-    def import_reimport_performance(self, expected_num_queries1, expected_num_async_tasks1, expected_num_queries2, expected_num_async_tasks2, expected_num_queries3, expected_num_async_tasks3):
+    def _import_reimport_performance(self, expected_num_queries1, expected_num_async_tasks1, expected_num_queries2, expected_num_async_tasks2, expected_num_queries3, expected_num_async_tasks3):
         """
         Log output can be quite large as when the assertNumQueries fails, all queries are printed.
         It could be usefule to capture the output in `less`:
@@ -109,7 +106,7 @@ def import_reimport_performance(self, expected_num_queries1, expected_num_async_
         with (
             self.subTest("import1"), impersonate(Dojo_User.objects.get(username="admin")),
             self.assertNumQueries(expected_num_queries1),
-            self.assertNumAsyncTask(expected_num_async_tasks1),
+            self._assertNumAsyncTask(expected_num_async_tasks1),
             STACK_HAWK_SUBSET_FILENAME.open(encoding="utf-8") as scan,
         ):
             import_options = {
@@ -133,7 +130,7 @@ def import_reimport_performance(self, expected_num_queries1, expected_num_async_
         with (
             self.subTest("reimport1"), impersonate(Dojo_User.objects.get(username="admin")),
             self.assertNumQueries(expected_num_queries2),
-            self.assertNumAsyncTask(expected_num_async_tasks2),
+            self._assertNumAsyncTask(expected_num_async_tasks2),
             STACK_HAWK_FILENAME.open(encoding="utf-8") as scan,
         ):
             reimport_options = {
@@ -156,7 +153,7 @@ def import_reimport_performance(self, expected_num_queries1, expected_num_async_
         with (
             self.subTest("reimport2"), impersonate(Dojo_User.objects.get(username="admin")),
             self.assertNumQueries(expected_num_queries3),
-            self.assertNumAsyncTask(expected_num_async_tasks3),
+            self._assertNumAsyncTask(expected_num_async_tasks3),
             STACK_HAWK_SUBSET_FILENAME.open(encoding="utf-8") as scan,
         ):
             reimport_options = {
@@ -179,7 +176,7 @@ def test_import_reimport_reimport_performance_async(self):
         configure_audit_system()
         configure_pghistory_triggers()
 
-        self.import_reimport_performance(
+        self._import_reimport_performance(
             expected_num_queries1=593,
             expected_num_async_tasks1=10,
             expected_num_queries2=498,
@@ -197,7 +194,7 @@ def test_import_reimport_reimport_performance_pghistory_async(self):
         configure_audit_system()
         configure_pghistory_triggers()
 
-        self.import_reimport_performance(
+        self._import_reimport_performance(
             expected_num_queries1=559,
             expected_num_async_tasks1=10,
             expected_num_queries2=491,
@@ -221,7 +218,7 @@ def test_import_reimport_reimport_performance_no_async(self):
         testuser = User.objects.get(username="admin")
         testuser.usercontactinfo.block_execution = True
         testuser.usercontactinfo.save()
-        self.import_reimport_performance(
+        self._import_reimport_performance(
             expected_num_queries1=593,
             expected_num_async_tasks1=10,
             expected_num_queries2=503,
@@ -243,7 +240,7 @@ def test_import_reimport_reimport_performance_pghistory_no_async(self):
         testuser.usercontactinfo.block_execution = True
         testuser.usercontactinfo.save()
 
-        self.import_reimport_performance(
+        self._import_reimport_performance(
             expected_num_queries1=559,
             expected_num_async_tasks1=10,
             expected_num_queries2=496,
@@ -269,7 +266,7 @@ def test_import_reimport_reimport_performance_no_async_with_product_grading(self
         testuser.usercontactinfo.save()
         self.system_settings(enable_product_grade=True)
 
-        self.import_reimport_performance(
+        self._import_reimport_performance(
             expected_num_queries1=594,
             expected_num_async_tasks1=11,
             expected_num_queries2=504,
@@ -292,7 +289,7 @@ def test_import_reimport_reimport_performance_pghistory_no_async_with_product_gr
         testuser.usercontactinfo.save()
         self.system_settings(enable_product_grade=True)
 
-        self.import_reimport_performance(
+        self._import_reimport_performance(
             expected_num_queries1=560,
             expected_num_async_tasks1=11,
             expected_num_queries2=497,