summaryrefslogtreecommitdiff
path: root/django/test/utils.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-01-01 10:12:06 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-01-01 10:14:11 +0100
commitbacb097ac31af2479c43934747b34fad7c91f55c (patch)
tree66291c68ec08cf05d02b542e644fce8ee900197c /django/test/utils.py
parent3570ff734e93f493e023b912c9a97101f605f7f5 (diff)
downloaddjango-bacb097ac31af2479c43934747b34fad7c91f55c.tar.gz
Fixed #19519 again -- Regression in LiveServerTestCase after fd1279a4.
Diffstat (limited to 'django/test/utils.py')
-rw-r--r--django/test/utils.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/django/test/utils.py b/django/test/utils.py
index a1ff826d6e..8114ae0e6a 100644
--- a/django/test/utils.py
+++ b/django/test/utils.py
@@ -4,8 +4,6 @@ from xml.dom.minidom import parseString, Node
from django.conf import settings, UserSettingsHolder
from django.core import mail
-from django.core.signals import request_finished
-from django.db import close_connection
from django.test.signals import template_rendered, setting_changed
from django.template import Template, loader, TemplateDoesNotExist
from django.template.loaders import cached
@@ -70,10 +68,8 @@ def setup_test_environment():
"""Perform any global pre-test setup. This involves:
- Installing the instrumented test renderer
- - Setting the email backend to the locmem email backend.
+ - Set the email backend to the locmem email backend.
- Setting the active locale to match the LANGUAGE_CODE setting.
- - Disconnecting the request_finished signal to avoid closing
- the database connection within tests.
"""
Template.original_render = Template._render
Template._render = instrumented_test_render
@@ -85,8 +81,6 @@ def setup_test_environment():
deactivate()
- request_finished.disconnect(close_connection)
-
def teardown_test_environment():
"""Perform any global post-test teardown. This involves: