paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 06:53:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

test_helpers: Fix logging in cursor_executemany mock.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2023-11-15 13:25:00 -08:00
committed by Tim Abbott
parent cb9a04d3e3
commit a688e753de
2 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/lib/db.py
View File

@@ -38,8 +38,8 @@ class TimeTrackingCursor(cursor):
wrapper_execute(self, super().execute, query, vars) wrapper_execute(self, super().execute, query, vars)
@override @override
def executemany(self, query: Query, vars: Iterable[Params]) -> None: # nocoverage def executemany(self, query: Query, vars_list: Iterable[Params]) -> None: # nocoverage
wrapper_execute(self, super().executemany, query, vars) wrapper_execute(self, super().executemany, query, vars_list)
CursorT = TypeVar("CursorT", bound=cursor) CursorT = TypeVar("CursorT", bound=cursor)

40
zerver/lib/test_helpers.py
View File

@@ -1,4 +1,5 @@
import collections import collections
import itertools
import os import os
import re import re
import sys import sys
@@ -45,7 +46,7 @@ from zerver.actions.user_settings import do_change_user_setting
from zerver.lib import cache from zerver.lib import cache
from zerver.lib.avatar import avatar_url from zerver.lib.avatar import avatar_url
from zerver.lib.cache import get_cache_backend from zerver.lib.cache import get_cache_backend
from zerver.lib.db import Params, ParamsT, Query, TimeTrackingCursor from zerver.lib.db import Params, Query, TimeTrackingCursor
from zerver.lib.integrations import WEBHOOK_INTEGRATIONS from zerver.lib.integrations import WEBHOOK_INTEGRATIONS
from zerver.lib.per_request_cache import flush_per_request_caches from zerver.lib.per_request_cache import flush_per_request_caches
from zerver.lib.rate_limiter import RateLimitedIPAddr, rules from zerver.lib.rate_limiter import RateLimitedIPAddr, rules
@@ -150,35 +151,38 @@ def queries_captured(
queries: List[CapturedQuery] = [] queries: List[CapturedQuery] = []
def wrapper_execute( def cursor_execute(self: TimeTrackingCursor, sql: Query, vars: Optional[Params] = None) -> None:
self: TimeTrackingCursor,
action: Callable[[Query, ParamsT], None],
sql: Query,
params: ParamsT,
) -> None:
start = time.time() start = time.time()
try: try:
return action(sql, params) return super(TimeTrackingCursor, self).execute(sql, vars)
finally: finally:
stop = time.time() stop = time.time()
duration = stop - start duration = stop - start
if include_savepoints or not isinstance(sql, str) or "SAVEPOINT" not in sql: if include_savepoints or not isinstance(sql, str) or "SAVEPOINT" not in sql:
queries.append( queries.append(
CapturedQuery( CapturedQuery(
sql=self.mogrify(sql, params).decode(), sql=self.mogrify(sql, vars).decode(),
time=f"{duration:.3f}", time=f"{duration:.3f}",
) )
) )
def cursor_execute( def cursor_executemany(
self: TimeTrackingCursor, sql: Query, params: Optional[Params] = None self: TimeTrackingCursor, sql: Query, vars_list: Iterable[Params]
) -> None: ) -> None: # nocoverage -- doesn't actually get used in tests
return wrapper_execute(self, super(TimeTrackingCursor, self).execute, sql, params) vars_list, vars_list1 = itertools.tee(vars_list)
start = time.time()
def cursor_executemany(self: TimeTrackingCursor, sql: Query, params: Iterable[Params]) -> None: try:
return wrapper_execute( return super(TimeTrackingCursor, self).executemany(sql, vars_list)
self, super(TimeTrackingCursor, self).executemany, sql, params finally:
) # nocoverage -- doesn't actually get used in tests stop = time.time()
duration = stop - start
queries.extend(
CapturedQuery(
sql=self.mogrify(sql, vars).decode(),
time=f"{duration:.3f}",
)
for vars in vars_list1
)
if not keep_cache_warm: if not keep_cache_warm:
cache = get_cache_backend(None) cache = get_cache_backend(None)