summaryrefslogtreecommitdiff
path: root/django/test/utils.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2014-06-07 14:09:27 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2014-06-07 14:37:43 +0200
commitcfcca7ccce3dc527d16757ff6dc978e50c4a2e61 (patch)
tree81b5ac70392c045d4ed7f9fa3adf7cd5d875cb96 /django/test/utils.py
parente2112edd9ac6a5f1877a62dd1c88d2d1726350de (diff)
Fixed #3711, #6734, #12581 -- Bounded connection.queries.
Prevented unlimited memory consumption when running background tasks with DEBUG=True. Thanks Rob, Alex, Baptiste, and others.
Diffstat (limited to 'django/test/utils.py')
-rw-r--r--django/test/utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/test/utils.py b/django/test/utils.py
index fdbf920868..9a0d7a494c 100644
--- a/django/test/utils.py
+++ b/django/test/utils.py
@@ -509,7 +509,7 @@ class CaptureQueriesContext(object):
def __enter__(self):
self.use_debug_cursor = self.connection.use_debug_cursor
self.connection.use_debug_cursor = True
- self.initial_queries = len(self.connection.queries)
+ self.initial_queries = len(self.connection.queries_log)
self.final_queries = None
request_started.disconnect(reset_queries)
return self
@@ -519,7 +519,7 @@ class CaptureQueriesContext(object):
request_started.connect(reset_queries)
if exc_type is not None:
return
- self.final_queries = len(self.connection.queries)
+ self.final_queries = len(self.connection.queries_log)
class IgnoreDeprecationWarningsMixin(object):