mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-27 07:36:08 +00:00
Code Issues 32 Releases Wiki Activity

[1.10.x] Fixed #26888 -- Fixed concurrency issue in URL resolver.

Browse Source 
Fixed a regression in 625b8e9295:
improper short-circuiting could lead to a KeyError when threads
concurrently call RegexURLResolver._populate().

Backport of 389a5318a0 from master
This commit is contained in:
Marten Kenbeek
2016-07-14 20:41:52 +02:00
committed by Tim Graham
parent 96a37a0266
commit 06323dafc7
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/urlpatterns_reverse/tests.py
View File

@@ -5,6 +5,7 @@ Unit tests for reverse URL lookups.
from __future__ import unicode_literals
import sys
import threading
from admin_scripts.tests import AdminScriptTestCase
@@ -429,6 +430,18 @@ class ResolverTests(SimpleTestCase):
self.assertTrue(resolver._is_callback('urlpatterns_reverse.nested_urls.View3'))
self.assertFalse(resolver._is_callback('urlpatterns_reverse.nested_urls.blub'))
def test_populate_concurrency(self):
"""
RegexURLResolver._populate() can be called concurrently, but not more
than once per thread (#26888).
"""
resolver = RegexURLResolver(r'^/', 'urlpatterns_reverse.urls')
resolver._local.populating = True
thread = threading.Thread(target=resolver._populate)
thread.start()
thread.join()
self.assertNotEqual(resolver._reverse_dict, {})
@override_settings(ROOT_URLCONF='urlpatterns_reverse.reverse_lazy_urls')
class ReverseLazyTest(TestCase):