From 3b94af8a849b4b37051abd5a84a03dc1fd307569 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Sat, 2 Apr 2011 13:27:17 +0000 Subject: 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 --- tests/regressiontests/conditional_processing/models.py | 2 ++ tests/regressiontests/conditional_processing/urls.py | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'tests/regressiontests/conditional_processing') diff --git a/tests/regressiontests/conditional_processing/models.py b/tests/regressiontests/conditional_processing/models.py index 48fe01143f..0f9bb52b52 100644 --- a/tests/regressiontests/conditional_processing/models.py +++ b/tests/regressiontests/conditional_processing/models.py @@ -16,6 +16,8 @@ EXPIRED_ETAG = '7fae4cd4b0f81e7d2914700043aa8ed6' class ConditionalGet(TestCase): + urls = 'regressiontests.conditional_processing.urls' + def assertFullResponse(self, response, check_last_modified=True, check_etag=True): self.assertEqual(response.status_code, 200) self.assertEqual(response.content, FULL_RESPONSE) diff --git a/tests/regressiontests/conditional_processing/urls.py b/tests/regressiontests/conditional_processing/urls.py index 4dbe11a230..8c1f465464 100644 --- a/tests/regressiontests/conditional_processing/urls.py +++ b/tests/regressiontests/conditional_processing/urls.py @@ -2,9 +2,9 @@ from django.conf.urls.defaults import * import views urlpatterns = patterns('', - ('^$', views.index), - ('^last_modified/$', views.last_modified_view1), - ('^last_modified2/$', views.last_modified_view2), - ('^etag/$', views.etag_view1), - ('^etag2/$', views.etag_view2), + ('^condition/$', views.index), + ('^condition/last_modified/$', views.last_modified_view1), + ('^condition/last_modified2/$', views.last_modified_view2), + ('^condition/etag/$', views.etag_view1), + ('^condition/etag2/$', views.etag_view2), ) -- cgit v1.3