Changeset 7583

Timestamp:

06/07/08 01:25:59 (4 months ago)

Author:

russellm

Message:

Fixed #5836 -- Corrected the logic in the Test Client when an exception raised by a view is caught and re-raised. Thanks for the report, test case, and fix, Chris Wagner.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/test/client.py (modified) (1 diff)
• django/trunk/tests/modeltests/test_client/fixtures/testdata.json (modified) (1 diff)
• django/trunk/tests/regressiontests/test_client_regress/fixtures/testdata.json (modified) (1 diff)
• django/trunk/tests/regressiontests/test_client_regress/models.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/test_client_regress/urls.py (modified) (1 diff)
• django/trunk/tests/regressiontests/test_client_regress/views.py (modified) (2 diffs)

django/trunk/AUTHORS

@@ -368 +368 @@
-    Vlado <vlado@labath.org>
-    Milton Waddams
+    Chris Wagner <cw264701@ohio.edu>
-    wam-djangobug@wamber.net
-    Wang Chun <wangchun@exoweb.net>

django/trunk/django/test/client.py

@@ -180 +180 @@
-                raise
-
-
+
+
+
+
-        if self.exc_info:
-
-
+
+
+
+
-        # Save the client and request that stimulated the response
-        response.client = self

django/trunk/tests/modeltests/test_client/fixtures/testdata.json

@@ -35 +35 @@
-            "date_joined": "2006-12-17 07:03:31"
-        }
+    },
+    {
+        "pk": "3", 
+        "model": "auth.user", 
+        "fields": {
+            "username": "staff", 
+            "first_name": "Staff", 
+            "last_name": "Member", 
+            "is_active": true, 
+            "is_superuser": false, 
+            "is_staff": true, 
+            "last_login": "2006-12-17 07:03:31", 
+            "groups": [], 
+            "user_permissions": [], 
+            "password": "sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161", 
+            "email": "testclient@example.com", 
+            "date_joined": "2006-12-17 07:03:31"
+        }
-    }
-]

django/trunk/tests/regressiontests/test_client_regress/fixtures/testdata.json

@@ -17 +17 @@
-            "date_joined": "2006-12-17 07:03:31"
-        }
+    },
+    {
+        "pk": "2", 
+        "model": "auth.user", 
+        "fields": {
+            "username": "inactive", 
+            "first_name": "Inactive", 
+            "last_name": "User", 
+            "is_active": false, 
+            "is_superuser": false, 
+            "is_staff": false, 
+            "last_login": "2006-12-17 07:03:31", 
+            "groups": [], 
+            "user_permissions": [], 
+            "password": "sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161", 
+            "email": "testclient@example.com", 
+            "date_joined": "2006-12-17 07:03:31"
+        }
+    },
+    {
+        "pk": "3", 
+        "model": "auth.user", 
+        "fields": {
+            "username": "staff", 
+            "first_name": "Staff", 
+            "last_name": "Member", 
+            "is_active": true, 
+            "is_superuser": false, 
+            "is_staff": true, 
+            "last_login": "2006-12-17 07:03:31", 
+            "groups": [], 
+            "user_permissions": [], 
+            "password": "sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161", 
+            "email": "testclient@example.com", 
+            "date_joined": "2006-12-17 07:03:31"
+        }
-    }
-]

django/trunk/tests/regressiontests/test_client_regress/models.py

@@ -5 +5 @@
-from django.test import Client, TestCase
-from django.core.urlresolvers import reverse
+from django.core.exceptions import SuspiciousOperation
-import os
-
@@ -295 +296 @@
-        self.assertEqual(response.content, 'Hi, Arthur')
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

django/trunk/tests/regressiontests/test_client_regress/urls.py

@@ -5 +5 @@
-    (r'^no_template_view/$', views.no_template_view),
-    (r'^file_upload/$', views.file_upload_view),
+    (r'^staff_only/$', views.staff_only_view),
-    (r'^get_view/$', views.get_view),
-    url(r'^arg_view/(?P<name>.+)/$', views.view_with_argument, name='arg_view'),

django/trunk/tests/regressiontests/test_client_regress/views.py

@@ -3 +3 @@
-from django.contrib.auth.decorators import login_required
-from django.http import HttpResponse, HttpResponseRedirect, HttpResponseServerError
+from django.core.exceptions import SuspiciousOperation
-
-def no_template_view(request):
@@ -24 +25 @@
-        return HttpResponseServerError()
-
+def staff_only_view(request):
+    "A view that can only be visited by staff. Non staff members get an exception"
+    if request.user.is_staff:
+        return HttpResponse('')
+    else:
+        raise SuspiciousOperation()
+    
-def get_view(request):
-    "A simple login protected view"