Skip to content

Commit

Permalink
[1.4.x] Fixed oversight in e3b6fed. Refs #20636.
Browse files Browse the repository at this point in the history
  • Loading branch information
aaugustin committed Jun 24, 2013
1 parent e3b6fed commit e2b8657
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions django/test/utils.py
Expand Up @@ -3,8 +3,8 @@
import warnings
from django.conf import settings, UserSettingsHolder
from django.core import mail
from django import http
from django.test.signals import template_rendered, setting_changed
from django.http import request
from django.template import Template, loader, TemplateDoesNotExist
from django.template.loaders import cached
from django.utils.translation import deactivate
Expand Down Expand Up @@ -79,7 +79,7 @@ def setup_test_environment():
mail._original_email_backend = settings.EMAIL_BACKEND
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 = ['*']

mail.outbox = []
Expand All @@ -100,8 +100,8 @@ def teardown_test_environment():
settings.EMAIL_BACKEND = mail._original_email_backend
del mail._original_email_backend

settings.ALLOWED_HOSTS = request._original_allowed_hosts
del request._original_allowed_hosts
settings.ALLOWED_HOSTS = http._original_allowed_hosts
del http._original_allowed_hosts

del mail.outbox

Expand Down

0 comments on commit e2b8657

Please sign in to comment.