Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Added tests for LocalMemCache deadlocks. refs #20613 and refs #18541.

Thanks Zach Smith for the patch.
  • Loading branch information...
commit 6c5a30b4e7f51e8c255dc104714d5748e5b5870c 1 parent 02add43
@timgraham timgraham authored
Showing with 21 additions and 0 deletions.
  1. +21 −0 tests/cache/tests.py
View
21 tests/cache/tests.py
@@ -990,6 +990,18 @@ def test_createcachetable_observes_database_router(self):
router.routers = old_routers
+class PicklingSideEffect(object):
+
+ def __init__(self, cache):
+ self.cache = cache
+ self.locked = False
+
+ def __getstate__(self):
+ if self.cache._lock.active_writers:
+ self.locked = True
+ return {}
+
+
@override_settings(CACHES=caches_setting_for_tests(
BACKEND='django.core.cache.backends.locmem.LocMemCache',
))
@@ -1025,6 +1037,15 @@ def test_multiple_caches(self):
self.assertEqual(caches['default'].get('value'), 42)
self.assertEqual(caches['other'].get('value'), None)
+ def test_locking_on_pickle(self):
+ """#20613/#18541 -- Ensures pickling is done outside of the lock."""
+ bad_obj = PicklingSideEffect(cache)
+ cache.set('set', bad_obj)
+ self.assertFalse(bad_obj.locked, "Cache was locked during pickling")
+
+ cache.add('add', bad_obj)
+ self.assertFalse(bad_obj.locked, "Cache was locked during pickling")
+
def test_incr_decr_timeout(self):
"""incr/decr does not modify expiry time (matches memcached behavior)"""
key = 'value'
Please sign in to comment.
Something went wrong with that request. Please try again.