mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-25 09:44:36 +00:00
Code Issues 32 Releases Wiki Activity

[py3] Fixed middleware tests.

Browse Source 
Removed several inappropriate .encode('utf-8') calls in the process.
This commit is contained in:
Aymeric Augustin 2012-08-15 22:42:18 +02:00
parent 2b157b0adc
commit f7c2e82d76
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/regressiontests/middleware/tests.py
View File

@ -15,6 +15,7 @@ from django.middleware.http import ConditionalGetMiddleware
from django.middleware.gzip import GZipMiddleware from django.middleware.gzip import GZipMiddleware
from django.test import TestCase, RequestFactory from django.test import TestCase, RequestFactory
from django.test.utils import override_settings from django.test.utils import override_settings
from django.utils import six
from django.utils.six.moves import xrange from django.utils.six.moves import xrange
@ -507,9 +508,9 @@ class GZipMiddlewareTest(TestCase):
""" """
Tests the GZip middleware. Tests the GZip middleware.
""" """
short_string = "This string is too short to be worth compressing." short_string = b"This string is too short to be worth compressing."
compressible_string = 'a' * 500 compressible_string = b'a' * 500
uncompressible_string = ''.join(chr(random.randint(0, 255)) for _ in xrange(500)) uncompressible_string = b''.join(six.int2byte(random.randint(0, 255)) for _ in xrange(500))
def setUp(self): def setUp(self):
self.req = HttpRequest() self.req = HttpRequest()
@ -534,7 +535,7 @@ class GZipMiddlewareTest(TestCase):
Tests that compression is performed on responses with compressible content. Tests that compression is performed on responses with compressible content.
""" """
r = GZipMiddleware().process_response(self.req, self.resp) r = GZipMiddleware().process_response(self.req, self.resp)
self.assertEqual(self.decompress(r.content), self.compressible_string.encode('utf-8')) self.assertEqual(self.decompress(r.content), self.compressible_string)
self.assertEqual(r.get('Content-Encoding'), 'gzip') self.assertEqual(r.get('Content-Encoding'), 'gzip')
self.assertEqual(r.get('Content-Length'), str(len(r.content))) self.assertEqual(r.get('Content-Length'), str(len(r.content)))
@ -545,7 +546,7 @@ class GZipMiddlewareTest(TestCase):
""" """
self.resp.status_code = 404 self.resp.status_code = 404
r = GZipMiddleware().process_response(self.req, self.resp) r = GZipMiddleware().process_response(self.req, self.resp)
self.assertEqual(self.decompress(r.content), self.compressible_string.encode('utf-8')) self.assertEqual(self.decompress(r.content), self.compressible_string)
self.assertEqual(r.get('Content-Encoding'), 'gzip') self.assertEqual(r.get('Content-Encoding'), 'gzip')
def test_no_compress_short_response(self): def test_no_compress_short_response(self):
@ -573,7 +574,7 @@ class GZipMiddlewareTest(TestCase):
self.req.META['HTTP_USER_AGENT'] = 'Mozilla/4.0 (compatible; MSIE 5.00; Windows 98)' self.req.META['HTTP_USER_AGENT'] = 'Mozilla/4.0 (compatible; MSIE 5.00; Windows 98)'
self.resp['Content-Type'] = 'application/javascript; charset=UTF-8' self.resp['Content-Type'] = 'application/javascript; charset=UTF-8'
r = GZipMiddleware().process_response(self.req, self.resp) r = GZipMiddleware().process_response(self.req, self.resp)
self.assertEqual(r.content, self.compressible_string.encode('utf-8')) self.assertEqual(r.content, self.compressible_string)
self.assertEqual(r.get('Content-Encoding'), None) self.assertEqual(r.get('Content-Encoding'), None)
def test_no_compress_uncompressible_response(self): def test_no_compress_uncompressible_response(self):
@ -591,7 +592,7 @@ class ETagGZipMiddlewareTest(TestCase):
""" """
Tests if the ETag middleware behaves correctly with GZip middleware. Tests if the ETag middleware behaves correctly with GZip middleware.
""" """
compressible_string = 'a' * 500 compressible_string = b'a' * 500
def setUp(self): def setUp(self):
self.rf = RequestFactory() self.rf = RequestFactory()