|
@@ -114,11 +114,12 @@ class _AssertTemplateUsedContext:
|
|
|
|
|
|
if not self.test():
|
|
|
message = self.message()
|
|
|
- if len(self.rendered_templates) == 0:
|
|
|
- message += ' No template was rendered.'
|
|
|
- else:
|
|
|
+ if self.rendered_templates:
|
|
|
message += ' Following templates were rendered: %s' % (
|
|
|
- ', '.join(self.rendered_template_names))
|
|
|
+ ', '.join(self.rendered_template_names)
|
|
|
+ )
|
|
|
+ else:
|
|
|
+ message += ' No template was rendered.'
|
|
|
self.test_case.fail(message)
|
|
|
|
|
|
|
|
@@ -255,7 +256,7 @@ class SimpleTestCase(unittest.TestCase):
|
|
|
if hasattr(response, 'redirect_chain'):
|
|
|
# The request was a followed redirect
|
|
|
self.assertTrue(
|
|
|
- len(response.redirect_chain) > 0,
|
|
|
+ response.redirect_chain,
|
|
|
msg_prefix + "Response didn't redirect as expected: Response code was %d (expected %d)"
|
|
|
% (response.status_code, status_code)
|
|
|
)
|
|
@@ -488,7 +489,7 @@ class SimpleTestCase(unittest.TestCase):
|
|
|
elif form_index is not None:
|
|
|
non_field_errors = context[formset].forms[form_index].non_field_errors()
|
|
|
self.assertFalse(
|
|
|
- len(non_field_errors) == 0,
|
|
|
+ not non_field_errors,
|
|
|
msg_prefix + "The formset '%s', form %d in context %d "
|
|
|
"does not contain any non-field errors." % (formset, form_index, i)
|
|
|
)
|
|
@@ -501,7 +502,7 @@ class SimpleTestCase(unittest.TestCase):
|
|
|
else:
|
|
|
non_form_errors = context[formset].non_form_errors()
|
|
|
self.assertFalse(
|
|
|
- len(non_form_errors) == 0,
|
|
|
+ not non_form_errors,
|
|
|
msg_prefix + "The formset '%s' in context %d does not "
|
|
|
"contain any non-form errors." % (formset, i)
|
|
|
)
|
|
@@ -602,7 +603,7 @@ class SimpleTestCase(unittest.TestCase):
|
|
|
kwargs: Extra kwargs.
|
|
|
"""
|
|
|
callable_obj = None
|
|
|
- if len(args):
|
|
|
+ if args:
|
|
|
callable_obj = args[0]
|
|
|
args = args[1:]
|
|
|
|