summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2011-03-17 08:10:52 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2011-03-17 08:10:52 +0000
commit1d64c8a539b11998662c351d2ba847e794c2066b (patch)
tree17b4b22235a95f2f470b095640bd1ba9d1f97a56
parent05c929fb3b4ce547d15ddb99520d498a6dcfc6a0 (diff)
downloaddjango-1d64c8a539b11998662c351d2ba847e794c2066b.tar.gz
[1.2.X] 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
Backport of r15865 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15866 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/auth/tests/urls.py2
-rw-r--r--django/contrib/messages/tests/urls.py3
2 files changed, 5 insertions, 0 deletions
diff --git a/django/contrib/auth/tests/urls.py b/django/contrib/auth/tests/urls.py
index 8361080ee1..c34529c7a5 100644
--- a/django/contrib/auth/tests/urls.py
+++ b/django/contrib/auth/tests/urls.py
@@ -2,7 +2,9 @@ from django.conf.urls.defaults import patterns, handler500, handler404
from django.contrib.auth.urls import urlpatterns
from django.http import HttpResponse
from django.template import Template, RequestContext
+from django.views.decorators.cache import never_cache
+@never_cache
def remote_user_auth_view(request):
"Dummy view for remote user tests"
t = Template("Username is {{ user }}.")
diff --git a/django/contrib/messages/tests/urls.py b/django/contrib/messages/tests/urls.py
index 6252adcfb1..4808e2218e 100644
--- a/django/contrib/messages/tests/urls.py
+++ b/django/contrib/messages/tests/urls.py
@@ -4,8 +4,10 @@ from django.core.urlresolvers import reverse
from django.http import HttpResponseRedirect, HttpResponse
from django.shortcuts import render_to_response
from django.template import RequestContext, Template
+from django.views.decorators.cache import never_cache
+@never_cache
def add(request, message_type):
# don't default to False here, because we want to test that it defaults
# to False if unspecified
@@ -20,6 +22,7 @@ def add(request, message_type):
return HttpResponseRedirect(show_url)
+@never_cache
def show(request):
t = Template("""{% if messages %}
<ul class="messages">