diff options
author | Carl Meyer <carl@oddbird.net> | 2016-11-06 13:52:07 +0100 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2016-11-14 18:58:23 -0500 |
commit | 6e222dae5636f875c19ec66f730a4241abe33faa (patch) | |
tree | fbe688ec57639e9ac3e7086016c077dbe88a814f /tests/urlpatterns_reverse | |
parent | e454db3eeeb7be33875181955b543f9d6a3d329a (diff) | |
download | django-6e222dae5636f875c19ec66f730a4241abe33faa.tar.gz |
Fixed #27453 -- Avoided unnecessary recompilation of non-translated URL regexes.
Diffstat (limited to 'tests/urlpatterns_reverse')
-rw-r--r-- | tests/urlpatterns_reverse/test_localeregexprovider.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/tests/urlpatterns_reverse/test_localeregexprovider.py b/tests/urlpatterns_reverse/test_localeregexprovider.py index 9da8df656c..401e9a1ad0 100644 --- a/tests/urlpatterns_reverse/test_localeregexprovider.py +++ b/tests/urlpatterns_reverse/test_localeregexprovider.py @@ -5,6 +5,7 @@ import os from django.core.exceptions import ImproperlyConfigured from django.test import SimpleTestCase, mock, override_settings from django.urls import LocaleRegexProvider +from django.urls.resolvers import LocaleRegexDescriptor from django.utils import translation from django.utils._os import upath @@ -33,9 +34,24 @@ class LocaleRegexProviderTests(SimpleTestCase): self.assertEqual(de_compiled.pattern, '^foo-de/$') self.assertEqual(de_compiled, de_compiled_2) + def test_nontranslated_regex_compiled_once(self): + provider = LocaleRegexProvider('^foo/$') + with translation.override('de'): + de_compiled = provider.regex + with translation.override('fr'): + # compiled only once, regardless of language + error = AssertionError('tried to compile non-translated url regex twice') + with mock.patch('django.urls.resolvers.re.compile', side_effect=error): + fr_compiled = provider.regex + self.assertEqual(de_compiled.pattern, '^foo/$') + self.assertEqual(fr_compiled.pattern, '^foo/$') + def test_regex_compile_error(self): """Regex errors are re-raised as ImproperlyConfigured.""" provider = LocaleRegexProvider('*') msg = '"*" is not a valid regular expression: nothing to repeat' with self.assertRaisesMessage(ImproperlyConfigured, msg): provider.regex + + def test_access_locale_regex_descriptor(self): + self.assertIsInstance(LocaleRegexProvider.regex, LocaleRegexDescriptor) |