Author: kmtracey
Date: 2010-03-08 09:23:52 -0600 (Mon, 08 Mar 2010)
New Revision: 12724
Removed:
django/branches/releases/1.1.X/tests/regressiontests/debug/
Modified:
django/branches/releases/1.1.X/
django/branches/releases/1.1.X/tests/regressiontests/views/__init__.py
django/branches/releases/1.1.X/tests/regressiontests/views/tests/debug.py
django/branches/releases/1.1.X/tests/regressiontests/views/urls.py
django/branches/releases/1.1.X/tests/regressiontests/views/views.py
Log:
[1.1.X] Move the tests added for #12302 to where some other tests for debug
page responses already existed.
r12723 from trunk.
Property changes on: django/branches/releases/1.1.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-11500,11523,11527-11528,11531-11552,11554,11577,11579-11581,11588-11589,11591-11592,11596-11599,11601-11617,11619-11626,11628-11635,11637-11638,11643-11644,11648-11653,11656,11670,11678,11681,11684,11686,11688,11691,11693,11695,11697,11699,11701,11703,11705,11707,11714,11719,11732,11734,11740,11748,11751,11753,11756,11760,11800,11802,11808,11815,11817,11820,11822,11824,11826,11828,11831,11833,11835,11837,11839,11841,11844,11857,11864,11874,11876,11878,11885,11898,11901,11905,11909,11912,11914,11917,11938,11953,11961,11977,11979,11984,11986,11988,11990,11992,11994,11996,11998,12001,12004,12006,12011,12022,12024,12044-12045,12048,12054-12056,12059,12064,12066,12068,12070,12079,12086,12088,12104,12118,12132,12137-12138,12140-12141,12144,12150-12152,12220-12221,12229,12249,12253,12276,12282,12284,12293,12313,12317-12324,12333,12341,12343,12346,12353,12362,12379,12384,12398,12405,12408-12411,12419-12420,12423,12425-12426,12429,12434,12436,12439-12442,12447-12448,12457,12461-12464,12467,12471,12473,12475,12484,12489-12490,12492,12497-12498,12502,12505,12513,12515-12516,12518,12523,12526,12528,12533,12535,12537,12539,12541,12548,12553,12556,12558-12560,12562,12567,12569-12570,12573,12576,12579,12581,12584,12598-12599,12602,12605,12614,12616,12621-12622,12627,12630-12631,12635,12637,12639,12641,12644,12646,12648,12650,12652,12654,12657,12659,12661,12663,12665,12667,12669,12671,12673,12676,12679,12681,12683,12686,12688,12694,12696,12698,12700,12704-12705,12719,12721
+
/django/trunk:1-11500,11523,11527-11528,11531-11552,11554,11577,11579-11581,11588-11589,11591-11592,11596-11599,11601-11617,11619-11626,11628-11635,11637-11638,11643-11644,11648-11653,11656,11670,11678,11681,11684,11686,11688,11691,11693,11695,11697,11699,11701,11703,11705,11707,11714,11719,11732,11734,11740,11748,11751,11753,11756,11760,11800,11802,11808,11815,11817,11820,11822,11824,11826,11828,11831,11833,11835,11837,11839,11841,11844,11857,11864,11874,11876,11878,11885,11898,11901,11905,11909,11912,11914,11917,11938,11953,11961,11977,11979,11984,11986,11988,11990,11992,11994,11996,11998,12001,12004,12006,12011,12022,12024,12044-12045,12048,12054-12056,12059,12064,12066,12068,12070,12079,12086,12088,12104,12118,12132,12137-12138,12140-12141,12144,12150-12152,12220-12221,12229,12249,12253,12276,12282,12284,12293,12313,12317-12324,12333,12341,12343,12346,12353,12362,12379,12384,12398,12405,12408-12411,12419-12420,12423,12425-12426,12429,12434,12436,12439-12442,12447-12448,12457,12461-12464,12467,12471,12473,12475,12484,12489-12490,12492,12497-12498,12502,12505,12513,12515-12516,12518,12523,12526,12528,12533,12535,12537,12539,12541,12548,12553,12556,12558-12560,12562,12567,12569-12570,12573,12576,12579,12581,12584,12598-12599,12602,12605,12614,12616,12621-12622,12627,12630-12631,12635,12637,12639,12641,12644,12646,12648,12650,12652,12654,12657,12659,12661,12663,12665,12667,12669,12671,12673,12676,12679,12681,12683,12686,12688,12694,12696,12698,12700,12704-12705,12719,12721,12723
Modified: django/branches/releases/1.1.X/tests/regressiontests/views/__init__.py
===================================================================
--- django/branches/releases/1.1.X/tests/regressiontests/views/__init__.py
2010-03-08 15:20:29 UTC (rev 12723)
+++ django/branches/releases/1.1.X/tests/regressiontests/views/__init__.py
2010-03-08 15:23:52 UTC (rev 12724)
@@ -0,0 +1,10 @@
+# -*- coding: utf8 -*-
+
+class BrokenException(Exception):
+ pass
+
+except_args = ('Broken!', # plain exception with ASCII text
+ u'¡Broken!', # non-ASCII unicode data
+ '¡Broken!', # non-ASCII, utf-8 encoded bytestring
+ '\xa1Broken!', ) # non-ASCII, latin1 bytestring
+
Modified:
django/branches/releases/1.1.X/tests/regressiontests/views/tests/debug.py
===================================================================
--- django/branches/releases/1.1.X/tests/regressiontests/views/tests/debug.py
2010-03-08 15:20:29 UTC (rev 12723)
+++ django/branches/releases/1.1.X/tests/regressiontests/views/tests/debug.py
2010-03-08 15:23:52 UTC (rev 12724)
@@ -1,13 +1,17 @@
from django.conf import settings
from django.core.files.uploadedfile import SimpleUploadedFile
from django.test import TestCase
+from django.core.urlresolvers import reverse
+from regressiontests.views import BrokenException, except_args
+
class DebugViewTests(TestCase):
def setUp(self):
+ self.old_debug = settings.DEBUG
settings.DEBUG = True
def tearDown(self):
- settings.DEBUG = False
+ settings.DEBUG = self.old_debug
def test_files(self):
response = self.client.get('/views/raises/')
@@ -23,3 +27,9 @@
def test_404(self):
response = self.client.get('/views/raises404/')
self.assertEquals(response.status_code, 404)
+
+ def test_view_exceptions(self):
+ for n in range(len(except_args)):
+ self.assertRaises(BrokenException, self.client.get,
+ reverse('view_exception', args=(n,)))
+
Modified: django/branches/releases/1.1.X/tests/regressiontests/views/urls.py
===================================================================
--- django/branches/releases/1.1.X/tests/regressiontests/views/urls.py
2010-03-08 15:20:29 UTC (rev 12723)
+++ django/branches/releases/1.1.X/tests/regressiontests/views/urls.py
2010-03-08 15:23:52 UTC (rev 12724)
@@ -107,3 +107,6 @@
{'url': u'/views/中文/target/', 'permanent': True}),
)
+urlpatterns += patterns('regressiontests.views.views',
+ url(r'view_exception/(?P<n>\d+)/$', 'view_exception',
name='view_exception'),
+)
Modified: django/branches/releases/1.1.X/tests/regressiontests/views/views.py
===================================================================
--- django/branches/releases/1.1.X/tests/regressiontests/views/views.py
2010-03-08 15:20:29 UTC (rev 12723)
+++ django/branches/releases/1.1.X/tests/regressiontests/views/views.py
2010-03-08 15:23:52 UTC (rev 12724)
@@ -6,6 +6,8 @@
from django.views.generic.create_update import create_object
from django.core.urlresolvers import get_resolver
+from regressiontests.views import BrokenException, except_args
+
from models import Article
@@ -40,10 +42,13 @@
def raises404(request):
resolver = get_resolver(None)
resolver.resolve('')
-
+
def redirect(request):
"""
Forces an HTTP redirect.
"""
return HttpResponseRedirect("target/")
+def view_exception(request, n):
+ raise BrokenException(except_args[int(n)])
+
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
