diff options
| author | Alexey Boriskin <sun.void@gmail.com> | 2012-08-23 11:18:41 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2012-08-23 11:27:56 +0200 |
| commit | 10d32072afa1e1d4391108191800ce7007a63f2e (patch) | |
| tree | 567d8afbee7442acd8245ec843a385db1399bbc4 /tests | |
| parent | 44c09de555f83b0596a0886e3f51a9a84368d036 (diff) | |
Fixed #18798 -- Renamed conflicting test methods in i18n tests
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/regressiontests/i18n/tests.py | 4 |
1 files 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) |