Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.4.x] Fixed oversight in e3b6fed3. Refs #20636.

Browse Source
This commit is contained in:
Aymeric Augustin 2013-06-24 21:00:28 +02:00
parent e3b6fed320
commit e2b86571bf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/test/utils.py
View File

@ -3,8 +3,8 @@ from __future__ import with_statement
import warnings import warnings
from django.conf import settings, UserSettingsHolder from django.conf import settings, UserSettingsHolder
from django.core import mail from django.core import mail
from django import http
from django.test.signals import template_rendered, setting_changed from django.test.signals import template_rendered, setting_changed
from django.http import request
from django.template import Template, loader, TemplateDoesNotExist from django.template import Template, loader, TemplateDoesNotExist
from django.template.loaders import cached from django.template.loaders import cached
from django.utils.translation import deactivate from django.utils.translation import deactivate
@ -79,7 +79,7 @@ def setup_test_environment():
mail._original_email_backend = settings.EMAIL_BACKEND mail._original_email_backend = settings.EMAIL_BACKEND
settings.EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend' settings.EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend'
request._original_allowed_hosts = settings.ALLOWED_HOSTS http._original_allowed_hosts = settings.ALLOWED_HOSTS
settings.ALLOWED_HOSTS = ['*'] settings.ALLOWED_HOSTS = ['*']
mail.outbox = [] mail.outbox = []
@ -100,8 +100,8 @@ def teardown_test_environment():
settings.EMAIL_BACKEND = mail._original_email_backend settings.EMAIL_BACKEND = mail._original_email_backend
del mail._original_email_backend del mail._original_email_backend
settings.ALLOWED_HOSTS = request._original_allowed_hosts settings.ALLOWED_HOSTS = http._original_allowed_hosts
del request._original_allowed_hosts del http._original_allowed_hosts
del mail.outbox del mail.outbox