Ticket #18169: 181692.3.patch

django/template/base.py

@@ -7 +7 @@
 from django.conf import settings
 from django.template.context import (Context, RequestContext,
     ContextPopException)
+from django.core.urlresolvers import NoReverseMatch
 from django.utils.importlib import import_module
 from django.utils.itercompat import is_iterable
 from django.utils.text import (smart_split, unescape_string_literal,
@@ -781 +782 @@
                             # GOTCHA: This will also catch any TypeError
                             # raised in the function itself.
                             current = settings.TEMPLATE_STRING_IF_INVALID  # invalid method call
+        except NoReverseMatch, e:
+            raise e
         except Exception as e:
             if getattr(e, 'silent_variable_failure', False):
                 current = settings.TEMPLATE_STRING_IF_INVALID

tests/regressiontests/templates/response.py

@@ -7 +7 @@
 
 from django.test import RequestFactory, TestCase
 from django.conf import settings
+from django.core.urlresolvers import NoReverseMatch
 from django.template import Template, Context
 from django.template.response import (TemplateResponse, SimpleTemplateResponse,
                                       ContentNotRenderedError)
@@ -206 +207 @@
         response = self._response('{{ foo }}{{ processors }}').render()
         self.assertEqual(response.content, b'yes')
 
+    def test_included_error_template(self):
+        """
+        Test behavior of the raise errors into included blocks.
+        See #18169
+        """
+        load_name = 'included_content.html'
+        tmpl = TemplateResponse(self.factory.get('/'), load_name, {})
+        self.assertRaises(NoReverseMatch, tmpl.render)
+
     def test_render_with_requestcontext(self):
         response = self._response('{{ foo }}{{ processors }}',
                                   {'foo': 'bar'}).render()

new file tests/regressiontests/templates/templates/included_base.html

@@ +1 @@
+{% block content %}
+  {% block error_here %}{% endblock %}
+{% endblock %}

new file tests/regressiontests/templates/templates/included_content.html

@@ +1 @@
+{% extends "included_base.html" %}
+
+{% block content %}
+  content
+  {{ block.super }}
+{% endblock %}
+
+{% block error_here %}
+  error here
+  {% url non_existing_url %}
+{% endblock %}