test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #12659 -- Return a more meaningful KeyError message when ContextList lookups fail. Thanks to rodriguealcazar for the suggestion. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12274 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-01-22 15:31:14 +00:00
parent 7ca9d9306c
commit f114fbecc2
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/test/utils.py
View File

@ -15,7 +15,7 @@ class ContextList(list):
for subcontext in self: for subcontext in self:
if key in subcontext: if key in subcontext:
return subcontext[key] return subcontext[key]
raise KeyError raise KeyError(key)
else: else:
return super(ContextList, self).__getitem__(key) return super(ContextList, self).__getitem__(key)

13
tests/regressiontests/test_client_regress/models.py
View File

@ -602,6 +602,12 @@ class ContextTests(TestCase):
self.assertEqual(response.context['request-foo'], 'whiz') self.assertEqual(response.context['request-foo'], 'whiz')
self.assertEqual(response.context['data'], 'sausage') self.assertEqual(response.context['data'], 'sausage')
try:
response.context['does-not-exist']
self.fail('Should not be able to retrieve non-existent key')
except KeyError, e:
self.assertEquals(e.message, 'does-not-exist')
def test_inherited_context(self): def test_inherited_context(self):
"Context variables can be retrieved from a list of contexts" "Context variables can be retrieved from a list of contexts"
response = self.client.get("/test_client_regress/request_data_extended/", data={'foo':'whiz'}) response = self.client.get("/test_client_regress/request_data_extended/", data={'foo':'whiz'})
@ -611,6 +617,13 @@ class ContextTests(TestCase):
self.assertEqual(response.context['request-foo'], 'whiz') self.assertEqual(response.context['request-foo'], 'whiz')
self.assertEqual(response.context['data'], 'bacon') self.assertEqual(response.context['data'], 'bacon')
try:
response.context['does-not-exist']
self.fail('Should not be able to retrieve non-existent key')
except KeyError, e:
self.assertEquals(e.message, 'does-not-exist')
class SessionTests(TestCase): class SessionTests(TestCase):
fixtures = ['testdata.json'] fixtures = ['testdata.json']