From cd914e31c9a889f18c50c15b4f6ee4959624001f Mon Sep 17 00:00:00 2001 From: Anubhav Joshi Date: Sat, 5 Apr 2014 11:34:46 +0530 Subject: Fixed #21977 -- Deprecated SimpleTestCase.urls --- tests/admin_changelist/tests.py | 6 +- tests/admin_custom_urls/tests.py | 8 +- tests/admin_docs/tests.py | 16 ++-- tests/admin_inlines/tests.py | 20 ++-- tests/admin_scripts/tests.py | 4 +- tests/admin_views/tests.py | 152 +++++++++++++++---------------- tests/admin_widgets/tests.py | 36 ++++---- tests/cache/tests.py | 2 +- tests/conditional_processing/tests.py | 4 +- tests/contenttypes_tests/tests.py | 2 +- tests/context_processors/tests.py | 5 +- tests/deprecation/tests.py | 26 ++++++ tests/file_storage/tests.py | 2 +- tests/file_uploads/tests.py | 3 +- tests/forms_tests/tests/test_widgets.py | 2 +- tests/generic_inline_admin/tests.py | 16 ++-- tests/generic_views/test_base.py | 6 +- tests/generic_views/test_dates.py | 12 +-- tests/generic_views/test_detail.py | 4 +- tests/generic_views/test_edit.py | 10 +- tests/generic_views/test_list.py | 2 +- tests/handlers/tests.py | 6 +- tests/i18n/patterns/tests.py | 6 +- tests/i18n/tests.py | 6 +- tests/logging_tests/tests.py | 4 +- tests/middleware/tests.py | 4 +- tests/middleware_exceptions/tests.py | 4 +- tests/model_permalink/tests.py | 4 +- tests/proxy_models/tests.py | 4 +- tests/resolve_url/tests.py | 4 +- tests/servers/tests.py | 2 +- tests/staticfiles_tests/tests.py | 4 +- tests/syndication_tests/tests.py | 4 +- tests/template_tests/test_response.py | 8 +- tests/template_tests/tests.py | 2 +- tests/test_client/tests.py | 10 +- tests/test_client_regress/tests.py | 56 ++++++------ tests/test_utils/tests.py | 8 +- tests/timezones/tests.py | 4 +- tests/urlpatterns_reverse/tests.py | 21 +++-- tests/view_tests/tests/test_csrf.py | 2 +- tests/view_tests/tests/test_debug.py | 6 +- tests/view_tests/tests/test_defaults.py | 2 +- tests/view_tests/tests/test_i18n.py | 8 +- tests/view_tests/tests/test_json.py | 4 +- tests/view_tests/tests/test_shortcuts.py | 2 +- tests/view_tests/tests/test_specials.py | 4 +- tests/view_tests/tests/test_static.py | 3 +- tests/wsgi/tests.py | 2 +- 49 files changed, 275 insertions(+), 257 deletions(-) (limited to 'tests') diff --git a/tests/admin_changelist/tests.py b/tests/admin_changelist/tests.py index 431999d6d0..d89b0857ec 100644 --- a/tests/admin_changelist/tests.py +++ b/tests/admin_changelist/tests.py @@ -26,8 +26,8 @@ from .models import (Event, Child, Parent, Genre, Band, Musician, Group, UnorderedObject, OrderedObject, CustomIdUser) +@override_settings(ROOT_URLCONF="admin_changelist.urls") class ChangeListTests(TestCase): - urls = "admin_changelist.urls" def setUp(self): self.factory = RequestFactory() @@ -664,12 +664,12 @@ class AdminLogNodeTestCase(TestCase): self.assertEqual(template.render(context), '') -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_changelist.urls") class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase): available_apps = ['admin_changelist'] + AdminSeleniumWebDriverTestCase.available_apps fixtures = ['users.json'] - urls = "admin_changelist.urls" webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver' def test_add_row_selection(self): diff --git a/tests/admin_custom_urls/tests.py b/tests/admin_custom_urls/tests.py index 7f098b049b..f804036158 100644 --- a/tests/admin_custom_urls/tests.py +++ b/tests/admin_custom_urls/tests.py @@ -8,7 +8,8 @@ from django.test import TestCase, override_settings from .models import Action, Person, Car -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF='admin_custom_urls.urls',) class AdminCustomUrlsTest(TestCase): """ Remember that: @@ -16,7 +17,6 @@ class AdminCustomUrlsTest(TestCase): * The ModelAdmin for Action customizes the add_view URL, it's '//!add/' """ - urls = 'admin_custom_urls.urls' fixtures = ['users.json', 'actions.json'] def setUp(self): @@ -83,9 +83,9 @@ class AdminCustomUrlsTest(TestCase): self.assertContains(response, 'value="path/to/html/document.html"') -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF='admin_custom_urls.urls',) class CustomRedirects(TestCase): - urls = 'admin_custom_urls.urls' fixtures = ['users.json', 'actions.json'] def setUp(self): diff --git a/tests/admin_docs/tests.py b/tests/admin_docs/tests.py index 0f73e8dede..6eecb6af62 100644 --- a/tests/admin_docs/tests.py +++ b/tests/admin_docs/tests.py @@ -11,8 +11,8 @@ from django.test import TestCase, modify_settings, override_settings from .models import Person, Company +@override_settings(ROOT_URLCONF='admin_docs.urls') class MiscTests(TestCase): - urls = 'admin_docs.urls' def setUp(self): User.objects.create_superuser('super', None, 'secret') @@ -30,11 +30,11 @@ class MiscTests(TestCase): self.client.get('/admindocs/views/') # should not raise -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF='admin_docs.urls') @unittest.skipUnless(utils.docutils_is_available, "no docutils installed.") class AdminDocViewTests(TestCase): fixtures = ['data.xml'] - urls = 'admin_docs.urls' def setUp(self): self.client.login(username='super', password='secret') @@ -104,10 +104,10 @@ class AdminDocViewTests(TestCase): utils.docutils_is_available = True -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF='admin_docs.urls') class XViewMiddlewareTest(TestCase): fixtures = ['data.xml'] - urls = 'admin_docs.urls' def test_xview_func(self): user = User.objects.get(username='super') @@ -147,8 +147,8 @@ class XViewMiddlewareTest(TestCase): @unittest.skipUnless(utils.docutils_is_available, "no docutils installed.") +@override_settings(ROOT_URLCONF='admin_docs.urls') class DefaultRoleTest(TestCase): - urls = 'admin_docs.urls' def test_parse_rst(self): """ @@ -183,7 +183,8 @@ class DefaultRoleTest(TestCase): self.assertEqual(parts['fragment'], markup) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF='admin_docs.urls') @unittest.skipUnless(utils.docutils_is_available, "no docutils installed.") class TestModelDetailView(TestCase): """ @@ -191,7 +192,6 @@ class TestModelDetailView(TestCase): """ fixtures = ['data.xml'] - urls = 'admin_docs.urls' def setUp(self): self.client.login(username='super', password='secret') diff --git a/tests/admin_inlines/tests.py b/tests/admin_inlines/tests.py index 2f3fdfdf6c..4b654c9f95 100644 --- a/tests/admin_inlines/tests.py +++ b/tests/admin_inlines/tests.py @@ -15,9 +15,9 @@ from .models import (Holder, Inner, Holder2, Inner2, Holder3, Inner3, Person, SomeChildModel) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_inlines.urls") class TestInline(TestCase): - urls = "admin_inlines.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -255,9 +255,9 @@ class TestInline(TestCase): ) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_inlines.urls") class TestInlineMedia(TestCase): - urls = "admin_inlines.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -294,8 +294,8 @@ class TestInlineMedia(TestCase): self.assertContains(response, 'my_awesome_inline_scripts.js') +@override_settings(ROOT_URLCONF="admin_inlines.urls") class TestInlineAdminForm(TestCase): - urls = "admin_inlines.urls" def test_immutable_content_type(self): """Regression for #9362 @@ -313,9 +313,9 @@ class TestInlineAdminForm(TestCase): self.assertEqual(iaf.original.content_type, parent_ct) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_inlines.urls") class TestInlineProtectedOnDelete(TestCase): - urls = "admin_inlines.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -350,13 +350,13 @@ class TestInlineProtectedOnDelete(TestCase): % (chapter, foot_note)) +@override_settings(ROOT_URLCONF="admin_inlines.urls") class TestInlinePermissions(TestCase): """ Make sure the admin respects permissions for objects that are edited inline. Refs #8060. """ - urls = "admin_inlines.urls" def setUp(self): self.user = User(username='admin') @@ -546,12 +546,12 @@ class TestInlinePermissions(TestCase): self.assertContains(response, 'id="id_inner2_set-0-DELETE"') -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_inlines.urls") class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase): available_apps = ['admin_inlines'] + AdminSeleniumWebDriverTestCase.available_apps fixtures = ['admin-views-users.xml'] - urls = "admin_inlines.urls" webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver' def test_add_stackeds(self): diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py index 90fd3520e2..43a1227ad8 100644 --- a/tests/admin_scripts/tests.py +++ b/tests/admin_scripts/tests.py @@ -26,7 +26,7 @@ from django.db import connection from django.utils.encoding import force_text from django.utils._os import npath, upath from django.utils.six import StringIO -from django.test import LiveServerTestCase, TestCase +from django.test import LiveServerTestCase, TestCase, override_settings from django.test.runner import DiscoverRunner from django.test.utils import str_prefix @@ -1631,9 +1631,9 @@ class ArgumentOrder(AdminScriptTestCase): self.assertOutput(out, str_prefix("EXECUTE:BaseCommand labels=('testlabel',), options=[('no_color', False), ('option_a', 'x'), ('option_b', %%s), ('option_c', '3'), ('pythonpath', None), ('settings', 'alternate_settings'), ('traceback', None), ('verbosity', %(_)s'1')]") % option_b) +@override_settings(ROOT_URLCONF='admin_scripts.urls') class StartProject(LiveServerTestCase, AdminScriptTestCase): - urls = 'admin_scripts.urls' available_apps = [ 'admin_scripts', 'django.contrib.auth', diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index bd20afa92f..11463b6714 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -64,6 +64,7 @@ ADMIN_VIEW_TEMPLATES_DIR = settings.TEMPLATE_DIRS + (os.path.join(os.path.dirnam @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls", USE_I18N=True, USE_L10N=False, LANGUAGE_CODE='en') class AdminViewBasicTestCase(TestCase): fixtures = ['admin-views-users.xml', 'admin-views-colors.xml', @@ -74,8 +75,6 @@ class AdminViewBasicTestCase(TestCase): # this test case and changing urlbit. urlbit = 'admin' - urls = "admin_views.urls" - def setUp(self): self.client.login(username='super', password='secret') @@ -747,9 +746,9 @@ class AdminCustomTemplateTests(AdminViewBasicTestCase): self.assertTemplateUsed(response, 'custom_filter_template.html') -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class AdminViewFormUrlTest(TestCase): - urls = "admin_views.urls" fixtures = ["admin-views-users.xml"] urlbit = "admin3" @@ -781,12 +780,11 @@ class AdminViewFormUrlTest(TestCase): self.assertContains(response, 'value="overridden_value"') -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class AdminJavaScriptTest(TestCase): fixtures = ['admin-views-users.xml'] - urls = "admin_views.urls" - def setUp(self): self.client.login(username='super', password='secret') @@ -827,9 +825,9 @@ class AdminJavaScriptTest(TestCase): self.assertNotContains(response, 'inlines.min.js') -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class SaveAsTests(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml', 'admin-views-person.xml'] def setUp(self): @@ -858,8 +856,8 @@ class SaveAsTests(TestCase): self.assertEqual(response.context['form_url'], '/test_admin/admin/admin_views/person/add/') +@override_settings(ROOT_URLCONF="admin_views.urls") class CustomModelAdminTest(AdminViewBasicTestCase): - urls = "admin_views.urls" urlbit = "admin2" def testCustomAdminSiteLoginForm(self): @@ -937,11 +935,11 @@ def get_perm(Model, perm): return Permission.objects.get(content_type=ct, codename=perm) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class AdminViewPermissionsTest(TestCase): """Tests for Admin Views Permissions.""" - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -1465,11 +1463,11 @@ class AdminViewPermissionsTest(TestCase): self.assertEqual(response.url, 'http://example.com/dummy/foo/') -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class AdminViewsNoUrlTest(TestCase): """Regression test for #17333""" - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -1496,9 +1494,9 @@ class AdminViewsNoUrlTest(TestCase): self.client.get('/test_admin/admin/logout/') -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class AdminViewDeletedObjectsTest(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml', 'deleted-objects.xml'] def setUp(self): @@ -1614,9 +1612,9 @@ class AdminViewDeletedObjectsTest(TestCase): self.assertContains(response, should_contain) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class AdminViewStringPrimaryKeyTest(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml', 'string-primary-key.xml'] def __init__(self, *args): @@ -1748,12 +1746,12 @@ class AdminViewStringPrimaryKeyTest(TestCase): self.assertContains(response, '%d' % (link2, story2.id), 1) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class AdminSearchTest(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users', 'multiple-child-classes', 'admin-views-person'] @@ -2274,9 +2272,9 @@ class AdminSearchTest(TestCase): html=True) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class AdminInheritedInlinesTest(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -2362,9 +2360,9 @@ class AdminInheritedInlinesTest(TestCase): self.assertEqual(Persona.objects.all()[0].accounts.count(), 2) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class AdminActionsTest(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml', 'admin-views-actions.xml'] def setUp(self): @@ -2631,9 +2629,9 @@ action) self.assertEqual(response.template_name, 'admin/popup_response.html') -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class TestCustomChangeList(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] urlbit = 'admin' @@ -2660,9 +2658,9 @@ class TestCustomChangeList(TestCase): self.assertNotContains(response, 'First Gadget') -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class TestInlineNotEditable(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -2680,9 +2678,9 @@ class TestInlineNotEditable(TestCase): self.assertEqual(response.status_code, 200) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class AdminCustomQuerysetTest(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -2925,9 +2923,9 @@ class AdminCustomQuerysetTest(TestCase): self.assertEqual(self.client.get('/test_admin/admin/admin_views/filteredmanager/2/history/').status_code, 200) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class AdminInlineFileUploadTest(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml', 'admin-views-actions.xml'] urlbit = 'admin' @@ -2972,9 +2970,9 @@ class AdminInlineFileUploadTest(TestCase): self.assertContains(response, b"Currently") -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class AdminInlineTests(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -3291,9 +3289,9 @@ class AdminInlineTests(TestCase): self.assertEqual(Category.objects.get(id=4).order, 0) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class NeverCacheTests(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml', 'admin-views-colors.xml', 'admin-views-fabrics.xml'] def setUp(self): @@ -3365,9 +3363,9 @@ class NeverCacheTests(TestCase): self.assertEqual(get_max_age(response), None) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class PrePopulatedTest(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -3401,12 +3399,12 @@ class PrePopulatedTest(TestCase): self.assertContains(response, "maxLength: 1000") # instead of 1,000 -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class SeleniumAdminViewsFirefoxTests(AdminSeleniumWebDriverTestCase): available_apps = ['admin_views'] + AdminSeleniumWebDriverTestCase.available_apps fixtures = ['admin-views-users.xml'] - urls = "admin_views.urls" webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver' def test_prepopulated_fields(self): @@ -3597,9 +3595,9 @@ class SeleniumAdminViewsIETests(SeleniumAdminViewsFirefoxTests): webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver' -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class ReadonlyTest(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -3708,9 +3706,9 @@ class ReadonlyTest(TestCase): self.assertNotContains(response, "Some help text for the date (with unicode ŠĐĆŽćžšđ)") -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class LimitChoicesToInAdminTest(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -3735,9 +3733,9 @@ class LimitChoicesToInAdminTest(TestCase): self.assertNotContains(response, marley.username) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class RawIdFieldsTest(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -3815,12 +3813,12 @@ class RawIdFieldsTest(TestCase): self.assertContains(response2, "Palin") -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class UserAdminTest(TestCase): """ Tests user CRUD functionality. """ - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -3922,12 +3920,12 @@ class UserAdminTest(TestCase): self.assertEqual(response.context['form_url'], 'pony') -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class GroupAdminTest(TestCase): """ Tests group CRUD functionality. """ - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -3959,9 +3957,9 @@ class GroupAdminTest(TestCase): self.assertEqual(response.status_code, 200) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class CSSTest(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -4084,9 +4082,9 @@ except ImportError: @unittest.skipUnless(docutils, "no docutils installed.") -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class AdminDocsTest(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -4127,9 +4125,9 @@ class AdminDocsTest(TestCase): self.assertContains(response, '
  • add
    • ', html=True) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class ValidXHTMLTests(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] urlbit = 'admin' @@ -4152,9 +4150,9 @@ class ValidXHTMLTests(TestCase): @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls", USE_THOUSAND_SEPARATOR=True, USE_L10N=True) class DateHierarchyTests(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -4274,13 +4272,13 @@ class DateHierarchyTests(TestCase): self.assert_non_localized_year(response, 2005) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class AdminCustomSaveRelatedTests(TestCase): """ Ensure that one can easily customize the way related objects are saved. Refs #16115. """ - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -4343,9 +4341,9 @@ class AdminCustomSaveRelatedTests(TestCase): self.assertEqual(['Catherine Stone', 'Paul Stone'], children_names) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class AdminViewLogoutTest(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -4372,9 +4370,9 @@ class AdminViewLogoutTest(TestCase): self.assertContains(response, '') -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class AdminUserMessageTest(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -4430,9 +4428,9 @@ class AdminUserMessageTest(TestCase): html=True) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class AdminKeepChangeListFiltersTests(TestCase): - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] admin_site = site @@ -4716,11 +4714,11 @@ class NamespacedAdminKeepChangeListFiltersTests(AdminKeepChangeListFiltersTests) admin_site = site2 -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF="admin_views.urls") class TestLabelVisibility(TestCase): """ #11277 -Labels of hidden fields in admin were not hidden. """ - urls = "admin_views.urls" fixtures = ['admin-views-users.xml'] def setUp(self): @@ -4757,9 +4755,9 @@ class TestLabelVisibility(TestCase): self.assertContains(response, '
    ']) +@override_settings(ROOT_URLCONF='generic_views.urls') class DeleteViewTests(TestCase): - urls = 'generic_views.urls' def test_delete_by_post(self): a = Author.objects.create(**{'name': 'Randall Munroe', 'slug': 'randall-munroe'}) diff --git a/tests/generic_views/test_list.py b/tests/generic_views/test_list.py index a6a5c76ff8..8c5c023e4c 100644 --- a/tests/generic_views/test_list.py +++ b/tests/generic_views/test_list.py @@ -8,9 +8,9 @@ from django.utils.encoding import force_str from .models import Author, Artist +@override_settings(ROOT_URLCONF='generic_views.urls') class ListViewTests(TestCase): fixtures = ['generic-views-test-data.json'] - urls = 'generic_views.urls' def test_items(self): res = self.client.get('/list/dict/') diff --git a/tests/handlers/tests.py b/tests/handlers/tests.py index ae8b9529f5..b36d8dbfdd 100644 --- a/tests/handlers/tests.py +++ b/tests/handlers/tests.py @@ -65,10 +65,10 @@ class HandlerTests(TestCase): self.assertEqual(request.COOKIES['want'], force_str("café")) +@override_settings(ROOT_URLCONF='handlers.urls') class TransactionsPerRequestTests(TransactionTestCase): available_apps = [] - urls = 'handlers.urls' def test_no_transaction(self): response = self.client.get('/in_transaction/') @@ -93,8 +93,8 @@ class TransactionsPerRequestTests(TransactionTestCase): self.assertContains(response, 'False') +@override_settings(ROOT_URLCONF='handlers.urls') class SignalsTests(TestCase): - urls = 'handlers.urls' def setUp(self): self.signals = [] @@ -123,8 +123,8 @@ class SignalsTests(TestCase): self.assertEqual(self.signals, ['started', 'finished']) +@override_settings(ROOT_URLCONF='handlers.urls') class HandlerSuspiciousOpsTest(TestCase): - urls = 'handlers.urls' def test_suspiciousop_in_view_returns_400(self): response = self.client.get('/suspicious/') diff --git a/tests/i18n/patterns/tests.py b/tests/i18n/patterns/tests.py index a96fe1f54f..93284578b0 100644 --- a/tests/i18n/patterns/tests.py +++ b/tests/i18n/patterns/tests.py @@ -34,12 +34,12 @@ class PermanentRedirectLocaleMiddleWare(LocaleMiddleware): 'django.middleware.locale.LocaleMiddleware', 'django.middleware.common.CommonMiddleware', ), + ROOT_URLCONF='i18n.patterns.urls.default', ) class URLTestCaseBase(TestCase): """ TestCase base-class for the URL tests. """ - urls = 'i18n.patterns.urls.default' def setUp(self): # Make sure the cache is empty before we are doing our tests. @@ -73,8 +73,8 @@ class URLPrefixTests(URLTestCaseBase): self.assertRaises(ImproperlyConfigured, lambda: reverse('account:register')) +@override_settings(ROOT_URLCONF='i18n.patterns.urls.disabled') class URLDisabledTests(URLTestCaseBase): - urls = 'i18n.patterns.urls.disabled' @override_settings(USE_I18N=False) def test_prefixed_i18n_disabled(self): @@ -84,12 +84,12 @@ class URLDisabledTests(URLTestCaseBase): self.assertEqual(reverse('prefixed'), '/prefixed/') +@override_settings(ROOT_URLCONF='i18n.patterns.urls.path_unused') class PathUnusedTests(URLTestCaseBase): """ Check that if no i18n_patterns is used in root urlconfs, then no language activation happens based on url prefix. """ - urls = 'i18n.patterns.urls.path_unused' def test_no_lang_activate(self): response = self.client.get('/nl/foo/') diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py index 9501849e09..eee9896266 100644 --- a/tests/i18n/tests.py +++ b/tests/i18n/tests.py @@ -1261,11 +1261,10 @@ class MultipleLocaleActivationTests(TestCase): 'django.middleware.locale.LocaleMiddleware', 'django.middleware.common.CommonMiddleware', ), + ROOT_URLCONF='i18n.urls', ) class LocaleMiddlewareTests(TestCase): - urls = 'i18n.urls' - def test_streaming_response(self): # Regression test for #5241 response = self.client.get('/fr/streaming/') @@ -1299,11 +1298,10 @@ class LocaleMiddlewareTests(TestCase): 'django.middleware.locale.LocaleMiddleware', 'django.middleware.common.CommonMiddleware', ), + ROOT_URLCONF='i18n.urls' ) class CountrySpecificLanguageTests(TestCase): - urls = 'i18n.urls' - def setUp(self): super(CountrySpecificLanguageTests, self).setUp() self.rf = RequestFactory() diff --git a/tests/logging_tests/tests.py b/tests/logging_tests/tests.py index 34ed24dc6a..a213b591fb 100644 --- a/tests/logging_tests/tests.py +++ b/tests/logging_tests/tests.py @@ -363,11 +363,9 @@ class SetupConfigureLogging(TestCase): self.assertTrue(dictConfig.called) -@override_settings(DEBUG=True) +@override_settings(DEBUG=True, ROOT_URLCONF='logging_tests.urls') class SecurityLoggerTest(TestCase): - urls = 'logging_tests.urls' - def test_suspicious_operation_creates_log_message(self): with patch_logger('django.security.SuspiciousOperation', 'error') as calls: self.client.get('/suspicious/') diff --git a/tests/middleware/tests.py b/tests/middleware/tests.py index 6974cd9ad7..98420501a6 100644 --- a/tests/middleware/tests.py +++ b/tests/middleware/tests.py @@ -20,8 +20,8 @@ from django.utils.encoding import force_str from django.utils.six.moves import xrange +@override_settings(ROOT_URLCONF='middleware.urls') class CommonMiddlewareTest(TestCase): - urls = 'middleware.urls' def _get_request(self, path): request = HttpRequest() @@ -303,8 +303,8 @@ class BrokenLinkEmailsMiddlewareTest(TestCase): self.assertEqual(len(mail.outbox), 1) +@override_settings(ROOT_URLCONF='middleware.cond_get_urls') class ConditionalGetMiddlewareTest(TestCase): - urls = 'middleware.cond_get_urls' def setUp(self): self.req = HttpRequest() diff --git a/tests/middleware_exceptions/tests.py b/tests/middleware_exceptions/tests.py index 406f0f8fea..63f4fa7b70 100644 --- a/tests/middleware_exceptions/tests.py +++ b/tests/middleware_exceptions/tests.py @@ -101,8 +101,8 @@ class BadExceptionMiddleware(TestMiddleware): raise TestException('Test Exception Exception') +@override_settings(ROOT_URLCONF='middleware_exceptions.urls') class BaseMiddlewareExceptionTest(TestCase): - urls = 'middleware_exceptions.urls' def setUp(self): self.exceptions = [] @@ -779,8 +779,8 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest): _missing = object() +@override_settings(ROOT_URLCONF='middleware_exceptions.urls') class RootUrlconfTests(TestCase): - urls = 'middleware_exceptions.urls' @override_settings(ROOT_URLCONF=None) def test_missing_root_urlconf(self): diff --git a/tests/model_permalink/tests.py b/tests/model_permalink/tests.py index ef682ed0e8..6d508c282e 100644 --- a/tests/model_permalink/tests.py +++ b/tests/model_permalink/tests.py @@ -1,10 +1,10 @@ -from django.test import TestCase +from django.test import TestCase, override_settings from .models import Guitarist +@override_settings(ROOT_URLCONF='model_permalink.urls') class PermalinkTests(TestCase): - urls = 'model_permalink.urls' def test_permalink(self): g = Guitarist(name='Adrien Moignard', slug='adrienmoignard') diff --git a/tests/proxy_models/tests.py b/tests/proxy_models/tests.py index 0f2b5349be..0052ff4630 100644 --- a/tests/proxy_models/tests.py +++ b/tests/proxy_models/tests.py @@ -368,10 +368,10 @@ class ProxyModelTests(TestCase): self.assertEqual(MyPerson(id=100), Person(id=100)) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF='proxy_models.urls',) class ProxyModelAdminTests(TestCase): fixtures = ['myhorses'] - urls = 'proxy_models.urls' def test_cascade_delete_proxy_model_admin_warning(self): """ diff --git a/tests/resolve_url/tests.py b/tests/resolve_url/tests.py index 4fdf2a9fe1..542d325e8e 100644 --- a/tests/resolve_url/tests.py +++ b/tests/resolve_url/tests.py @@ -3,16 +3,16 @@ from __future__ import unicode_literals from django.core.urlresolvers import NoReverseMatch from django.contrib.auth.views import logout from django.shortcuts import resolve_url -from django.test import TestCase +from django.test import TestCase, override_settings from .models import UnimportantThing +@override_settings(ROOT_URLCONF='resolve_url.urls') class ResolveUrlTests(TestCase): """ Tests for the ``resolve_url`` function. """ - urls = 'resolve_url.urls' def test_url_path(self): """ diff --git a/tests/servers/tests.py b/tests/servers/tests.py index 6e31da340a..2331a0ddce 100644 --- a/tests/servers/tests.py +++ b/tests/servers/tests.py @@ -27,6 +27,7 @@ TEST_SETTINGS = { } +@override_settings(ROOT_URLCONF='servers.urls') class LiveServerBase(LiveServerTestCase): available_apps = [ @@ -36,7 +37,6 @@ class LiveServerBase(LiveServerTestCase): 'django.contrib.sessions', ] fixtures = ['testdata.json'] - urls = 'servers.urls' @classmethod def setUpClass(cls): diff --git a/tests/staticfiles_tests/tests.py b/tests/staticfiles_tests/tests.py index 4d2ba30c8c..996e86e130 100644 --- a/tests/staticfiles_tests/tests.py +++ b/tests/staticfiles_tests/tests.py @@ -735,11 +735,11 @@ class TestCollectionLinks(CollectionTestCase, TestDefaults): self.assertTrue(os.path.islink(path)) +@override_settings(ROOT_URLCONF='staticfiles_tests.urls.default') class TestServeStatic(StaticFilesTestCase): """ Test static asset serving view. """ - urls = 'staticfiles_tests.urls.default' def _response(self, filepath): return self.client.get( @@ -771,11 +771,11 @@ class TestServeStaticWithDefaultURL(TestServeStatic, TestDefaults): pass +@override_settings(ROOT_URLCONF='staticfiles_tests.urls.helper') class TestServeStaticWithURLHelper(TestServeStatic, TestDefaults): """ Test static asset serving view with staticfiles_urlpatterns helper. """ - urls = 'staticfiles_tests.urls.helper' class TestServeAdminMedia(TestServeStatic): diff --git a/tests/syndication_tests/tests.py b/tests/syndication_tests/tests.py index b5d1ec4bfc..ce70b038cd 100644 --- a/tests/syndication_tests/tests.py +++ b/tests/syndication_tests/tests.py @@ -10,7 +10,7 @@ except ImportError: from django.contrib.syndication import views from django.core.exceptions import ImproperlyConfigured -from django.test import TestCase +from django.test import TestCase, override_settings from django.test.utils import requires_tz_support from django.utils.feedgenerator import rfc2822_date, rfc3339_date from django.utils import timezone @@ -50,11 +50,11 @@ class FeedTestCase(TestCase): ###################################### +@override_settings(ROOT_URLCONF='syndication_tests.urls') class SyndicationFeedTest(FeedTestCase): """ Tests for the high-level syndication feed framework. """ - urls = 'syndication_tests.urls' def test_rss2_feed(self): """ diff --git a/tests/template_tests/test_response.py b/tests/template_tests/test_response.py index 48a7b89029..ce2cc4a2c8 100644 --- a/tests/template_tests/test_response.py +++ b/tests/template_tests/test_response.py @@ -302,10 +302,10 @@ class TemplateResponseTest(TestCase): @override_settings( MIDDLEWARE_CLASSES=list(settings.MIDDLEWARE_CLASSES) + [ 'template_tests.test_response.CustomURLConfMiddleware' - ] + ], + ROOT_URLCONF='template_tests.urls', ) class CustomURLConfTest(TestCase): - urls = 'template_tests.urls' def test_custom_urlconf(self): response = self.client.get('/template_response_view/') @@ -318,10 +318,10 @@ class CustomURLConfTest(TestCase): MIDDLEWARE_CLASSES=list(settings.MIDDLEWARE_CLASSES) + [ 'django.middleware.cache.FetchFromCacheMiddleware', 'django.middleware.cache.UpdateCacheMiddleware', - ] + ], + ROOT_URLCONF='template_tests.alternate_urls', ) class CacheMiddlewareTest(TestCase): - urls = 'template_tests.alternate_urls' def test_middleware_caching(self): response = self.client.get('/template_response_view/') diff --git a/tests/template_tests/tests.py b/tests/template_tests/tests.py index 00ef9f41cf..cd4a6b783a 100644 --- a/tests/template_tests/tests.py +++ b/tests/template_tests/tests.py @@ -529,9 +529,9 @@ class TemplateRegressionTests(TestCase): @override_settings(MEDIA_URL="/media/", STATIC_URL="/static/", TEMPLATE_DEBUG=False, ALLOWED_INCLUDE_ROOTS=( os.path.dirname(os.path.abspath(upath(__file__))),), + ROOT_URLCONF='template_tests.urls', ) class TemplateTests(TestCase): - urls = 'template_tests.urls' def test_templates(self): template_tests = self.get_template_tests() diff --git a/tests/test_client/tests.py b/tests/test_client/tests.py index a29d627000..5f4d7c11db 100644 --- a/tests/test_client/tests.py +++ b/tests/test_client/tests.py @@ -29,10 +29,10 @@ from django.test import override_settings from .views import get_view -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF='test_client.urls',) class ClientTest(TestCase): fixtures = ['testdata.json'] - urls = 'test_client.urls' def test_get_view(self): "GET a view" @@ -499,10 +499,10 @@ class ClientTest(TestCase): @override_settings( - MIDDLEWARE_CLASSES=('django.middleware.csrf.CsrfViewMiddleware',) + MIDDLEWARE_CLASSES=('django.middleware.csrf.CsrfViewMiddleware',), + ROOT_URLCONF='test_client.urls', ) class CSRFEnabledClientTests(TestCase): - urls = 'test_client.urls' def test_csrf_enabled_client(self): "A client can be instantiated with CSRF checks enabled" @@ -529,8 +529,8 @@ class CustomTestClientTest(TestCase): self.assertEqual(hasattr(self.client, "i_am_customized"), True) +@override_settings(ROOT_URLCONF='test_client.urls') class RequestFactoryTest(TestCase): - urls = 'test_client.urls' def test_request_factory(self): factory = RequestFactory() diff --git a/tests/test_client_regress/tests.py b/tests/test_client_regress/tests.py index d25d36b09f..59cc46b567 100644 --- a/tests/test_client_regress/tests.py +++ b/tests/test_client_regress/tests.py @@ -27,10 +27,10 @@ from .views import CustomTestException @override_settings( - TEMPLATE_DIRS=(os.path.join(os.path.dirname(upath(__file__)), 'templates'),) + TEMPLATE_DIRS=(os.path.join(os.path.dirname(upath(__file__)), 'templates'),), + ROOT_URLCONF='test_client_regress.urls', ) class AssertContainsTests(TestCase): - urls = 'test_client_regress.urls' def test_contains(self): "Responses can be inspected for content, including counting repeated substrings" @@ -191,9 +191,9 @@ class AssertContainsTests(TestCase): self.assertNotContains(response, 'Bye') -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF='test_client_regress.urls',) class AssertTemplateUsedTests(TestCase): - urls = 'test_client_regress.urls' fixtures = ['testdata.json'] def test_no_context(self): @@ -264,8 +264,8 @@ class AssertTemplateUsedTests(TestCase): self.assertIn("Template 'Valid POST Template' was not a template used to render the response. Actual template(s) used: form_view.html, base.html", str(e)) +@override_settings(ROOT_URLCONF='test_client_regress.urls') class AssertRedirectsTests(TestCase): - urls = 'test_client_regress.urls' def test_redirect_page(self): "An assertion is raised if the original page couldn't be retrieved as expected" @@ -459,8 +459,8 @@ class AssertRedirectsTests(TestCase): self.assertRedirects(response, 'http://testserver/secure_view/', status_code=301) +@override_settings(ROOT_URLCONF='test_client_regress.urls') class AssertFormErrorTests(TestCase): - urls = 'test_client_regress.urls' def test_unknown_form(self): "An assertion is raised if the form name is unknown" @@ -576,8 +576,8 @@ class AssertFormErrorTests(TestCase): self.assertIn("abc: The form 'form' in context 0 does not contain the non-field error 'Some error.' (actual errors: )", str(e)) +@override_settings(ROOT_URLCONF='test_client_regress.urls') class AssertFormsetErrorTests(TestCase): - urls = 'test_client_regress.urls' msg_prefixes = [("", {}), ("abc: ", {"msg_prefix": "abc"})] def setUp(self): @@ -775,9 +775,9 @@ class ProcessedMiddleware(object): request.has_been_processed = True -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF='test_client_regress.urls',) class LoginTests(TestCase): - urls = 'test_client_regress.urls' fixtures = ['testdata'] def test_login_different_client(self): @@ -817,10 +817,10 @@ class LoginTests(TestCase): @override_settings( PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), - SESSION_ENGINE='test_client_regress.session' + SESSION_ENGINE='test_client_regress.session', + ROOT_URLCONF='test_client_regress.urls', ) class SessionEngineTests(TestCase): - urls = 'test_client_regress.urls' fixtures = ['testdata'] def test_login(self): @@ -834,8 +834,8 @@ class SessionEngineTests(TestCase): self.assertEqual(response.context['user'].username, 'testclient') +@override_settings(ROOT_URLCONF='test_client_regress.urls',) class URLEscapingTests(TestCase): - urls = 'test_client_regress.urls' def test_simple_argument_get(self): "Get a view that has a simple string argument" @@ -862,9 +862,9 @@ class URLEscapingTests(TestCase): self.assertEqual(response.content, b'Hi, Arthur') -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF='test_client_regress.urls',) class ExceptionTests(TestCase): - urls = 'test_client_regress.urls' fixtures = ['testdata.json'] def test_exception_cleared(self): @@ -889,8 +889,8 @@ class ExceptionTests(TestCase): self.fail("Staff should be able to visit this page") +@override_settings(ROOT_URLCONF='test_client_regress.urls') class TemplateExceptionTests(TestCase): - urls = 'test_client_regress.urls' def setUp(self): # Reset the loaders so they don't try to render cached templates. @@ -914,8 +914,8 @@ class TemplateExceptionTests(TestCase): # We need two different tests to check URLconf substitution - one to check # it was changed, and another one (without self.urls) to check it was reverted on # teardown. This pair of tests relies upon the alphabetical ordering of test execution. +@override_settings(ROOT_URLCONF='test_client_regress.urls') class UrlconfSubstitutionTests(TestCase): - urls = 'test_client_regress.urls' def test_urlconf_was_changed(self): "TestCase can enforce a custom URLconf on a per-test basis" @@ -936,9 +936,9 @@ class zzUrlconfSubstitutionTests(TestCase): reverse('arg_view', args=['somename']) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF='test_client_regress.urls',) class ContextTests(TestCase): - urls = 'test_client_regress.urls' fixtures = ['testdata'] def test_single_context(self): @@ -1007,9 +1007,9 @@ class ContextTests(TestCase): self.assertEqual(response.context['nested'], 'yes') -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF='test_client_regress.urls',) class SessionTests(TestCase): - urls = 'test_client_regress.urls' fixtures = ['testdata.json'] def test_session(self): @@ -1116,8 +1116,8 @@ class SessionTests(TestCase): self.assertFalse(listener.executed) +@override_settings(ROOT_URLCONF='test_client_regress.urls') class RequestMethodTests(TestCase): - urls = 'test_client_regress.urls' def test_get(self): "Request a view via request method GET" @@ -1164,8 +1164,8 @@ class RequestMethodTests(TestCase): self.assertEqual(response.content, b'request method: PATCH') +@override_settings(ROOT_URLCONF='test_client_regress.urls') class RequestMethodStringDataTests(TestCase): - urls = 'test_client_regress.urls' def test_post(self): "Request a view with string data via request method POST" @@ -1192,8 +1192,8 @@ class RequestMethodStringDataTests(TestCase): self.assertEqual(response.content, b'request method: PATCH') +@override_settings(ROOT_URLCONF='test_client_regress.urls',) class QueryStringTests(TestCase): - urls = 'test_client_regress.urls' def test_get_like_requests(self): # See: https://code.djangoproject.com/ticket/10571. @@ -1247,8 +1247,8 @@ class QueryStringTests(TestCase): self.assertEqual(response.context['request-bar'], 'bang') +@override_settings(ROOT_URLCONF='test_client_regress.urls') class UnicodePayloadTests(TestCase): - urls = 'test_client_regress.urls' def test_simple_unicode_payload(self): "A simple ASCII-only unicode JSON document can be POSTed" @@ -1312,8 +1312,8 @@ class UploadedFileEncodingTest(TestCase): encode_file('IGNORE', 'IGNORE', DummyFile("file.unknown"))[2]) +@override_settings(ROOT_URLCONF='test_client_regress.urls',) class RequestHeadersTest(TestCase): - urls = 'test_client_regress.urls' fixtures = ['testdata'] def test_client_headers(self): @@ -1348,6 +1348,7 @@ class RequestHeadersTest(TestCase): status_code=301, target_status_code=200) +@override_settings(ROOT_URLCONF='test_client_regress.urls') class ReadLimitedStreamTest(TestCase): """ Tests that ensure that HttpRequest.body, HttpRequest.read() and @@ -1355,7 +1356,6 @@ class ReadLimitedStreamTest(TestCase): Refs #14753, #15785 """ - urls = 'test_client_regress.urls' def test_body_from_empty_request(self): """HttpRequest.body on a test client GET request should return @@ -1391,6 +1391,7 @@ class ReadLimitedStreamTest(TestCase): content_type='text/plain').content, payload) +@override_settings(ROOT_URLCONF='test_client_regress.urls') class RequestFactoryStateTest(TestCase): """Regression tests for #15929.""" # These tests are checking that certain middleware don't change certain @@ -1398,7 +1399,6 @@ class RequestFactoryStateTest(TestCase): # ensuring test isolation behavior. So, unusually, it doesn't make sense to # run the tests individually, and if any are failing it is confusing to run # them with any other set of tests. - urls = 'test_client_regress.urls' def common_test_that_should_always_pass(self): request = RequestFactory().get('/') @@ -1418,12 +1418,12 @@ class RequestFactoryStateTest(TestCase): self.common_test_that_should_always_pass() +@override_settings(ROOT_URLCONF='test_client_regress.urls') class RequestFactoryEnvironmentTests(TestCase): """ Regression tests for #8551 and #17067: ensure that environment variables are set correctly in RequestFactory. """ - urls = 'test_client_regress.urls' def test_should_set_correct_env_variables(self): request = RequestFactory().get('/path/') diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py index f41c06e647..e9f6da7279 100644 --- a/tests/test_utils/tests.py +++ b/tests/test_utils/tests.py @@ -51,8 +51,8 @@ class SkippingClassTestCase(TestCase): self.assertEqual(len(result.skipped), 1) +@override_settings(ROOT_URLCONF='test_utils.urls') class AssertNumQueriesTests(TestCase): - urls = 'test_utils.urls' def test_assert_num_queries(self): def test_func(): @@ -121,8 +121,8 @@ class AssertQuerysetEqualTests(TestCase): ) +@override_settings(ROOT_URLCONF='test_utils.urls') class CaptureQueriesContextManagerTests(TestCase): - urls = 'test_utils.urls' def setUp(self): self.person_pk = six.text_type(Person.objects.create(name='test').pk) @@ -175,8 +175,8 @@ class CaptureQueriesContextManagerTests(TestCase): self.assertIn(self.person_pk, captured_queries[1]['sql']) +@override_settings(ROOT_URLCONF='test_utils.urls') class AssertNumQueriesContextManagerTests(TestCase): - urls = 'test_utils.urls' def test_simple(self): with self.assertNumQueries(0): @@ -214,8 +214,8 @@ class AssertNumQueriesContextManagerTests(TestCase): self.client.get("/test_utils/get_person/%s/" % person.pk) +@override_settings(ROOT_URLCONF='test_utils.urls') class AssertTemplateUsedContextManagerTests(TestCase): - urls = 'test_utils.urls' def test_usage(self): with self.assertTemplateUsed('template_used/base.html'): diff --git a/tests/timezones/tests.py b/tests/timezones/tests.py index 51260fc0f5..d16c7f7fd2 100644 --- a/tests/timezones/tests.py +++ b/tests/timezones/tests.py @@ -1070,10 +1070,10 @@ class NewFormsTests(TestCase): @override_settings(DATETIME_FORMAT='c', TIME_ZONE='Africa/Nairobi', USE_L10N=False, USE_TZ=True, - PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) + PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF='timezones.urls') class AdminTests(TestCase): - urls = 'timezones.urls' fixtures = ['tz_users.xml'] def setUp(self): diff --git a/tests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py index a57b7e2a17..d2c4079fda 100644 --- a/tests/urlpatterns_reverse/tests.py +++ b/tests/urlpatterns_reverse/tests.py @@ -6,6 +6,7 @@ from __future__ import unicode_literals import unittest from django.contrib.auth.models import User +from django.conf import settings from django.core.exceptions import ImproperlyConfigured, ViewDoesNotExist from django.core.urlresolvers import (reverse, reverse_lazy, resolve, get_callable, get_resolver, NoReverseMatch, Resolver404, ResolverMatch, RegexURLResolver, @@ -152,14 +153,14 @@ test_data = ( ) +@override_settings(ROOT_URLCONF='urlpatterns_reverse.no_urls') class NoURLPatternsTests(TestCase): - urls = 'urlpatterns_reverse.no_urls' def test_no_urls_exception(self): """ RegexURLResolver should raise an exception when no urlpatterns exist. """ - resolver = RegexURLResolver(r'^$', self.urls) + resolver = RegexURLResolver(r'^$', settings.ROOT_URLCONF) self.assertRaisesMessage(ImproperlyConfigured, "The included urlconf 'urlpatterns_reverse.no_urls' does not " @@ -168,8 +169,8 @@ class NoURLPatternsTests(TestCase): getattr, resolver, 'url_patterns') +@override_settings(ROOT_URLCONF='urlpatterns_reverse.urls') class URLPatternReverse(TestCase): - urls = 'urlpatterns_reverse.urls' def test_urlpattern_reverse(self): for name, expected, args, kwargs in test_data: @@ -290,8 +291,8 @@ class ResolverTests(unittest.TestCase): self.assertEqual(t.name, e['name'], 'Wrong URL name. Expected "%s", got "%s".' % (e['name'], t.name)) +@override_settings(ROOT_URLCONF='urlpatterns_reverse.reverse_lazy_urls') class ReverseLazyTest(TestCase): - urls = 'urlpatterns_reverse.reverse_lazy_urls' def test_redirect_with_lazy_reverse(self): response = self.client.get('/redirect/') @@ -324,8 +325,8 @@ LOGIN_URL = reverse_lazy('login')""") self.assertNoOutput(err) +@override_settings(ROOT_URLCONF='urlpatterns_reverse.urls') class ReverseShortcutTests(TestCase): - urls = 'urlpatterns_reverse.urls' def test_redirect_to_object(self): # We don't really need a model; just something with a get_absolute_url @@ -363,8 +364,8 @@ class ReverseShortcutTests(TestCase): self.assertRaises(NoReverseMatch, redirect, absolute_kwargs_view, wrong_argument=None) +@override_settings(ROOT_URLCONF='urlpatterns_reverse.namespace_urls') class NamespaceTests(TestCase): - urls = 'urlpatterns_reverse.namespace_urls' def test_ambiguous_object(self): "Names deployed via dynamic URL objects that require namespaces can't be resolved" @@ -600,8 +601,8 @@ class ErrorHandlerResolutionTests(TestCase): self.assertEqual(self.callable_resolver.resolve500(), handler) +@override_settings(ROOT_URLCONF='urlpatterns_reverse.urls_without_full_import') class DefaultErrorHandlerTests(TestCase): - urls = 'urlpatterns_reverse.urls_without_full_import' def test_default_handler(self): "If the urls.py doesn't specify handlers, the defaults are used" @@ -617,16 +618,16 @@ class DefaultErrorHandlerTests(TestCase): self.fail("Shouldn't get an AttributeError due to undefined 500 handler") +@override_settings(ROOT_URLCONF=None) class NoRootUrlConfTests(TestCase): """Tests for handler404 and handler500 if urlconf is None""" - urls = None def test_no_handler_exception(self): self.assertRaises(ImproperlyConfigured, self.client.get, '/test/me/') +@override_settings(ROOT_URLCONF='urlpatterns_reverse.namespace_urls') class ResolverMatchTests(TestCase): - urls = 'urlpatterns_reverse.namespace_urls' def test_urlpattern_resolve(self): for path, name, app_name, namespace, func, args, kwargs in resolve_test_data: @@ -661,8 +662,8 @@ class ResolverMatchTests(TestCase): self.assertIsNone(request.resolver_match) +@override_settings(ROOT_URLCONF='urlpatterns_reverse.erroneous_urls') class ErroneousViewTests(TestCase): - urls = 'urlpatterns_reverse.erroneous_urls' def test_erroneous_resolve(self): self.assertRaises(ImportError, self.client.get, '/erroneous_inner/') diff --git a/tests/view_tests/tests/test_csrf.py b/tests/view_tests/tests/test_csrf.py index 2a3f51125a..893a7e200b 100644 --- a/tests/view_tests/tests/test_csrf.py +++ b/tests/view_tests/tests/test_csrf.py @@ -2,8 +2,8 @@ from django.test import TestCase, override_settings, Client from django.utils.translation import override +@override_settings(ROOT_URLCONF="view_tests.urls") class CsrfViewTests(TestCase): - urls = "view_tests.urls" def setUp(self): super(CsrfViewTests, self).setUp() diff --git a/tests/view_tests/tests/test_debug.py b/tests/view_tests/tests/test_debug.py index b66bdac32d..75cc8a0b97 100644 --- a/tests/view_tests/tests/test_debug.py +++ b/tests/view_tests/tests/test_debug.py @@ -30,9 +30,9 @@ from ..views import (sensitive_view, non_sensitive_view, paranoid_view, multivalue_dict_key_error) -@override_settings(DEBUG=True, TEMPLATE_DEBUG=True) +@override_settings(DEBUG=True, TEMPLATE_DEBUG=True, + ROOT_URLCONF="view_tests.urls") class DebugViewTests(TestCase): - urls = "view_tests.urls" def test_files(self): response = self.client.get('/raises/') @@ -521,12 +521,12 @@ class ExceptionReportTestMixin(object): self.assertNotIn(v, body) +@override_settings(ROOT_URLCONF='view_tests.urls') class ExceptionReporterFilterTests(TestCase, ExceptionReportTestMixin): """ Ensure that sensitive information can be filtered out of error reports. Refs #14614. """ - urls = 'view_tests.urls' rf = RequestFactory() def test_non_sensitive_request(self): diff --git a/tests/view_tests/tests/test_defaults.py b/tests/view_tests/tests/test_defaults.py index 38a11dfcb1..4d08dbb579 100644 --- a/tests/view_tests/tests/test_defaults.py +++ b/tests/view_tests/tests/test_defaults.py @@ -7,9 +7,9 @@ from django.test.utils import (setup_test_template_loader, from ..models import UrlArticle +@override_settings(ROOT_URLCONF='view_tests.urls') class DefaultsTests(TestCase): """Test django views in django/views/defaults.py""" - urls = 'view_tests.urls' fixtures = ['testdata.json'] non_existing_urls = ['/non_existing_url/', # this is in urls.py '/other_non_existing_url/'] # this NOT in urls.py diff --git a/tests/view_tests/tests/test_i18n.py b/tests/view_tests/tests/test_i18n.py index fac1d7d331..8798c0d24f 100644 --- a/tests/view_tests/tests/test_i18n.py +++ b/tests/view_tests/tests/test_i18n.py @@ -17,9 +17,9 @@ from django.utils.translation import override, LANGUAGE_SESSION_KEY from ..urls import locale_dir +@override_settings(ROOT_URLCONF='view_tests.urls') class I18NTests(TestCase): """ Tests django views in django/views/i18n.py """ - urls = 'view_tests.urls' def test_setlang(self): """ @@ -85,12 +85,12 @@ class I18NTests(TestCase): self.assertContains(response, r'"month name\u0004May": "mai"', 1) +@override_settings(ROOT_URLCONF='view_tests.urls') class JsI18NTests(TestCase): """ Tests django views in django/views/i18n.py that need to change settings.LANGUAGE_CODE. """ - urls = 'view_tests.urls' def test_jsi18n_with_missing_en_files(self): """ @@ -163,8 +163,8 @@ class JsI18NTests(TestCase): self.assertContains(response, '\\ud83d\\udca9') +@override_settings(ROOT_URLCONF='view_tests.urls') class JsI18NTestsMultiPackage(TestCase): - urls = 'view_tests.urls' """ Tests for django views in django/views/i18n.py that need to change settings.LANGUAGE_CODE and merge JS translation from several packages. @@ -207,11 +207,11 @@ skip_selenium = not os.environ.get('DJANGO_SELENIUM_TESTS', False) @unittest.skipIf(skip_selenium, 'Selenium tests not requested') +@override_settings(ROOT_URLCONF='view_tests.urls') class JavascriptI18nTests(LiveServerTestCase): # The test cases use translations from these apps. available_apps = ['django.contrib.admin', 'view_tests'] - urls = 'view_tests.urls' webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver' @classmethod diff --git a/tests/view_tests/tests/test_json.py b/tests/view_tests/tests/test_json.py index b236e60c7d..505e7ad732 100644 --- a/tests/view_tests/tests/test_json.py +++ b/tests/view_tests/tests/test_json.py @@ -3,11 +3,11 @@ from __future__ import unicode_literals import json -from django.test import TestCase +from django.test import TestCase, override_settings +@override_settings(ROOT_URLCONF='view_tests.generic_urls') class JsonResponseTests(TestCase): - urls = 'view_tests.generic_urls' def test_json_response(self): response = self.client.get('/json/response/') diff --git a/tests/view_tests/tests/test_shortcuts.py b/tests/view_tests/tests/test_shortcuts.py index 7b14637143..d6a796aff4 100644 --- a/tests/view_tests/tests/test_shortcuts.py +++ b/tests/view_tests/tests/test_shortcuts.py @@ -4,9 +4,9 @@ from django.test import TestCase, override_settings @override_settings( TEMPLATE_CONTEXT_PROCESSORS=('django.core.context_processors.static',), STATIC_URL='/path/to/static/media/', + ROOT_URLCONF='view_tests.generic_urls', ) class ShortcutTests(TestCase): - urls = 'view_tests.generic_urls' def test_render_to_response(self): response = self.client.get('/shortcuts/render_to_response/') diff --git a/tests/view_tests/tests/test_specials.py b/tests/view_tests/tests/test_specials.py index 0b933ac0de..a26280da1e 100644 --- a/tests/view_tests/tests/test_specials.py +++ b/tests/view_tests/tests/test_specials.py @@ -1,14 +1,14 @@ # coding: utf-8 from __future__ import unicode_literals -from django.test import TestCase +from django.test import TestCase, override_settings +@override_settings(ROOT_URLCONF='view_tests.generic_urls') class URLHandling(TestCase): """ Tests for URL handling in views and responses. """ - urls = 'view_tests.generic_urls' redirect_target = "/%E4%B8%AD%E6%96%87/target/" def test_combining_redirect(self): diff --git a/tests/view_tests/tests/test_static.py b/tests/view_tests/tests/test_static.py index 6b2d961c5e..fc9a1edb08 100644 --- a/tests/view_tests/tests/test_static.py +++ b/tests/view_tests/tests/test_static.py @@ -14,11 +14,10 @@ from .. import urls from ..urls import media_dir -@override_settings(DEBUG=True) +@override_settings(DEBUG=True, ROOT_URLCONF='view_tests.urls') class StaticTests(SimpleTestCase): """Tests django views in django/views/static.py""" - urls = 'view_tests.urls' prefix = 'site_media' def test_serve(self): diff --git a/tests/wsgi/tests.py b/tests/wsgi/tests.py index 299beacf46..092d3a751e 100644 --- a/tests/wsgi/tests.py +++ b/tests/wsgi/tests.py @@ -12,8 +12,8 @@ from django.test.client import RequestFactory from django.utils import six +@override_settings(ROOT_URLCONF="wsgi.urls") class WSGITest(TestCase): - urls = "wsgi.urls" def setUp(self): request_started.disconnect(close_old_connections) -- cgit v1.2.1