mirror of
https://github.com/django/django.git
synced 2025-06-12 15:09:12 +00:00
Fixed #36435 -- Made CaptureQueriesContext restore reset_queries conditionally.
This commit is contained in:
parent
9a3f3b8499
commit
f0a87895ff
@ -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)
|
||||
|
@ -435,6 +435,14 @@ class CaptureQueriesContextManagerTests(TestCase):
|
||||
self.assertIn(self.person_pk, captured_queries[0]["sql"])
|
||||
self.assertIn(self.person_pk, captured_queries[1]["sql"])
|
||||
|
||||
def test_with_client_nested(self):
|
||||
with CaptureQueriesContext(connection) as captured_queries:
|
||||
Person.objects.count()
|
||||
with CaptureQueriesContext(connection):
|
||||
pass
|
||||
self.client.get(self.url)
|
||||
self.assertEqual(2, len(captured_queries))
|
||||
|
||||
|
||||
@override_settings(ROOT_URLCONF="test_utils.urls")
|
||||
class AssertNumQueriesContextManagerTests(TestCase):
|
||||
@ -475,6 +483,13 @@ class AssertNumQueriesContextManagerTests(TestCase):
|
||||
self.client.get(self.url)
|
||||
self.client.get(self.url)
|
||||
|
||||
def test_with_client_nested(self):
|
||||
with self.assertNumQueries(2):
|
||||
Person.objects.count()
|
||||
with self.assertNumQueries(0):
|
||||
pass
|
||||
self.client.get(self.url)
|
||||
|
||||
|
||||
@override_settings(ROOT_URLCONF="test_utils.urls")
|
||||
class AssertTemplateUsedContextManagerTests(SimpleTestCase):
|
||||
|
Loading…
x
Reference in New Issue
Block a user