mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-23 09:36:06 +00:00
Code Issues 25 Releases Wiki Activity

Fixed #29275 -- Made assertFormError() output "(actual errors: none)" instead of "(actual errors: )".

Browse Source
This commit is contained in:
Chris Lamb 2018-03-30 09:42:45 +01:00 committed by Tim Graham
parent 73cb62a331
commit 84ad721bd9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/test/testcases.py
View File

@ -429,7 +429,7 @@ class SimpleTestCase(unittest.TestCase):
msg_prefix + "The form '%s' in context %d does not" msg_prefix + "The form '%s' in context %d does not"
" contain the non-field error '%s'" " contain the non-field error '%s'"
" (actual errors: %s)" % " (actual errors: %s)" %
(form, i, err, non_field_errors) (form, i, err, non_field_errors or 'none')
) )
if not found_form: if not found_form:
self.fail(msg_prefix + "The form '%s' was not used to render the response" % form) self.fail(msg_prefix + "The form '%s' was not used to render the response" % form)

4
tests/test_client_regress/tests.py
View File

@ -631,7 +631,7 @@ class AssertFormErrorTests(SimpleTestCase):
except AssertionError as e: except AssertionError as e:
self.assertIn( self.assertIn(
"The form 'form' in context 0 does not contain the non-field " "The form 'form' in context 0 does not contain the non-field "
"error 'Some error.' (actual errors: )", "error 'Some error.' (actual errors: none)",
str(e) str(e)
) )
try: try:
@ -639,7 +639,7 @@ class AssertFormErrorTests(SimpleTestCase):
except AssertionError as e: except AssertionError as e:
self.assertIn( self.assertIn(
"abc: The form 'form' in context 0 does not contain the " "abc: The form 'form' in context 0 does not contain the "
"non-field error 'Some error.' (actual errors: )", "non-field error 'Some error.' (actual errors: none)",
str(e) str(e)
) )