replace assertNumQueries by assertMaxQueries

Signed-off-by: tdruez <tdruez@aboutcode.org>

Author: tdruez

.github/workflows/run-unit-tests-docker.yml

@@ -28,4 +28,4 @@ jobs:
       - name: Run tests
         run: |
           docker compose -f compose.yml -f compose.build.yml run web \
-            python ./manage.py test --verbosity=2 --noinput --parallel 2
+            python ./manage.py test --verbosity=2 --noinput --parallel auto

component_catalog/tests/test_importers.py

@@ -601,7 +601,7 @@ def test_importers_view_num_queries_view(self):
         with self.assertMaxQueries(9):
             self.client.get(reverse("admin:component_catalog_package_import"))
 
-        with self.assertNumQueries(4):
+        with self.assertMaxQueries(4):
             self.client.get(reverse("admin:organization_owner_import"))
 
         with self.assertMaxQueries(10):

component_catalog/tests/test_views.py

@@ -52,6 +52,7 @@
 from dje.models import ExternalReference
 from dje.models import ExternalSource
 from dje.models import History
+from dje.tests import MaxQueryMixin
 from dje.tests import add_perm
 from dje.tests import add_perms
 from dje.tests import create_superuser
@@ -77,7 +78,7 @@
 User = get_user_model()
 
 
-class ComponentUserViewsTestCase(TestCase):
+class ComponentUserViewsTestCase(MaxQueryMixin, TestCase):
     def setUp(self):
         self.nexb_dataspace = Dataspace.objects.create(name="nexB")
         self.nexb_user = User.objects.create_superuser(
@@ -980,7 +981,7 @@ def test_component_catalog_details_view_num_queries(self):
         History.log_change(self.basic_user, self.component1, "Changed version.")
         History.log_change(self.nexb_user, self.component1, "Changed notes.")
 
-        with self.assertNumQueries(32):
+        with self.assertMaxQueries(33):
             self.client.get(url)
 
     def test_component_catalog_details_view_package_tab_fields_visibility(self):
@@ -1095,7 +1096,7 @@ def test_component_catalog_component_create_ajax_view(self):
         self.assertContains(response, expected, html=True)
 
 
-class PackageUserViewsTestCase(TestCase):
+class PackageUserViewsTestCase(MaxQueryMixin, TestCase):
     testfiles_location = join(dirname(__file__), "testfiles")
 
     def setUp(self):
@@ -1133,7 +1134,7 @@ def setUp(self):
 
     def test_package_list_view_num_queries(self):
         self.client.login(username=self.super_user.username, password="secret")
-        with self.assertNumQueries(16):
+        with self.assertMaxQueries(17):
             self.client.get(reverse("component_catalog:package_list"))
 
     def test_package_list_view_pagination(self):
@@ -1271,7 +1272,7 @@ def test_package_details_view_num_queries(self):
         )
 
         self.client.login(username=self.super_user.username, password="secret")
-        with self.assertNumQueries(30):
+        with self.assertMaxQueries(31):
             self.client.get(self.package1.get_absolute_url())
 
     def test_package_details_view_content(self):
@@ -3797,7 +3798,7 @@ def test_component_catalog_package_update_view_save_as_with_collect_data(
         self.assertEqual(1, len(mock_collect_data.mock_calls))
 
 
-class ComponentListViewTestCase(TestCase):
+class ComponentListViewTestCase(MaxQueryMixin, TestCase):
     def setUp(self):
         self.dataspace = Dataspace.objects.create(
             name="nexB",
@@ -3887,7 +3888,7 @@ def setUp(self):
 
     def test_component_catalog_list_view_num_queries(self):
         self.client.login(username="nexb_user", password="t3st")
-        with self.assertNumQueries(17):
+        with self.assertMaxQueries(18):
             self.client.get(reverse("component_catalog:component_list"))
 
     def test_component_catalog_list_view_default(self):

license_library/tests/test_views.py

@@ -31,7 +31,7 @@
 from organization.models import Subowner
 
 
-class LicenseListViewTestCase(TestCase):
+class LicenseListViewTestCase(MaxQueryMixin, TestCase):
     def setUp(self):
         self.nexb_dataspace = Dataspace.objects.create(
             name="nexB",
@@ -286,7 +286,7 @@ def test_license_library_list_previous_next_license_link(self):
     def test_license_library_list_view_num_queries(self):
         self.client.login(username="nexb_user", password="t3st")
 
-        with self.assertNumQueries(16):
+        with self.assertMaxQueries(17):
             self.client.get(reverse("license_library:license_list"))
 
     def test_license_profile_column_availability_in_license_list_view(self):

organization/tests/test_views.py

@@ -13,6 +13,7 @@
 from django.urls import reverse
 
 from dje.models import Dataspace
+from dje.tests import MaxQueryMixin
 from dje.tests import add_perm
 from dje.tests import create_superuser
 from dje.tests import create_user
@@ -24,7 +25,7 @@
 Component = apps.get_model("component_catalog", "Component")
 
 
-class OwnerUserViewsTestCase(TestCase):
+class OwnerUserViewsTestCase(MaxQueryMixin, TestCase):
     def setUp(self):
         self.dataspace = Dataspace.objects.create(name="Dataspace")
         self.super_user = create_superuser("super_user", self.dataspace)
@@ -94,12 +95,12 @@ def test_object_details_view_tab_owner(self):
 
     def test_owner_list_view_num_queries(self):
         self.client.login(username=self.super_user.username, password="secret")
-        with self.assertNumQueries(13):
+        with self.assertMaxQueries(14):
             self.client.get(reverse("organization:owner_list"))
 
     def test_owner_details_view_num_queries(self):
         self.client.login(username=self.super_user.username, password="secret")
-        with self.assertNumQueries(18):
+        with self.assertMaxQueries(19):
             self.client.get(self.owner1.get_absolute_url())
 
     def test_owner_list_view_search_unicode_utf8_name_support(self):

product_portfolio/tests/test_views.py

@@ -136,7 +136,7 @@ def test_product_portfolio_detail_view_tab_inventory_and_hierarchy_availability(
         ProductComponent.objects.create(
             product=self.product1, component=self.component1, dataspace=self.dataspace
         )
-        with self.assertNumQueries(27):
+        with self.assertMaxQueries(28):
             response = self.client.get(url)
         self.assertContains(response, expected1)
         self.assertContains(response, expected2)
@@ -162,7 +162,7 @@ def test_product_portfolio_detail_view_tab_inventory_availability(self):
         ProductPackage.objects.create(
             product=self.product1, package=self.package1, dataspace=self.dataspace
         )
-        with self.assertNumQueries(25):
+        with self.assertMaxQueries(26):
             response = self.client.get(url)
         self.assertContains(response, expected)
 
@@ -357,7 +357,7 @@ def test_product_portfolio_tab_vulnerability_view_queries(self):
         make_vulnerability_analysis(product_package2, vulnerability2)
 
         url = product1.get_url("tab_vulnerabilities")
-        with self.assertNumQueries(11):
+        with self.assertMaxQueries(12):
             self.client.get(url)
 
     def test_product_portfolio_tab_vulnerability_risk_threshold(self):

reporting/tests/test_views.py

@@ -19,6 +19,7 @@
 from component_catalog.models import Component
 from dje.copier import copy_object
 from dje.models import Dataspace
+from dje.tests import MaxQueryMixin
 from license_library.models import License
 from license_library.models import LicenseCategory
 from organization.models import Owner
@@ -32,7 +33,7 @@
 from reporting.models import Report
 
 
-class ReportDetailsViewTestCase(TestCase):
+class ReportDetailsViewTestCase(MaxQueryMixin, TestCase):
     def setUp(self):
         self.dataspace = Dataspace.objects.create(name="nexB")
         self.owner = Owner.objects.create(dataspace=self.dataspace, name="My Fancy Owner Name")
@@ -1166,7 +1167,7 @@ def test_report_list_view_num_queries(self):
         # Needed to clear the queries from the License batch creation in setUp
         self.client.get(url)
 
-        with self.assertNumQueries(9):
+        with self.assertMaxQueries(10):
             self.client.get(url)
 
     def test_run_report_view_query_using_related_fields(self):

vulnerabilities/tests/test_views.py

@@ -12,12 +12,13 @@
 from component_catalog.tests import make_component
 from component_catalog.tests import make_package
 from dje.models import Dataspace
+from dje.tests import MaxQueryMixin
 from dje.tests import create_superuser
 from vulnerabilities.models import Vulnerability
 from vulnerabilities.tests import make_vulnerability
 
 
-class VulnerabilityViewsTestCase(TestCase):
+class VulnerabilityViewsTestCase(MaxQueryMixin, TestCase):
     def setUp(self):
         self.dataspace = Dataspace.objects.create(
             name="Dataspace",
@@ -35,7 +36,7 @@ def setUp(self):
 
     def test_vulnerability_list_view_num_queries(self):
         self.client.login(username=self.super_user.username, password="secret")
-        with self.assertNumQueries(7):
+        with self.assertMaxQueries(8):
             response = self.client.get(reverse("vulnerabilities:vulnerability_list"))
 
         vulnerability_count = Vulnerability.objects.count()

workflow/tests/test_views.py

@@ -26,6 +26,7 @@
 from component_catalog.models import Subcomponent
 from dje.models import Dataspace
 from dje.models import History
+from dje.tests import MaxQueryMixin
 from dje.tests import add_perm
 from dje.tests import create_superuser
 from dje.tests import create_user
@@ -1643,7 +1644,7 @@ def test_workflow_notification_request_comment_slack_payload(self):
         self.assertEqual(expected, payload)
 
 
-class RequestInComponentCatalogTestCase(TestCase):
+class RequestInComponentCatalogTestCase(MaxQueryMixin, TestCase):
     def setUp(self):
         self.nexb_dataspace = Dataspace.objects.create(name="nexB")
         self.user = create_superuser("nexb_user", self.nexb_dataspace)
@@ -1810,7 +1811,7 @@ def test_component_catalog_details_view_with_requests_num_queries(self):
 
         self.assertEqual(3, self.component1.get_requests(self.user).count())
 
-        with self.assertNumQueries(28):
+        with self.assertMaxQueries(29):
             self.client.get(url)
 
     @override_settings(ANONYMOUS_USERS_DATASPACE="nexB")