Modified some regression tests to make them independent of the default root urlconf.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15999 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 11 insertions, 7 deletions

diff --git a/tests/regressiontests/middleware_exceptions/tests.py b/tests/regressiontests/middleware_exceptions/tests.py
index ac0f47a0f7..ac5f09a0a8 100644
--- a/tests/regressiontests/middleware_exceptions/tests.py
+++ b/tests/regressiontests/middleware_exceptions/tests.py
@@ -94,6 +94,8 @@ class BadExceptionMiddleware(TestMiddleware):
 
 
 class BaseMiddlewareExceptionTest(TestCase):
+    urls = 'regressiontests.middleware_exceptions.urls'
+
     def setUp(self):
         self.exceptions = []
         got_request_exception.connect(self._on_request_exception)
@@ -768,6 +770,8 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
 
 _missing = object()
 class RootUrlconfTests(TestCase):
+    urls = 'regressiontests.middleware_exceptions.urls'
+
     def test_missing_root_urlconf(self):
         try:
             original_ROOT_URLCONF = settings.ROOT_URLCONF
diff --git a/tests/regressiontests/middleware_exceptions/urls.py b/tests/regressiontests/middleware_exceptions/urls.py
index 37d47f796a..72c690fa41 100644
--- a/tests/regressiontests/middleware_exceptions/urls.py
+++ b/tests/regressiontests/middleware_exceptions/urls.py
@@ -4,12 +4,12 @@ from django.conf.urls.defaults import *
 import views
 
 urlpatterns = patterns('',
-    (r'^view/$', views.normal_view),
-    (r'^not_found/$', views.not_found),
-    (r'^error/$', views.server_error),
-    (r'^null_view/$', views.null_view),
-    (r'^permission_denied/$', views.permission_denied),
+    (r'^middleware_exceptions/view/$', views.normal_view),
+    (r'^middleware_exceptions/not_found/$', views.not_found),
+    (r'^middleware_exceptions/error/$', views.server_error),
+    (r'^middleware_exceptions/null_view/$', views.null_view),
+    (r'^middleware_exceptions/permission_denied/$', views.permission_denied),
 
-    (r'^template_response/$', views.template_response),
-    (r'^template_response_error/$', views.template_response_error),
+    (r'^middleware_exceptions/template_response/$', views.template_response),
+    (r'^middleware_exceptions/template_response_error/$', views.template_response_error),
 )