summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-08-15 18:07:03 +0200
committerClaude Paroz <claude@2xlibre.net>2012-08-15 18:07:03 +0200
commit27192564c3193a54165752e8803b4d7b635f9022 (patch)
treece59960bec991baf040efca96d5f8e6db7efd71b
parenta9facb455f6f0d5a2d3d594832cecccbee323d6b (diff)
Run memcache tests if any cache is configured
-rw-r--r--tests/regressiontests/cache/tests.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/regressiontests/cache/tests.py b/tests/regressiontests/cache/tests.py
index 3c7c2115ed..19ab65b666 100644
--- a/tests/regressiontests/cache/tests.py
+++ b/tests/regressiontests/cache/tests.py
@@ -932,16 +932,20 @@ class LocMemCacheTests(unittest.TestCase, BaseCacheTests):
# memcached backend isn't guaranteed to be available.
# To check the memcached backend, the test settings file will
-# need to contain a cache backend setting that points at
+# need to contain at least one cache backend setting that points at
# your memcache server.
@unittest.skipUnless(
- settings.CACHES[DEFAULT_CACHE_ALIAS]['BACKEND'].startswith('django.core.cache.backends.memcached.'),
+ any(cache['BACKEND'].startswith('django.core.cache.backends.memcached.')
+ for cache in settings.CACHES.values()),
"memcached not available")
class MemcachedCacheTests(unittest.TestCase, BaseCacheTests):
backend_name = 'django.core.cache.backends.memcached.MemcachedCache'
def setUp(self):
- name = settings.CACHES[DEFAULT_CACHE_ALIAS]['LOCATION']
+ for cache in settings.CACHES.values():
+ if cache['BACKEND'].startswith('django.core.cache.backends.memcached.'):
+ name = cache['LOCATION']
+ break
self.cache = get_cache(self.backend_name, LOCATION=name)
self.prefix_cache = get_cache(self.backend_name, LOCATION=name, KEY_PREFIX='cacheprefix')
self.v2_cache = get_cache(self.backend_name, LOCATION=name, VERSION=2)