summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Magliocchetti <riccardo.magliocchetti@gmail.com>2015-05-19 11:10:04 +0200
committerTim Graham <timograham@gmail.com>2015-05-19 07:43:40 -0400
commitae1efb853c159ae4747d105405694245f8508b4b (patch)
treebd2e55472b1f2b779af7336ce6710d8b67a9b9cc
parent1046c8afecf719eee5a2aaa28b001e731f94100b (diff)
Refs #24553 -- Fixed urlpatterns leakage in auth_tests
-rw-r--r--tests/auth_tests/urls.py4
-rw-r--r--tests/auth_tests/urls_custom_user_admin.py3
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/auth_tests/urls.py b/tests/auth_tests/urls.py
index 6f83e0f420..3c4dc6b12b 100644
--- a/tests/auth_tests/urls.py
+++ b/tests/auth_tests/urls.py
@@ -3,7 +3,7 @@ from django.contrib import admin
from django.contrib.auth import views
from django.contrib.auth.decorators import login_required
from django.contrib.auth.forms import AuthenticationForm
-from django.contrib.auth.urls import urlpatterns
+from django.contrib.auth.urls import urlpatterns as auth_urlpatterns
from django.contrib.messages.api import info
from django.http import HttpRequest, HttpResponse
from django.shortcuts import render
@@ -65,7 +65,7 @@ def custom_request_auth_login(request):
return views.login(request, authentication_form=CustomRequestAuthenticationForm)
# special urls for auth test cases
-urlpatterns += [
+urlpatterns = auth_urlpatterns + [
url(r'^logout/custom_query/$', views.logout, dict(redirect_field_name='follow')),
url(r'^logout/next_page/$', views.logout, dict(next_page='/somewhere/')),
url(r'^logout/next_page/named/$', views.logout, dict(next_page='password_reset')),
diff --git a/tests/auth_tests/urls_custom_user_admin.py b/tests/auth_tests/urls_custom_user_admin.py
index 02389de4f2..f8bc194ba5 100644
--- a/tests/auth_tests/urls_custom_user_admin.py
+++ b/tests/auth_tests/urls_custom_user_admin.py
@@ -2,7 +2,6 @@ from django.conf.urls import include, url
from django.contrib import admin
from django.contrib.auth import get_user_model
from django.contrib.auth.admin import UserAdmin
-from django.contrib.auth.urls import urlpatterns
site = admin.AdminSite(name='custom_user_admin')
@@ -16,6 +15,6 @@ class CustomUserAdmin(UserAdmin):
site.register(get_user_model(), CustomUserAdmin)
-urlpatterns += [
+urlpatterns = [
url(r'^admin/', include(site.urls)),
]