summaryrefslogtreecommitdiff
path: root/django/test/testcases.py
diff options
context:
space:
mode:
authorLoic Bistuer <loic.bistuer@sixmedia.com>2013-03-07 06:33:51 +0700
committerLoic Bistuer <loic.bistuer@sixmedia.com>2013-03-25 03:19:19 +0700
commit521765f63d724f0a1becb614530170f5d00fc6a9 (patch)
tree1e41fa8cd873eb851089729cff7f46f248bd02ad /django/test/testcases.py
parent014638a1311dfc64e6f6eed28f12eeb227926150 (diff)
Fixed #19541 -- Fixed BaseHandler to enable reversing URLs in response middlewares
and streamed responses with respect to per-request urlconf.
Diffstat (limited to 'django/test/testcases.py')
-rw-r--r--django/test/testcases.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/django/test/testcases.py b/django/test/testcases.py
index 66026dd23e..b8e59b0a6a 100644
--- a/django/test/testcases.py
+++ b/django/test/testcases.py
@@ -26,7 +26,7 @@ from django.core.management import call_command
from django.core.management.color import no_style
from django.core.servers.basehttp import (WSGIRequestHandler, WSGIServer,
WSGIServerException)
-from django.core.urlresolvers import clear_url_caches
+from django.core.urlresolvers import clear_url_caches, set_urlconf
from django.db import connection, connections, DEFAULT_DB_ALIAS, transaction
from django.forms.fields import CharField
from django.http import QueryDict
@@ -497,6 +497,7 @@ class TransactionTestCase(SimpleTestCase):
**{'verbosity': 0, 'database': db_name, 'skip_validation': True})
def _urlconf_setup(self):
+ set_urlconf(None)
if hasattr(self, 'urls'):
self._old_root_urlconf = settings.ROOT_URLCONF
settings.ROOT_URLCONF = self.urls
@@ -527,6 +528,7 @@ class TransactionTestCase(SimpleTestCase):
skip_validation=True, reset_sequences=False)
def _urlconf_teardown(self):
+ set_urlconf(None)
if hasattr(self, '_old_root_urlconf'):
settings.ROOT_URLCONF = self._old_root_urlconf
clear_url_caches()