From faf570df187bc82a3bcffa5613165a6e6cc56a57 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Tue, 14 Aug 2012 11:57:18 +0200 Subject: [py3] Compared response.content with bytes. --- tests/regressiontests/cache/tests.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'tests/regressiontests/cache') diff --git a/tests/regressiontests/cache/tests.py b/tests/regressiontests/cache/tests.py index 4ffca2d458..24cab64c10 100644 --- a/tests/regressiontests/cache/tests.py +++ b/tests/regressiontests/cache/tests.py @@ -1592,43 +1592,43 @@ class CacheMiddlewareTest(TestCase): # Request the view once response = default_view(request, '1') - self.assertEqual(response.content, 'Hello World 1') + self.assertEqual(response.content, b'Hello World 1') # Request again -- hit the cache response = default_view(request, '2') - self.assertEqual(response.content, 'Hello World 1') + self.assertEqual(response.content, b'Hello World 1') # Requesting the same view with the explicit cache should yield the same result response = explicit_default_view(request, '3') - self.assertEqual(response.content, 'Hello World 1') + self.assertEqual(response.content, b'Hello World 1') # Requesting with a prefix will hit a different cache key response = explicit_default_with_prefix_view(request, '4') - self.assertEqual(response.content, 'Hello World 4') + self.assertEqual(response.content, b'Hello World 4') # Hitting the same view again gives a cache hit response = explicit_default_with_prefix_view(request, '5') - self.assertEqual(response.content, 'Hello World 4') + self.assertEqual(response.content, b'Hello World 4') # And going back to the implicit cache will hit the same cache response = default_with_prefix_view(request, '6') - self.assertEqual(response.content, 'Hello World 4') + self.assertEqual(response.content, b'Hello World 4') # Requesting from an alternate cache won't hit cache response = other_view(request, '7') - self.assertEqual(response.content, 'Hello World 7') + self.assertEqual(response.content, b'Hello World 7') # But a repeated hit will hit cache response = other_view(request, '8') - self.assertEqual(response.content, 'Hello World 7') + self.assertEqual(response.content, b'Hello World 7') # And prefixing the alternate cache yields yet another cache entry response = other_with_prefix_view(request, '9') - self.assertEqual(response.content, 'Hello World 9') + self.assertEqual(response.content, b'Hello World 9') # Request from the alternate cache with a new prefix and a custom timeout response = other_with_timeout_view(request, '10') - self.assertEqual(response.content, 'Hello World 10') + self.assertEqual(response.content, b'Hello World 10') # But if we wait a couple of seconds... time.sleep(2) @@ -1636,38 +1636,38 @@ class CacheMiddlewareTest(TestCase): # ... the default cache will still hit cache = get_cache('default') response = default_view(request, '11') - self.assertEqual(response.content, 'Hello World 1') + self.assertEqual(response.content, b'Hello World 1') # ... the default cache with a prefix will still hit response = default_with_prefix_view(request, '12') - self.assertEqual(response.content, 'Hello World 4') + self.assertEqual(response.content, b'Hello World 4') # ... the explicit default cache will still hit response = explicit_default_view(request, '13') - self.assertEqual(response.content, 'Hello World 1') + self.assertEqual(response.content, b'Hello World 1') # ... the explicit default cache with a prefix will still hit response = explicit_default_with_prefix_view(request, '14') - self.assertEqual(response.content, 'Hello World 4') + self.assertEqual(response.content, b'Hello World 4') # .. but a rapidly expiring cache won't hit response = other_view(request, '15') - self.assertEqual(response.content, 'Hello World 15') + self.assertEqual(response.content, b'Hello World 15') # .. even if it has a prefix response = other_with_prefix_view(request, '16') - self.assertEqual(response.content, 'Hello World 16') + self.assertEqual(response.content, b'Hello World 16') # ... but a view with a custom timeout will still hit response = other_with_timeout_view(request, '17') - self.assertEqual(response.content, 'Hello World 10') + self.assertEqual(response.content, b'Hello World 10') # And if we wait a few more seconds time.sleep(2) # the custom timeouot cache will miss response = other_with_timeout_view(request, '18') - self.assertEqual(response.content, 'Hello World 18') + self.assertEqual(response.content, b'Hello World 18') @override_settings( -- cgit v1.3