Commit 10d32072 authored by Alexey Boriskin's avatar Alexey Boriskin Committed by Claude Paroz
Browse files

Fixed #18798 -- Renamed conflicting test methods in i18n tests

parent 44c09de5

tests/regressiontests/i18n/tests.py

+2 −2
Original line number Diff line number Diff line
@@ -808,13 +808,13 @@ class MiscTests(TestCase): 
        r.META = {'HTTP_ACCEPT_LANGUAGE': 'de'}

        self.assertEqual(g(r), 'zh-cn')



    def test_get_language_from_path(self):

    def test_get_language_from_path_real(self):

        from django.utils.translation.trans_real import get_language_from_path as g

        self.assertEqual(g('/pl/'), 'pl')

        self.assertEqual(g('/pl'), 'pl')

        self.assertEqual(g('/xyz/'), None)



    def test_get_language_from_path(self):

    def test_get_language_from_path_null(self):

        from django.utils.translation.trans_null import get_language_from_path as g

        self.assertEqual(g('/pl/'), None)

        self.assertEqual(g('/pl'), None)