Commit b67f2ac8 authored by Claude Paroz's avatar Claude Paroz
Browse files

Fixed #20502 (again) -- More i18n cache flush in tests 

Thanks Timo Graham for noticing the failures.
parent 9ed971f4

django/contrib/humanize/tests.py

+3 −1
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ from django.utils.translation import ugettext as _ 
from django.utils import tzinfo

from django.utils.unittest import skipIf



from i18n import TransRealMixin





# Mock out datetime in some tests so they don't fail occasionally when they

# run too slow. Use a fixed datetime for datetime.now(). DST change in
@@ -36,7 +38,7 @@ class MockDateTime(datetime.datetime): 
            return now.replace(tzinfo=tz) + tz.utcoffset(now)





class HumanizeTests(TestCase):

class HumanizeTests(TransRealMixin, TestCase):



    def humanize_tester(self, test_list, result_list, method):

        for test_content, result in zip(test_list, result_list):

tests/forms_tests/tests/test_regressions.py

+2 −1
Original line number Diff line number Diff line
@@ -8,9 +8,10 @@ from django.test import TestCase 
from django.utils.translation import ugettext_lazy, override



from forms_tests.models import Cheese

from i18n import TransRealMixin





class FormsRegressionsTestCase(TestCase):

class FormsRegressionsTestCase(TransRealMixin, TestCase):

    def test_class(self):

        # Tests to prevent against recurrences of earlier bugs.

        extra_attrs = {'class': 'special'}

tests/template_tests/tests.py

+9 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ from django.utils.safestring import mark_safe 
from django.utils import six

from django.utils.tzinfo import LocalTimezone



from i18n import TransRealMixin



try:

    from .loaders import RenderToStringTest, EggLoaderTest
@@ -154,8 +155,8 @@ class UTF8Class: 
    def __str__(self):

        return 'ŠĐĆŽćžšđ'



@override_settings(MEDIA_URL="/media/", STATIC_URL="/static/")

class Templates(TestCase):



class TemplateLoaderTests(TestCase):



    def test_loaders_security(self):

        ad_loader = app_directories.Loader()
@@ -347,6 +348,9 @@ class Templates(TestCase): 
            loader.template_source_loaders = old_loaders

            settings.TEMPLATE_DEBUG = old_td





class TemplateRegressionTests(TestCase):



    def test_token_smart_split(self):

        # Regression test for #7027

        token = template.Token(template.TOKEN_BLOCK, 'sometag _("Page not found") value|yesno:_("yes,no")')
@@ -453,6 +457,9 @@ class Templates(TestCase): 
        with self.assertRaises(urlresolvers.NoReverseMatch):

            t.render(Context({}))





@override_settings(MEDIA_URL="/media/", STATIC_URL="/static/")

class TemplateTests(TransRealMixin, TestCase):

    def test_templates(self):

        template_tests = self.get_template_tests()

        filter_tests = filters.get_filter_tests()