From 66757fee7e921ad4c35e0b3f80c25e026100b31c Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Fri, 29 Aug 2014 14:54:08 +0200 Subject: Fixed #23384 -- Allowed overriding part of a dictionary-type setting This change is needed for upcoming changes where settings might be grouped in a parent dictionary. Thanks Tim Graham for the review. --- tests/cache/tests.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tests/cache') diff --git a/tests/cache/tests.py b/tests/cache/tests.py index 4677791fcd..2ee7a6200b 100644 --- a/tests/cache/tests.py +++ b/tests/cache/tests.py @@ -522,6 +522,7 @@ class BaseCacheTests(object): def _perform_cull_test(self, cull_cache, initial_count, final_count): # Create initial cache key entries. This will overflow the cache, # causing a cull. + cull_cache.clear() for i in range(1, initial_count): cull_cache.set('cull%d' % i, 'value', 1000) count = 0 @@ -918,7 +919,10 @@ class DBCacheTests(BaseCacheTests, TransactionTestCase): stdout=stdout ) self.assertEqual(stdout.getvalue(), - "Cache table 'test cache table' already exists.\n" * len(settings.CACHES)) + "Cache table 'test cache table' already exists.\n" * len([ + k for k, v in settings.CACHES.items() + if v['BACKEND']=='django.core.cache.backends.db.DatabaseCache']) + ) def test_createcachetable_with_table_argument(self): """ -- cgit v1.3