Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Added the actual assertFormError changes, accidentally omitted from […

…5181].

git-svn-id: http://code.djangoproject.com/svn/django/trunk@5182 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 244a5d0006cc831e35e87d2586bb3b6e9ec5926f 1 parent 7090290
@freakboy3742 freakboy3742 authored
Showing with 13 additions and 10 deletions.
  1. +13 −10 django/test/testcases.py
View
23 django/test/testcases.py
@@ -105,18 +105,21 @@ def assertFormError(self, response, form, field, errors):
for i,context in enumerate(contexts):
if form in context:
found_form = True
- try:
- for err in errors:
- if field:
+ for err in errors:
+ if field:
+ if field in context[form].errors:
self.assertTrue(err in context[form].errors[field],
- "The field '%s' on form '%s' in context %d does not contain the error '%s' (actual errors: %s)" %
- (field, form, i, err, list(context[form].errors[field])))
+ "The field '%s' on form '%s' in context %d does not contain the error '%s' (actual errors: %s)" %
+ (field, form, i, err, list(context[form].errors[field])))
+ elif field in context[form].fields:
+ self.fail("The field '%s' on form '%s' in context %d contains no errors" %
+ (field, form, i))
else:
- self.assertTrue(err in context[form].non_field_errors(),
- "The form '%s' in context %d does not contain the non-field error '%s' (actual errors: %s)" %
- (form, i, err, list(context[form].non_field_errors())))
- except KeyError:
- self.fail("The form '%s' in context %d does not contain the field '%s'" % (form, i, field))
+ self.fail("The form '%s' in context %d does not contain the field '%s'" % (form, i, field))
+ else:
+ self.assertTrue(err in context[form].non_field_errors(),
+ "The form '%s' in context %d does not contain the non-field error '%s' (actual errors: %s)" %
+ (form, i, err, list(context[form].non_field_errors())))
if not found_form:
self.fail("The form '%s' was not used to render the response" % form)
Please sign in to comment.
Something went wrong with that request. Please try again.