Commit 7fa8aea8 authored by Tim Graham's avatar Tim Graham
Browse files

Made @override_settings(ROOT_URLCONF=...) consistent.

parent 10a16280

tests/admin_utils/test_logentry.py

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ from django.utils.html import escape 
from .models import Article, ArticleProxy, Site





@override_settings(ROOT_URLCONF="admin_utils.urls")

@override_settings(ROOT_URLCONF='admin_utils.urls')

class LogEntryTests(TestCase):

    def setUp(self):

        self.user = User.objects.create_superuser(username='super', password='secret', email='super@example.com')

tests/admin_widgets/tests.py

+1 −2
Original line number Diff line number Diff line
@@ -795,8 +795,7 @@ class DateTimePickerSeleniumIETests(DateTimePickerSeleniumFirefoxTests): 




@skipIf(pytz is None, "this test requires pytz")

@override_settings(TIME_ZONE='Asia/Singapore')

@override_settings(ROOT_URLCONF='admin_widgets.urls')

@override_settings(ROOT_URLCONF='admin_widgets.urls', TIME_ZONE='Asia/Singapore')

class DateTimePickerShortcutsSeleniumFirefoxTests(SeleniumDataMixin, AdminSeleniumWebDriverTestCase):

    available_apps = ['admin_widgets'] + AdminSeleniumWebDriverTestCase.available_apps

    webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver'

tests/generic_inline_admin/tests.py

+2 −2
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ class GenericInlineAdminWithUniqueTogetherTest(TestDataMixin, TestCase): 
        self.assertContains(response, 'Are you sure you want to delete')





@override_settings(ROOT_URLCONF="generic_inline_admin.urls")

@override_settings(ROOT_URLCONF='generic_inline_admin.urls')

class NoInlineDeletionTest(SimpleTestCase):



    def test_no_deletion(self):
@@ -402,7 +402,7 @@ request = MockRequest() 
request.user = MockSuperUser()





@override_settings(ROOT_URLCONF="generic_inline_admin.urls")

@override_settings(ROOT_URLCONF='generic_inline_admin.urls')

class GenericInlineModelAdminTest(SimpleTestCase):



    def setUp(self):

tests/view_tests/tests/test_csrf.py

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ from django.utils.translation import override 
from django.views.csrf import CSRF_FAILURE_TEMPLATE_NAME, csrf_failure





@override_settings(ROOT_URLCONF="view_tests.urls")

@override_settings(ROOT_URLCONF='view_tests.urls')

class CsrfViewTests(SimpleTestCase):



    def setUp(self):

tests/view_tests/tests/test_debug.py

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ class CallableSettingWrapperTests(SimpleTestCase): 
        self.assertEqual(actual, "repr from the wrapped callable")





@override_settings(DEBUG=True, ROOT_URLCONF="view_tests.urls")

@override_settings(DEBUG=True, ROOT_URLCONF='view_tests.urls')

class DebugViewTests(LoggingCaptureMixin, SimpleTestCase):



    def test_files(self):
@@ -225,7 +225,7 @@ class DebugViewQueriesAllowedTests(SimpleTestCase): 


@override_settings(

    DEBUG=True,

    ROOT_URLCONF="view_tests.urls",

    ROOT_URLCONF='view_tests.urls',

    # No template directories are configured, so no templates will be found.

    TEMPLATES=[{

        'BACKEND': 'django.template.backends.dummy.TemplateStrings',