Skip to content

test(perf) on dev: re-enable import performance tests with recalibrated query counts #14967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
valentijnscholten wants to merge 1 commit into
base: dev
Choose a base branch
from
+32 −41
Open

test(perf) on dev: re-enable import performance tests with recalibrated query counts #14967

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 32 additions & 41 deletions unittests/test_importers_performance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import logging
from contextlib import contextmanager
from unittest import skip
from unittest.mock import patch

from crum import impersonate
Expand Down Expand Up @@ -275,11 +274,6 @@ def _import_reimport_performance(
self.assertGreater(len_closed_findings4, 0, "Step 4 (empty reimport with close_old_findings=True) should close findings")


@skip("Re-baseline pending: Track B legacy authorization reduces auth-layer query "
"overhead (no per-action role-permission lookups, simpler permission_to_action "
"dispatch). Expected query counts here were calibrated under RBAC and are "
"consistently 1-7 queries higher than legacy actual. Re-baseline with a fresh "
"calibration run after the upstream merge.")
@tag("performance")
@skip_unless_v2
class TestDojoImporterPerformanceSmall(TestDojoImporterPerformanceBase):
Expand Down Expand Up @@ -349,13 +343,13 @@ def test_import_reimport_reimport_performance_pghistory_async(self):
configure_pghistory_triggers()

self._import_reimport_performance(
expected_num_queries1=171,
expected_num_queries1=170,
expected_num_async_tasks1=2,
expected_num_queries2=124,
expected_num_queries2=123,
expected_num_async_tasks2=1,
expected_num_queries3=29,
expected_num_queries3=28,
expected_num_async_tasks3=1,
expected_num_queries4=100,
expected_num_queries4=99,
expected_num_async_tasks4=0,
)

Expand All @@ -373,13 +367,13 @@ def test_import_reimport_reimport_performance_pghistory_no_async(self):
testuser.usercontactinfo.save()

self._import_reimport_performance(
expected_num_queries1=187,
expected_num_queries1=184,
expected_num_async_tasks1=2,
expected_num_queries2=132,
expected_num_queries2=131,
expected_num_async_tasks2=1,
expected_num_queries3=37,
expected_num_queries3=36,
expected_num_async_tasks3=1,
expected_num_queries4=100,
expected_num_queries4=99,
expected_num_async_tasks4=0,
)

Expand All @@ -398,13 +392,13 @@ 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=197,
expected_num_queries1=194,
expected_num_async_tasks1=4,
expected_num_queries2=142,
expected_num_queries2=141,
expected_num_async_tasks2=3,
expected_num_queries3=44,
expected_num_queries3=43,
expected_num_async_tasks3=3,
expected_num_queries4=109,
expected_num_queries4=108,
expected_num_async_tasks4=2,
)

Expand Down Expand Up @@ -530,9 +524,9 @@ def test_deduplication_performance_pghistory_async(self):
self.system_settings(enable_deduplication=True)

self._deduplication_performance(
expected_num_queries1=110,
expected_num_queries1=109,
expected_num_async_tasks1=2,
expected_num_queries2=90,
expected_num_queries2=89,
expected_num_async_tasks2=2,
check_duplicates=False, # Async mode - deduplication happens later
)
Expand All @@ -551,18 +545,15 @@ def test_deduplication_performance_pghistory_no_async(self):
testuser.usercontactinfo.save()

self._deduplication_performance(
expected_num_queries1=126,
expected_num_queries1=123,
expected_num_async_tasks1=2,
expected_num_queries2=107,
expected_num_queries2=104,
expected_num_async_tasks2=2,
)


@tag("performance")
@override_settings(V3_FEATURE_LOCATIONS=True)
@skip("Re-baseline pending: same RBAC→legacy query-count drift as "
"TestDojoImporterPerformanceSmall. See that class's skip note for the "
"rationale.")
class TestDojoImporterPerformanceSmallLocations(TestDojoImporterPerformanceBase):

r"""
Expand Down Expand Up @@ -642,13 +633,13 @@ def test_import_reimport_reimport_performance_pghistory_async(self):
configure_pghistory_triggers()

self._import_reimport_performance(
expected_num_queries1=178,
expected_num_queries1=177,
expected_num_async_tasks1=2,
expected_num_queries2=133,
expected_num_queries2=132,
expected_num_async_tasks2=1,
expected_num_queries3=37,
expected_num_queries3=36,
expected_num_async_tasks3=1,
expected_num_queries4=101,
expected_num_queries4=100,
expected_num_async_tasks4=0,
)

Expand All @@ -666,13 +657,13 @@ def test_import_reimport_reimport_performance_pghistory_no_async(self):
testuser.usercontactinfo.save()

self._import_reimport_performance(
expected_num_queries1=196,
expected_num_queries1=193,
expected_num_async_tasks1=2,
expected_num_queries2=143,
expected_num_queries2=142,
expected_num_async_tasks2=1,
expected_num_queries3=47,
expected_num_queries3=46,
expected_num_async_tasks3=1,
expected_num_queries4=101,
expected_num_queries4=100,
expected_num_async_tasks4=0,
)

Expand All @@ -691,13 +682,13 @@ 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=209,
expected_num_queries1=206,
expected_num_async_tasks1=4,
expected_num_queries2=156,
expected_num_queries2=155,
expected_num_async_tasks2=3,
expected_num_queries3=54,
expected_num_queries3=53,
expected_num_async_tasks3=3,
expected_num_queries4=113,
expected_num_queries4=112,
expected_num_async_tasks4=2,
)

Expand Down Expand Up @@ -798,9 +789,9 @@ def test_deduplication_performance_pghistory_async(self):
self.system_settings(enable_deduplication=True)

self._deduplication_performance(
expected_num_queries1=117,
expected_num_queries1=116,
expected_num_async_tasks1=2,
expected_num_queries2=93,
expected_num_queries2=92,
expected_num_async_tasks2=2,
check_duplicates=False, # Async mode - deduplication happens later
)
Expand All @@ -818,8 +809,8 @@ def test_deduplication_performance_pghistory_no_async(self):
testuser.usercontactinfo.save()

self._deduplication_performance(
expected_num_queries1=135,
expected_num_queries1=132,
expected_num_async_tasks1=2,
expected_num_queries2=218,
expected_num_queries2=215,
expected_num_async_tasks2=2,
)
Loading