Rolled back r16510, r16513 and r16514 because it wasn't ready.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16515 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 2 insertions, 39 deletions

diff --git a/tests/regressiontests/cache/tests.py b/tests/regressiontests/cache/tests.py
index 958dcfb6a4..d206b462bc 100644
--- a/tests/regressiontests/cache/tests.py
+++ b/tests/regressiontests/cache/tests.py
@@ -14,11 +14,10 @@ from django.conf import settings
 from django.core import management
 from django.core.cache import get_cache, DEFAULT_CACHE_ALIAS
 from django.core.cache.backends.base import CacheKeyWarning, InvalidCacheBackendError
-from django.db import router
 from django.http import HttpResponse, HttpRequest, QueryDict
 from django.middleware.cache import FetchFromCacheMiddleware, UpdateCacheMiddleware, CacheMiddleware
-from django.test import RequestFactory, TestCase
-from django.test.utils import get_warnings_state, restore_warnings_state, override_settings
+from django.test import RequestFactory
+from django.test.utils import get_warnings_state, restore_warnings_state
 from django.utils import translation
 from django.utils import unittest
 from django.utils.cache import patch_vary_headers, get_cache_key, learn_cache_key
@@ -759,42 +758,6 @@ class DBCacheTests(unittest.TestCase, BaseCacheTests):
         self.cache = get_cache('db://%s?max_entries=30&cull_frequency=0' % self._table_name)
         self.perform_cull_test(50, 18)
 
-class DBCacheRouter(object):
-    """A router that puts the cache table on the 'other' database."""
-
-    def db_for_read(self, model, **hints):
-        if model._meta.app_label == 'django_cache':
-            return 'other'
-
-    def db_for_write(self, model, **hints):
-        if model._meta.app_label == 'django_cache':
-            return 'other'
-
-    def allow_syncdb(self, db, model):
-        if model._meta.app_label == 'django_cache':
-            return db == 'other'
-
-
-class CreateCacheTableForDBCacheTests(TestCase):
-    multi_db = True
-
-    def test_createcachetable_observes_database_router(self):
-        old_routers = router.routers
-        try:
-            router.routers = [DBCacheRouter()]
-            # cache table should not be created on 'default'
-            with self.assertNumQueries(0):
-                management.call_command('createcachetable', 'cache_table',
-                                        database='default',
-                                        verbosity=0, interactive=False)
-            # cache table should be created on 'other'
-            with self.assertNumQueries(1):
-                management.call_command('createcachetable', 'cache_table',
-                                        database='other',
-                                        verbosity=0, interactive=False)
-        finally:
-            router.routers = old_routers
-
 
 class LocMemCacheTests(unittest.TestCase, BaseCacheTests):
     backend_name = 'django.core.cache.backends.locmem.LocMemCache'