Implemented persistent database connections.

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

3 files changed, 23 insertions, 8 deletions

diff --git a/tests/handlers/tests.py b/tests/handlers/tests.py
index f647bf199b..6eb9bd23fe 100644
--- a/tests/handlers/tests.py
+++ b/tests/handlers/tests.py
@@ -1,5 +1,6 @@
 from django.core.handlers.wsgi import WSGIHandler
-from django.core import signals
+from django.core.signals import request_started, request_finished
+from django.db import close_old_connections
 from django.test import RequestFactory, TestCase
 from django.test.utils import override_settings
 from django.utils import six
@@ -7,6 +8,12 @@ from django.utils import six
 
 class HandlerTests(TestCase):
 
+    def setUp(self):
+        request_started.disconnect(close_old_connections)
+
+    def tearDown(self):
+        request_started.connect(close_old_connections)
+
     # Mangle settings so the handler will fail
     @override_settings(MIDDLEWARE_CLASSES=42)
     def test_lock_safety(self):
@@ -35,12 +42,12 @@ class SignalsTests(TestCase):
 
     def setUp(self):
         self.signals = []
-        signals.request_started.connect(self.register_started)
-        signals.request_finished.connect(self.register_finished)
+        request_started.connect(self.register_started)
+        request_finished.connect(self.register_finished)
 
     def tearDown(self):
-        signals.request_started.disconnect(self.register_started)
-        signals.request_finished.disconnect(self.register_finished)
+        request_started.disconnect(self.register_started)
+        request_finished.disconnect(self.register_finished)
 
     def register_started(self, **kwargs):
         self.signals.append('started')
diff --git a/tests/httpwrappers/tests.py b/tests/httpwrappers/tests.py
index 2964a86034..194232e92f 100644
--- a/tests/httpwrappers/tests.py
+++ b/tests/httpwrappers/tests.py
@@ -8,7 +8,7 @@ import warnings
 
 from django.core.exceptions import SuspiciousOperation
 from django.core.signals import request_finished
-from django.db import close_connection
+from django.db import close_old_connections
 from django.http import (QueryDict, HttpResponse, HttpResponseRedirect,
                          HttpResponsePermanentRedirect, HttpResponseNotAllowed,
                          HttpResponseNotModified, StreamingHttpResponse,
@@ -490,10 +490,10 @@ class FileCloseTests(TestCase):
     def setUp(self):
         # Disable the request_finished signal during this test
         # to avoid interfering with the database connection.
-        request_finished.disconnect(close_connection)
+        request_finished.disconnect(close_old_connections)
 
     def tearDown(self):
-        request_finished.connect(close_connection)
+        request_finished.connect(close_old_connections)
 
     def test_response(self):
         filename = os.path.join(os.path.dirname(upath(__file__)), 'abc.txt')
diff --git a/tests/wsgi/tests.py b/tests/wsgi/tests.py
index 9b7ee68afd..a66258d4eb 100644
--- a/tests/wsgi/tests.py
+++ b/tests/wsgi/tests.py
@@ -2,7 +2,9 @@ from __future__ import unicode_literals
 
 from django.core.exceptions import ImproperlyConfigured
 from django.core.servers.basehttp import get_internal_wsgi_application
+from django.core.signals import request_started
 from django.core.wsgi import get_wsgi_application
+from django.db import close_old_connections
 from django.test import TestCase
 from django.test.client import RequestFactory
 from django.test.utils import override_settings
@@ -12,6 +14,12 @@ from django.utils import six, unittest
 class WSGITest(TestCase):
     urls = "wsgi.urls"
 
+    def setUp(self):
+        request_started.disconnect(close_old_connections)
+
+    def tearDown(self):
+        request_started.connect(close_old_connections)
+
     def test_get_wsgi_application(self):
         """
         Verify that ``get_wsgi_application`` returns a functioning WSGI