Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.0.X]: Removed an inadvertent raise statement added in [8777] and a…

…dded the printing of tracebacks for template tests that raise an unhandled exception.

Backport of r10183 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit ae5f451741ece341d1606e6e620b05020c739bb2 1 parent 5e0a45d
@gdub gdub authored
Showing with 7 additions and 5 deletions.
  1. +7 −5 tests/regressiontests/templates/tests.py
View
12 tests/regressiontests/templates/tests.py
@@ -7,6 +7,7 @@
settings.configure()
import os
+import traceback
import unittest
from datetime import datetime, timedelta
@@ -203,10 +204,11 @@ def test_template_loader(template_name, template_dirs=None):
try:
test_template = loader.get_template(name)
output = self.render(test_template, vals)
- except Exception, e:
- if e.__class__ != result:
- raise
- failures.append("Template test (TEMPLATE_STRING_IF_INVALID='%s'): %s -- FAILED. Got %s, exception: %s" % (invalid_str, name, e.__class__, e))
+ except Exception:
+ exc_type, exc_value, exc_tb = sys.exc_info()
+ if exc_type != result:
+ tb = '\n'.join(traceback.format_exception(exc_type, exc_value, exc_tb))
+ failures.append("Template test (TEMPLATE_STRING_IF_INVALID='%s'): %s -- FAILED. Got %s, exception: %s\n%s" % (invalid_str, name, exc_type, exc_value, tb))
continue
if output != result:
failures.append("Template test (TEMPLATE_STRING_IF_INVALID='%s'): %s -- FAILED. Expected %r, got %r" % (invalid_str, name, result, output))
@@ -223,7 +225,7 @@ def test_template_loader(template_name, template_dirs=None):
settings.TEMPLATE_DEBUG = old_td
settings.TEMPLATE_STRING_IF_INVALID = old_invalid
- self.assertEqual(failures, [], '\n'.join(failures))
+ self.assertEqual(failures, [], ('-'*70 + '\n').join(failures))
def render(self, test_template, vals):
return test_template.render(template.Context(vals[1]))
Please sign in to comment.
Something went wrong with that request. Please try again.