From 10d32072afa1e1d4391108191800ce7007a63f2e Mon Sep 17 00:00:00 2001 From: Alexey Boriskin Date: Thu, 23 Aug 2012 11:18:41 +0200 Subject: [PATCH] Fixed #18798 -- Renamed conflicting test methods in i18n tests --- tests/regressiontests/i18n/tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/regressiontests/i18n/tests.py b/tests/regressiontests/i18n/tests.py index c13c1c6f86..bce3d617d2 100644 --- a/tests/regressiontests/i18n/tests.py +++ b/tests/regressiontests/i18n/tests.py @@ -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)