Commit 1a2f9ff9 authored by Ramiro Morales's avatar Ramiro Morales
Browse files

Modified a few tests methods to make sure no leaks of activated locale or... 

Modified a few tests methods to make sure no leaks of activated locale or USE_I10N setting value happen between tests.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 090ff642

tests/regressiontests/admin_widgets/tests.py

+10 −8
Original line number Diff line number Diff line
@@ -210,12 +210,14 @@ class AdminSplitDateTimeWidgetTest(TestCase): 


        activate('de-at')

        old_USE_L10N = settings.USE_L10N

        try:

            settings.USE_L10N = True

            w.is_localized = True

            self.assertEqual(

                conditional_escape(w.render('test', datetime(2007, 12, 1, 9, 30))),

                '<p class="datetime">Datum: <input value="01.12.2007" type="text" class="vDateField" name="test_0" size="10" /><br />Zeit: <input value="09:30:00" type="text" class="vTimeField" name="test_1" size="8" /></p>',

            )

        finally:

            deactivate()

            settings.USE_L10N = old_USE_L10N

tests/regressiontests/i18n/tests.py

+12 −17
Original line number Diff line number Diff line
@@ -253,10 +253,8 @@ class FormattingTests(TestCase): 
            deactivate()



    def test_l10n_enabled(self):

        """

        Catalan locale

        """

        settings.USE_L10N = True

        # Catalan locale

        activate('ca')

        try:

            self.assertEqual('j \de F \de Y', get_format('DATE_FORMAT'))
@@ -345,15 +343,15 @@ class FormattingTests(TestCase): 


        # Russian locale (with E as month)

        activate('ru')

        try:

            self.assertEqual(

                    u'<select name="mydate_day" id="id_mydate_day">\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31" selected="selected">31</option>\n</select>\n<select name="mydate_month" id="id_mydate_month">\n<option value="1">\u042f\u043d\u0432\u0430\u0440\u044c</option>\n<option value="2">\u0424\u0435\u0432\u0440\u0430\u043b\u044c</option>\n<option value="3">\u041c\u0430\u0440\u0442</option>\n<option value="4">\u0410\u043f\u0440\u0435\u043b\u044c</option>\n<option value="5">\u041c\u0430\u0439</option>\n<option value="6">\u0418\u044e\u043d\u044c</option>\n<option value="7">\u0418\u044e\u043b\u044c</option>\n<option value="8">\u0410\u0432\u0433\u0443\u0441\u0442</option>\n<option value="9">\u0421\u0435\u043d\u0442\u044f\u0431\u0440\u044c</option>\n<option value="10">\u041e\u043a\u0442\u044f\u0431\u0440\u044c</option>\n<option value="11">\u041d\u043e\u044f\u0431\u0440\u044c</option>\n<option value="12" selected="selected">\u0414\u0435\u043a\u0430\u0431\u0440\u044c</option>\n</select>\n<select name="mydate_year" id="id_mydate_year">\n<option value="2009" selected="selected">2009</option>\n<option value="2010">2010</option>\n<option value="2011">2011</option>\n<option value="2012">2012</option>\n<option value="2013">2013</option>\n<option value="2014">2014</option>\n<option value="2015">2015</option>\n<option value="2016">2016</option>\n<option value="2017">2017</option>\n<option value="2018">2018</option>\n</select>',

                    SelectDateWidget(years=range(2009, 2019)).render('mydate', datetime.date(2009, 12, 31))

            )

        finally:

            deactivate()



        # English locale



        settings.USE_L10N = True

        activate('en')

        try:

            self.assertEqual('N j, Y', get_format('DATE_FORMAT'))
@@ -487,13 +485,10 @@ class FormattingTests(TestCase): 
        Tests the iter_format_modules function always yields format modules in

        a stable and correct order in presence of both base ll and ll_CC formats.

        """

        try:

            old_l10n, settings.USE_L10N = settings.USE_L10N, True

        settings.USE_L10N = True

        en_format_mod = import_module('django.conf.locale.en.formats')

        en_gb_format_mod = import_module('django.conf.locale.en_GB.formats')

        self.assertEqual(list(iter_format_modules('en-gb')), [en_gb_format_mod, en_format_mod])

        finally:

            settings.USE_L10N = old_l10n



    def test_get_format_modules_stability(self):

        activate('de')