1
0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00

Revert "Fixed #23384 -- Allowed overriding part of a dictionary-type setting"

This reverts commit 66757fee7e.
Discussions have led to think that this functionality does not
bring significant benefits to justify the added complexity.
Read also discussions on ticket #22734.
This commit is contained in:
Claude Paroz
2014-09-05 20:06:02 +02:00
parent 5d04433903
commit 885ff6845e
9 changed files with 5 additions and 123 deletions

View File

@@ -522,7 +522,6 @@ 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
@@ -919,10 +918,7 @@ class DBCacheTests(BaseCacheTests, TransactionTestCase):
stdout=stdout
)
self.assertEqual(stdout.getvalue(),
"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'])
)
"Cache table 'test cache table' already exists.\n" * len(settings.CACHES))
def test_createcachetable_with_table_argument(self):
"""