Commit d7c6a57d authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Used @override_settings in several tests.

parent 2f722d97

tests/regressiontests/forms/tests/extra.py

+2 −5
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ from __future__ import absolute_import, unicode_literals 


import datetime



from django.conf import settings

from django.forms import *

from django.forms.extras import SelectDateWidget

from django.forms.util import ErrorList

from django.test import TestCase

from django.test.utils import override_settings

from django.utils import six

from django.utils import translation

from django.utils.encoding import force_text, smart_text, python_2_unicode_compatible
@@ -642,17 +642,14 @@ class FormsExtraTestCase(TestCase, AssertFormErrorsMixin): 
        self.assertFalse(b.has_changed())







@override_settings(USE_L10N=True)

class FormsExtraL10NTestCase(TestCase):

    def setUp(self):

        super(FormsExtraL10NTestCase, self).setUp()

        self.old_use_l10n = getattr(settings, 'USE_L10N', False)

        settings.USE_L10N = True

        translation.activate('nl')



    def tearDown(self):

        translation.deactivate()

        settings.USE_L10N = self.old_use_l10n

        super(FormsExtraL10NTestCase, self).tearDown()



    def test_l10n(self):

tests/regressiontests/forms/tests/input_formats.py

+9 −49
Original line number Diff line number Diff line 
from datetime import time, date, datetime



from django import forms

from django.conf import settings

from django.test.utils import override_settings

from django.utils.translation import activate, deactivate

from django.utils.unittest import TestCase





@override_settings(TIME_INPUT_FORMATS=["%I:%M:%S %p", "%I:%M %p"], USE_L10N=True)

class LocalizedTimeTests(TestCase):

    def setUp(self):

        self.old_TIME_INPUT_FORMATS = settings.TIME_INPUT_FORMATS

        self.old_USE_L10N = settings.USE_L10N



        settings.TIME_INPUT_FORMATS = ["%I:%M:%S %p", "%I:%M %p"]

        settings.USE_L10N = True



        activate('de')



    def tearDown(self):

        settings.TIME_INPUT_FORMATS = self.old_TIME_INPUT_FORMATS

        settings.USE_L10N = self.old_USE_L10N



        deactivate()



    def test_timeField(self):
@@ -113,14 +105,8 @@ class LocalizedTimeTests(TestCase): 
        self.assertEqual(text, "13:30:00")





@override_settings(TIME_INPUT_FORMATS=["%I:%M:%S %p", "%I:%M %p"])

class CustomTimeInputFormatsTests(TestCase):

    def setUp(self):

        self.old_TIME_INPUT_FORMATS = settings.TIME_INPUT_FORMATS

        settings.TIME_INPUT_FORMATS = ["%I:%M:%S %p", "%I:%M %p"]



    def tearDown(self):

        settings.TIME_INPUT_FORMATS = self.old_TIME_INPUT_FORMATS



    def test_timeField(self):

        "TimeFields can parse dates in the default format"

        f = forms.TimeField()
@@ -302,20 +288,12 @@ class SimpleTimeFormatTests(TestCase): 
        self.assertEqual(text, "13:30:00")





@override_settings(DATE_INPUT_FORMATS=["%d/%m/%Y", "%d-%m-%Y"], USE_L10N=True)

class LocalizedDateTests(TestCase):

    def setUp(self):

        self.old_DATE_INPUT_FORMATS = settings.DATE_INPUT_FORMATS

        self.old_USE_L10N = settings.USE_L10N



        settings.DATE_INPUT_FORMATS = ["%d/%m/%Y", "%d-%m-%Y"]

        settings.USE_L10N = True



        activate('de')



    def tearDown(self):

        settings.DATE_INPUT_FORMATS = self.old_DATE_INPUT_FORMATS

        settings.USE_L10N = self.old_USE_L10N



        deactivate()



    def test_dateField(self):
@@ -410,14 +388,9 @@ class LocalizedDateTests(TestCase): 
        text = f.widget._format_value(result)

        self.assertEqual(text, "21.12.2010")



class CustomDateInputFormatsTests(TestCase):

    def setUp(self):

        self.old_DATE_INPUT_FORMATS = settings.DATE_INPUT_FORMATS

        settings.DATE_INPUT_FORMATS = ["%d.%m.%Y", "%d-%m-%Y"]



    def tearDown(self):

        settings.DATE_INPUT_FORMATS = self.old_DATE_INPUT_FORMATS



@override_settings(DATE_INPUT_FORMATS=["%d.%m.%Y", "%d-%m-%Y"])

class CustomDateInputFormatsTests(TestCase):

    def test_dateField(self):

        "DateFields can parse dates in the default format"

        f = forms.DateField()
@@ -597,20 +570,13 @@ class SimpleDateFormatTests(TestCase): 
        text = f.widget._format_value(result)

        self.assertEqual(text, "2010-12-21")





@override_settings(DATETIME_INPUT_FORMATS=["%I:%M:%S %p %d/%m/%Y", "%I:%M %p %d-%m-%Y"], USE_L10N=True)

class LocalizedDateTimeTests(TestCase):

    def setUp(self):

        self.old_DATETIME_INPUT_FORMATS = settings.DATETIME_INPUT_FORMATS

        self.old_USE_L10N = settings.USE_L10N



        settings.DATETIME_INPUT_FORMATS = ["%I:%M:%S %p %d/%m/%Y", "%I:%M %p %d-%m-%Y"]

        settings.USE_L10N = True



        activate('de')



    def tearDown(self):

        settings.DATETIME_INPUT_FORMATS = self.old_DATETIME_INPUT_FORMATS

        settings.USE_L10N = self.old_USE_L10N



        deactivate()



    def test_dateTimeField(self):
@@ -706,14 +672,8 @@ class LocalizedDateTimeTests(TestCase): 
        self.assertEqual(text, "21.12.2010 13:30:00")





@override_settings(DATETIME_INPUT_FORMATS=["%I:%M:%S %p %d/%m/%Y", "%I:%M %p %d-%m-%Y"])

class CustomDateTimeInputFormatsTests(TestCase):

    def setUp(self):

        self.old_DATETIME_INPUT_FORMATS = settings.DATETIME_INPUT_FORMATS

        settings.DATETIME_INPUT_FORMATS = ["%I:%M:%S %p %d/%m/%Y", "%I:%M %p %d-%m-%Y"]



    def tearDown(self):

        settings.DATETIME_INPUT_FORMATS = self.old_DATETIME_INPUT_FORMATS



    def test_dateTimeField(self):

        "DateTimeFields can parse dates in the default format"

        f = forms.DateTimeField()

tests/regressiontests/forms/tests/widgets.py

+2 −4
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ from __future__ import unicode_literals 
import copy

import datetime



from django.conf import settings

from django.core.files.uploadedfile import SimpleUploadedFile

from django.forms import *

from django.forms.widgets import RadioFieldRenderer
@@ -13,6 +12,7 @@ from django.utils.safestring import mark_safe 
from django.utils import six

from django.utils.translation import activate, deactivate

from django.test import TestCase

from django.test.utils import override_settings

from django.utils.encoding import python_2_unicode_compatible
@@ -989,16 +989,14 @@ class NullBooleanSelectLazyForm(Form): 
    """Form to test for lazy evaluation. Refs #17190"""

    bool = BooleanField(widget=NullBooleanSelect())



@override_settings(USE_L10N=True)

class FormsI18NWidgetsTestCase(TestCase):

    def setUp(self):

        super(FormsI18NWidgetsTestCase, self).setUp()

        self.old_use_l10n = getattr(settings, 'USE_L10N', False)

        settings.USE_L10N = True

        activate('de-at')



    def tearDown(self):

        deactivate()

        settings.USE_L10N = self.old_use_l10n

        super(FormsI18NWidgetsTestCase, self).tearDown()



    def test_splitdatetime(self):

tests/regressiontests/handlers/tests.py

+3 −7
Original line number Diff line number Diff line 
from django.conf import settings

from django.core.handlers.wsgi import WSGIHandler

from django.test import RequestFactory

from django.test.utils import override_settings

from django.utils import unittest





class HandlerTests(unittest.TestCase):



    # Mangle settings so the handler will fail

    @override_settings(MIDDLEWARE_CLASSES=42)

    def test_lock_safety(self):

        """

        Tests for bug #11193 (errors inside middleware shouldn't leave

        the initLock locked).

        """

        # Mangle settings so the handler will fail

        old_middleware_classes = settings.MIDDLEWARE_CLASSES

        settings.MIDDLEWARE_CLASSES = 42

        # Try running the handler, it will fail in load_middleware

        handler = WSGIHandler()

        self.assertEqual(handler.initLock.locked(), False)

        with self.assertRaises(Exception):

            handler(None, None)

        self.assertEqual(handler.initLock.locked(), False)

        # Reset settings

        settings.MIDDLEWARE_CLASSES = old_middleware_classes



    def test_bad_path_info(self):

        """Tests for bug #15672 ('request' referenced before assignment)"""

tests/regressiontests/multiple_database/tests.py

+3 −12
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ import datetime 
import pickle

from operator import attrgetter



from django.conf import settings

from django.contrib.auth.models import User

from django.contrib.contenttypes.models import ContentType

from django.core import management

from django.db import connections, router, DEFAULT_DB_ALIAS

from django.db.models import signals

from django.test import TestCase

from django.test.utils import override_settings

from django.utils.six import StringIO



from .models import Book, Person, Pet, Review, UserProfile
@@ -1620,20 +1620,11 @@ class AuthTestCase(TestCase): 
        command_output = new_io.getvalue().strip()

        self.assertTrue('"email": "alice@example.com",' in command_output)



_missing = object()

class UserProfileTestCase(TestCase):

    def setUp(self):

        self.old_auth_profile_module = getattr(settings, 'AUTH_PROFILE_MODULE', _missing)

        settings.AUTH_PROFILE_MODULE = 'multiple_database.UserProfile'



    def tearDown(self):

        if self.old_auth_profile_module is _missing:

            del settings.AUTH_PROFILE_MODULE

        else:

            settings.AUTH_PROFILE_MODULE = self.old_auth_profile_module

@override_settings(AUTH_PROFILE_MODULE='multiple_database.UserProfile')

class UserProfileTestCase(TestCase):



    def test_user_profiles(self):



        alice = User.objects.create_user('alice', 'alice@example.com')

        bob = User.objects.db_manager('other').create_user('bob', 'bob@example.com')