test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.7.x] Fixed #22845 -- Correctly handled memcached default timeout value. 

Backport of 4529af9ecf from master
This commit is contained in:
Vincent-Vega 2014-06-16 12:46:34 +04:00 committed by Tim Graham
parent d36b54d753
commit 6e248d8f8c
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/core/cache/backends/memcached.py vendored
View File

@ -49,7 +49,7 @@ class BaseMemcachedCache(six.with_metaclass(BaseMemcachedCacheMethods, BaseCache
way. Call this function to obtain a safe value for your timeout. way. Call this function to obtain a safe value for your timeout.
""" """
if timeout == DEFAULT_TIMEOUT: if timeout == DEFAULT_TIMEOUT:
return self.default_timeout timeout = self.default_timeout
if timeout is None: if timeout is None:
# Using 0 in memcache sets a non-expiring timeout. # Using 0 in memcache sets a non-expiring timeout.

18
tests/cache/tests.py vendored
View File

@ -1076,6 +1076,12 @@ for _cache_params in settings.CACHES.values():
if _cache_params['BACKEND'].startswith('django.core.cache.backends.memcached.'): if _cache_params['BACKEND'].startswith('django.core.cache.backends.memcached.'):
memcached_params = _cache_params memcached_params = _cache_params
memcached_never_expiring_params = memcached_params.copy()
memcached_never_expiring_params['TIMEOUT'] = None
memcached_far_future_params = memcached_params.copy()
memcached_far_future_params['TIMEOUT'] = 31536000 # 60*60*24*365, 1 year
@unittest.skipUnless(memcached_params, "memcached not available") @unittest.skipUnless(memcached_params, "memcached not available")
@override_settings(CACHES=caches_setting_for_tests(base=memcached_params)) @override_settings(CACHES=caches_setting_for_tests(base=memcached_params))
@ -1107,6 +1113,18 @@ class MemcachedCacheTests(BaseCacheTests, TestCase):
self.assertEqual(caches[cache_key]._cache.pickleProtocol, self.assertEqual(caches[cache_key]._cache.pickleProtocol,
pickle.HIGHEST_PROTOCOL) pickle.HIGHEST_PROTOCOL)
@override_settings(CACHES=caches_setting_for_tests(base=memcached_never_expiring_params))
def test_default_never_expiring_timeout(self):
# Regression test for #22845
cache.set('infinite_foo', 'bar')
self.assertEqual(cache.get('infinite_foo'), 'bar')
@override_settings(CACHES=caches_setting_for_tests(base=memcached_far_future_params))
def test_default_far_future_timeout(self):
# Regression test for #22845
cache.set('future_foo', 'bar')
self.assertEqual(cache.get('future_foo'), 'bar')
def test_cull(self): def test_cull(self):
# culling isn't implemented, memcached deals with it. # culling isn't implemented, memcached deals with it.
pass pass