summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2019-04-26 20:06:18 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2020-11-21 10:49:31 +0100
commitc70cd2a926ffab47f6613e83e0c8828eb6c2c064 (patch)
tree0d1d7c5f7b8e00aad9358fc211881e52723537bc
parenta1215a3237ff53941d606fc54d926495e454c2d9 (diff)
Refs #15053 -- Clarified debug message when skipping templates to avoid recursion.
-rw-r--r--django/template/loaders/base.py2
-rw-r--r--tests/template_tests/test_extends.py7
2 files changed, 7 insertions, 2 deletions
diff --git a/django/template/loaders/base.py b/django/template/loaders/base.py
index 518f8b457b..b77ea9eca2 100644
--- a/django/template/loaders/base.py
+++ b/django/template/loaders/base.py
@@ -17,7 +17,7 @@ class Loader:
for origin in self.get_template_sources(template_name):
if skip is not None and origin in skip:
- tried.append((origin, 'Skipped'))
+ tried.append((origin, 'Skipped to avoid recursion'))
continue
try:
diff --git a/tests/template_tests/test_extends.py b/tests/template_tests/test_extends.py
index 0950340f52..38c7ce230f 100644
--- a/tests/template_tests/test_extends.py
+++ b/tests/template_tests/test_extends.py
@@ -64,8 +64,13 @@ class ExtendsBehaviorTests(SimpleTestCase):
"""
engine = Engine(dirs=[os.path.join(RECURSIVE, 'fs')])
template = engine.get_template('self.html')
- with self.assertRaises(TemplateDoesNotExist):
+ with self.assertRaises(TemplateDoesNotExist) as e:
template.render(Context({}))
+ tried = e.exception.tried
+ self.assertEqual(len(tried), 1)
+ origin, message = tried[0]
+ self.assertEqual(origin.template_name, 'self.html')
+ self.assertEqual(message, 'Skipped to avoid recursion')
def test_extend_cached(self):
engine = Engine(