Fixed #15142 -- Force test views to be non-cached so that projects with caching middleware enabled don't cause test failures. Thanks to jsdalton for the report and patch

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15865 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2011-03-17 08:07:40 +00:00
parent 1af33427cb
commit b49ee91eb3
2 changed files with 7 additions and 0 deletions

View File

@ -4,7 +4,9 @@ from django.contrib.auth.views import password_reset
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.http import HttpResponse from django.http import HttpResponse
from django.template import Template, RequestContext from django.template import Template, RequestContext
from django.views.decorators.cache import never_cache
@never_cache
def remote_user_auth_view(request): def remote_user_auth_view(request):
"Dummy view for remote user tests" "Dummy view for remote user tests"
t = Template("Username is {{ user }}.") t = Template("Username is {{ user }}.")

View File

@ -5,6 +5,7 @@ from django.http import HttpResponseRedirect, HttpResponse
from django.shortcuts import render_to_response, redirect from django.shortcuts import render_to_response, redirect
from django.template import RequestContext, Template from django.template import RequestContext, Template
from django.template.response import TemplateResponse from django.template.response import TemplateResponse
from django.views.decorators.cache import never_cache
TEMPLATE = """{% if messages %} TEMPLATE = """{% if messages %}
<ul class="messages"> <ul class="messages">
@ -17,6 +18,7 @@ TEMPLATE = """{% if messages %}
{% endif %} {% endif %}
""" """
@never_cache
def add(request, message_type): def add(request, message_type):
# don't default to False here, because we want to test that it defaults # don't default to False here, because we want to test that it defaults
# to False if unspecified # to False if unspecified
@ -31,6 +33,7 @@ def add(request, message_type):
show_url = reverse('django.contrib.messages.tests.urls.show') show_url = reverse('django.contrib.messages.tests.urls.show')
return HttpResponseRedirect(show_url) return HttpResponseRedirect(show_url)
@never_cache
def add_template_response(request, message_type): def add_template_response(request, message_type):
for msg in request.POST.getlist('messages'): for msg in request.POST.getlist('messages'):
getattr(messages, message_type)(request, msg) getattr(messages, message_type)(request, msg)
@ -38,10 +41,12 @@ def add_template_response(request, message_type):
show_url = reverse('django.contrib.messages.tests.urls.show_template_response') show_url = reverse('django.contrib.messages.tests.urls.show_template_response')
return HttpResponseRedirect(show_url) return HttpResponseRedirect(show_url)
@never_cache
def show(request): def show(request):
t = Template(TEMPLATE) t = Template(TEMPLATE)
return HttpResponse(t.render(RequestContext(request))) return HttpResponse(t.render(RequestContext(request)))
@never_cache
def show_template_response(request): def show_template_response(request):
return TemplateResponse(request, Template(TEMPLATE)) return TemplateResponse(request, Template(TEMPLATE))