From 7d4a3991f3996344414bbbf3abda532bf5885ac3 Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Thu, 4 Nov 2010 12:31:57 +0000 Subject: [PATCH] Fixed a test setup and isolation bug that was causing PasswordResetTest to fail when run individually git-svn-id: http://code.djangoproject.com/svn/django/trunk@14455 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/auth/tests/urls.py | 2 +- django/contrib/auth/tests/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/django/contrib/auth/tests/urls.py b/django/contrib/auth/tests/urls.py index bc2f7e705f..51b7d92d27 100644 --- a/django/contrib/auth/tests/urls.py +++ b/django/contrib/auth/tests/urls.py @@ -12,7 +12,7 @@ def remote_user_auth_view(request): return HttpResponse(t.render(c)) # special urls for auth test cases -urlpatterns += patterns('', +urlpatterns = urlpatterns + patterns('', (r'^logout/custom_query/$', 'django.contrib.auth.views.logout', dict(redirect_field_name='follow')), (r'^logout/next_page/$', 'django.contrib.auth.views.logout', dict(next_page='/somewhere/')), (r'^remote_user/$', remote_user_auth_view), diff --git a/django/contrib/auth/tests/views.py b/django/contrib/auth/tests/views.py index 42f7f12229..43065f2f4a 100644 --- a/django/contrib/auth/tests/views.py +++ b/django/contrib/auth/tests/views.py @@ -16,7 +16,7 @@ class AuthViewsTestCase(TestCase): Helper base class for all the follow test cases. """ fixtures = ['authtestdata.json'] - urls = 'django.contrib.auth.urls' + urls = 'django.contrib.auth.tests.urls' def setUp(self): self.old_LANGUAGES = settings.LANGUAGES