innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed regression from ffc37e2343. 

This (hopefully) ensures that the cache are created the same way as before
the offending commit.
This commit is contained in:
Florian Apolloner 2013-11-24 11:49:32 +01:00
parent 7169722d5c
commit 3ea65d1f68
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/cache/tests.py vendored
View File

@ -207,9 +207,16 @@ _caches_setting_base = {
} }
def caches_setting_for_tests(**params): def caches_setting_for_tests(base=None, **params):
setting = dict((k, v.copy()) for k, v in _caches_setting_base.items()) # `base` is used to pull in the memcached config from the original settings,
for cache_params in setting.values(): # `params` are test specific overrides and `_caches_settings_base` is the
# base config for the tests.
# This results in the following search order:
# params -> _caches_setting_base -> base
base = base or {}
setting = dict((k, base.copy()) for k in _caches_setting_base.keys())
for key, cache_params in setting.items():
cache_params.update(_caches_setting_base[key])
cache_params.update(params) cache_params.update(params)
return setting return setting
@ -1036,7 +1043,7 @@ for _cache_params in settings.CACHES.values():
@unittest.skipUnless(memcached_params, "memcached not available") @unittest.skipUnless(memcached_params, "memcached not available")
@override_settings(CACHES=caches_setting_for_tests(**memcached_params)) @override_settings(CACHES=caches_setting_for_tests(base=memcached_params))
class MemcachedCacheTests(BaseCacheTests, TestCase): class MemcachedCacheTests(BaseCacheTests, TestCase):
def test_invalid_keys(self): def test_invalid_keys(self):
@ -1056,8 +1063,7 @@ class MemcachedCacheTests(BaseCacheTests, TestCase):
# Explicitly display a skipped test if no configured cache uses MemcachedCache # Explicitly display a skipped test if no configured cache uses MemcachedCache
@unittest.skipUnless( @unittest.skipUnless(
any(c['BACKEND'] == 'django.core.cache.backends.memcached.MemcachedCache' memcached_params['BACKEND'] == 'django.core.cache.backends.memcached.MemcachedCache',
for c in settings.CACHES.values()),
"cache with python-memcached library not available") "cache with python-memcached library not available")
def test_memcached_uses_highest_pickle_version(self): def test_memcached_uses_highest_pickle_version(self):
# Regression test for #19810 # Regression test for #19810