summaryrefslogtreecommitdiff
path: root/tests/template_tests/test_response.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-12-31 13:24:00 -0500
committerTim Graham <timograham@gmail.com>2017-01-17 20:52:04 -0500
commitd334f46b7a080fd3eb720141c19b37b10704a352 (patch)
treeeeea5a2a967c3078a58455b71cfa64dc8ead2fc6 /tests/template_tests/test_response.py
parent631f4ab06112aca5bd6a57b81159048f936050bf (diff)
Refs #26601 -- Removed support for old-style middleware using settings.MIDDLEWARE_CLASSES.
Diffstat (limited to 'tests/template_tests/test_response.py')
-rw-r--r--tests/template_tests/test_response.py35
1 files changed, 2 insertions, 33 deletions
diff --git a/tests/template_tests/test_response.py b/tests/template_tests/test_response.py
index 60839f5c6b..fa851a93f2 100644
--- a/tests/template_tests/test_response.py
+++ b/tests/template_tests/test_response.py
@@ -11,8 +11,8 @@ from django.template.response import (
from django.test import (
RequestFactory, SimpleTestCase, modify_settings, override_settings,
)
-from django.test.utils import ignore_warnings, require_jinja2
-from django.utils.deprecation import MiddlewareMixin, RemovedInDjango20Warning
+from django.test.utils import require_jinja2
+from django.utils.deprecation import MiddlewareMixin
from .utils import TEMPLATE_DIR
@@ -362,34 +362,3 @@ class CacheMiddlewareTest(SimpleTestCase):
self.assertEqual(response2.status_code, 200)
self.assertNotEqual(response.content, response2.content)
-
-
-@ignore_warnings(category=RemovedInDjango20Warning)
-@override_settings(
- MIDDLEWARE=None,
- MIDDLEWARE_CLASSES=[
- 'django.middleware.cache.FetchFromCacheMiddleware',
- 'django.middleware.cache.UpdateCacheMiddleware',
- ],
- CACHE_MIDDLEWARE_SECONDS=2.0,
- ROOT_URLCONF='template_tests.alternate_urls'
-)
-class CacheMiddlewareClassesTest(SimpleTestCase):
- def test_middleware_caching(self):
- response = self.client.get('/template_response_view/')
- self.assertEqual(response.status_code, 200)
-
- time.sleep(1.0)
-
- response2 = self.client.get('/template_response_view/')
- self.assertEqual(response2.status_code, 200)
-
- self.assertEqual(response.content, response2.content)
-
- time.sleep(2.0)
-
- # Let the cache expire and test again
- response2 = self.client.get('/template_response_view/')
- self.assertEqual(response2.status_code, 200)
-
- self.assertNotEqual(response.content, response2.content)