summaryrefslogtreecommitdiff
path: root/django/test
diff options
context:
space:
mode:
authorAdam Johnson <me@adamj.eu>2025-06-03 23:20:43 +0100
committerSarah Boyce <42296566+sarahboyce@users.noreply.github.com>2025-06-05 13:49:39 +0200
commitf0a87895ffaf6532a22143b5e2e304c59b7958ae (patch)
tree960dac172abf8eee251ebad1e730a706e5642a26 /django/test
parent9a3f3b84999878e22021c92f9102707ba2648209 (diff)
Fixed #36435 -- Made CaptureQueriesContext restore reset_queries conditionally.
Diffstat (limited to 'django/test')
-rw-r--r--django/test/utils.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/django/test/utils.py b/django/test/utils.py
index 78bbb0cf65..63067c98a6 100644
--- a/django/test/utils.py
+++ b/django/test/utils.py
@@ -728,12 +728,13 @@ class CaptureQueriesContext:
self.connection.ensure_connection()
self.initial_queries = len(self.connection.queries_log)
self.final_queries = None
- request_started.disconnect(reset_queries)
+ self.reset_queries_disconnected = request_started.disconnect(reset_queries)
return self
def __exit__(self, exc_type, exc_value, traceback):
self.connection.force_debug_cursor = self.force_debug_cursor
- request_started.connect(reset_queries)
+ if self.reset_queries_disconnected:
+ request_started.connect(reset_queries)
if exc_type is not None:
return
self.final_queries = len(self.connection.queries_log)