Ticket #15144: tests_demonstrating_regression.diff

tests/regressiontests/cache/tests.py

@@ -1201 +1201 @@
 
         other_view = cache_page(cache='other')(view)
         other_with_prefix_view = cache_page(cache='other', key_prefix='prefix2')(view)
-
+        other_with_timeout_view = cache_page(4, cache='other', key_prefix='prefix3')(view)
+        
         factory = RequestFactory()
         request = factory.get('/view/')
 
@@ -1240 +1241 @@
         # And prefixing the alternate cache yields yet another cache entry
         response = other_with_prefix_view(request, '9')
         self.assertEquals(response.content, 'Hello World 9')
-
+        
+        # Request from the alternate cache with a new prefix and a custom timeout
+        response = other_with_timeout_view(request, '20')
+        self.assertEquals(response.content, 'Hello World 20')
+        
         # But if we wait a couple of seconds...
         time.sleep(2)
 
@@ -1268 +1273 @@
         # .. even if it has a prefix
         response = other_with_prefix_view(request, '15')
         self.assertEquals(response.content, 'Hello World 15')
+        
+        # ... but a view with a custom timeout will still hit
+        response = other_with_timeout_view(request, '21')
+        self.assertEquals(response.content, 'Hello World 20')
+        
+        # And if we wait a few more seconds
+        time.sleep(2)
+        
+        # the custom timeouot cache will miss
+        response = other_with_timeout_view(request, '22')
+        self.assertEquals(response.content, 'Hello World 22')
 
 if __name__ == '__main__':
     unittest.main()