From 7733895382b497771ee48754c19d2f012e475e07 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri, 26 Mar 2010 15:15:55 +0000
Subject: [1.1.X] Fixed #12594 -- Ensured that a meaningful exception is raised
 when the urlconf_module is None. Thanks to buriy for the report and patch.

Backport of r12854 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12855 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 tests/regressiontests/urlpatterns_reverse/middleware.py |  4 ++++
 tests/regressiontests/urlpatterns_reverse/tests.py      | 14 ++++++++++++++
 2 files changed, 18 insertions(+)

(limited to 'tests')

diff --git a/tests/regressiontests/urlpatterns_reverse/middleware.py b/tests/regressiontests/urlpatterns_reverse/middleware.py
index 7bb9aa924f..cd3c045159 100644
--- a/tests/regressiontests/urlpatterns_reverse/middleware.py
+++ b/tests/regressiontests/urlpatterns_reverse/middleware.py
@@ -5,3 +5,7 @@ import urlconf_inner
 class ChangeURLconfMiddleware(object):
     def process_request(self, request):
         request.urlconf = urlconf_inner.__name__
+
+class NullChangeURLconfMiddleware(object):
+    def process_request(self, request):
+        request.urlconf = None
diff --git a/tests/regressiontests/urlpatterns_reverse/tests.py b/tests/regressiontests/urlpatterns_reverse/tests.py
index 34c9db25d3..fa05b6be40 100644
--- a/tests/regressiontests/urlpatterns_reverse/tests.py
+++ b/tests/regressiontests/urlpatterns_reverse/tests.py
@@ -17,6 +17,7 @@ ImproperlyConfigured: The included urlconf regressiontests.urlpatterns_reverse.n
 import unittest
 
 from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
 from django.core.urlresolvers import reverse, resolve, NoReverseMatch, Resolver404
 from django.http import HttpResponseRedirect, HttpResponsePermanentRedirect
 from django.shortcuts import redirect
@@ -276,3 +277,16 @@ class RequestURLconfTests(TestCase):
         response = self.client.get('/second_test/')
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.content, 'outer:,inner:/second_test/')
+
+    def test_urlconf_overridden_with_null(self):
+        settings.MIDDLEWARE_CLASSES += (
+            '%s.NullChangeURLconfMiddleware' % middleware.__name__,
+        )
+        self.assertRaises(ImproperlyConfigured, self.client.get, '/test/me/')
+
+class NoRootUrlConfTests(TestCase):
+    """Tests for handler404 and handler500 if urlconf is None"""
+    urls = None
+
+    def test_no_handler_exception(self):
+        self.assertRaises(ImproperlyConfigured, self.client.get, '/test/me/')
-- 
cgit v1.3