From 0339844b70895d6162b4595ae615e6edf843c6cd Mon Sep 17 00:00:00 2001 From: Bas Peschier Date: Sun, 15 Mar 2015 11:26:47 +0100 Subject: Fixed #24476 -- Added context manager/decorator for overriding script prefix. Tests were using an undocumented keyword argument for easily overriding script prefix while reversing. This is now changed into a test utility which can be used as decorator or context manager. --- tests/admin_views/tests.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'tests/admin_views') diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 44490f7a7d..429f9d7b6c 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -22,15 +22,13 @@ from django.contrib.staticfiles.storage import staticfiles_storage from django.core import mail from django.core.checks import Error from django.core.files import temp as tempfile -from django.core.urlresolvers import ( - NoReverseMatch, get_script_prefix, resolve, reverse, set_script_prefix, -) +from django.core.urlresolvers import NoReverseMatch, resolve, reverse from django.forms.utils import ErrorList from django.template.response import TemplateResponse from django.test import ( TestCase, modify_settings, override_settings, skipUnlessDBFeature, ) -from django.test.utils import patch_logger +from django.test.utils import override_script_prefix, patch_logger from django.utils import formats, six, translation from django.utils._os import upath from django.utils.cache import get_max_age @@ -5822,16 +5820,12 @@ class AdminKeepChangeListFiltersTests(TestCase): add_preserved_filters(context, url), ) - original_prefix = get_script_prefix() - try: - set_script_prefix('/prefix/') + with override_script_prefix('/prefix/'): url = reverse('admin:auth_user_changelist', current_app=self.admin_site.name) self.assertURLEqual( self.get_changelist_url(), add_preserved_filters(context, url), ) - finally: - set_script_prefix(original_prefix) class NamespacedAdminKeepChangeListFiltersTests(AdminKeepChangeListFiltersTests): -- cgit v1.3