Implemented persistent database connections.

Thanks Anssi Kääriäinen and Karen Tracey for their inputs.

1 files changed, 7 insertions, 5 deletions

diff --git a/django/test/client.py b/django/test/client.py
index 2506437023..46f55d7cdc 100644
--- a/django/test/client.py
+++ b/django/test/client.py
@@ -18,7 +18,7 @@ from django.core.handlers.base import BaseHandler
 from django.core.handlers.wsgi import WSGIRequest
 from django.core.signals import (request_started, request_finished,
     got_request_exception)
-from django.db import close_connection
+from django.db import close_old_connections
 from django.http import SimpleCookie, HttpRequest, QueryDict
 from django.template import TemplateDoesNotExist
 from django.test import signals
@@ -78,9 +78,9 @@ def closing_iterator_wrapper(iterable, close):
         for item in iterable:
             yield item
     finally:
-        request_finished.disconnect(close_connection)
+        request_finished.disconnect(close_old_connections)
         close()                                 # will fire request_finished
-        request_finished.connect(close_connection)
+        request_finished.connect(close_old_connections)
 
 
 class ClientHandler(BaseHandler):
@@ -101,7 +101,9 @@ class ClientHandler(BaseHandler):
         if self._request_middleware is None:
             self.load_middleware()
 
+        request_started.disconnect(close_old_connections)
         request_started.send(sender=self.__class__)
+        request_started.connect(close_old_connections)
         request = WSGIRequest(environ)
         # sneaky little hack so that we can easily get round
         # CsrfViewMiddleware.  This makes life easier, and is probably
@@ -115,9 +117,9 @@ class ClientHandler(BaseHandler):
             response.streaming_content = closing_iterator_wrapper(
                 response.streaming_content, response.close)
         else:
-            request_finished.disconnect(close_connection)
+            request_finished.disconnect(close_old_connections)
             response.close()                    # will fire request_finished
-            request_finished.connect(close_connection)
+            request_finished.connect(close_old_connections)
 
         return response