summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2021-04-27 08:40:52 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2021-04-27 08:41:11 +0200
commit727a154094a2d565e3d4e9e11cd80dda46cc227d (patch)
treebd67cf1bddb542fbf19b5f5533c5ecda9b99e066
parent0dfe88eaba551ab3ecec9a573d59e8d2fa3a8f94 (diff)
downloaddjango-727a154094a2d565e3d4e9e11cd80dda46cc227d.tar.gz
[3.2.x] Refs 32637 -- Made technical 404 debug page display exception message when URL is resolved.
Follow up to 3b8527e32b665df91622649550813bb1ec9a9251. Backport of d68be0494be8b82365f2a5410c9335e539d8efd6 from main
-rw-r--r--django/views/templates/technical_404.html2
-rw-r--r--tests/view_tests/tests/test_debug.py10
2 files changed, 11 insertions, 1 deletions
diff --git a/django/views/templates/technical_404.html b/django/views/templates/technical_404.html
index aeba2daf9c..c47dae22af 100644
--- a/django/views/templates/technical_404.html
+++ b/django/views/templates/technical_404.html
@@ -26,7 +26,7 @@
<body>
<div id="summary">
<h1>Page not found <span>(404)</span></h1>
- {% if reason %}<pre class="exception_value">{{ reason }}</pre>{% endif %}
+ {% if reason and resolved %}<pre class="exception_value">{{ reason }}</pre>{% endif %}
<table class="meta">
<tr>
<th>Request Method:</th>
diff --git a/tests/view_tests/tests/test_debug.py b/tests/view_tests/tests/test_debug.py
index 28734434f3..9c85ed20fc 100644
--- a/tests/view_tests/tests/test_debug.py
+++ b/tests/view_tests/tests/test_debug.py
@@ -122,6 +122,11 @@ class DebugViewTests(SimpleTestCase):
def test_404(self):
response = self.client.get('/raises404/')
+ self.assertNotContains(
+ response,
+ '<pre class="exception_value">',
+ status_code=404,
+ )
self.assertContains(
response,
'<p>The current path, <code>not-in-urls</code>, didn’t match any '
@@ -133,6 +138,11 @@ class DebugViewTests(SimpleTestCase):
def test_404_not_in_urls(self):
response = self.client.get('/not-in-urls')
self.assertNotContains(response, "Raised by:", status_code=404)
+ self.assertNotContains(
+ response,
+ '<pre class="exception_value">',
+ status_code=404,
+ )
self.assertContains(response, "Django tried these URL patterns", status_code=404)
self.assertContains(
response,