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

Fixed #20237 -- Reenabled assertContains with binary parameter

Browse Source 
Thanks Baptiste Mispelon for the review.
This commit is contained in:
Claude Paroz
2013-04-11 10:36:12 +02:00
parent c852d45681
commit fe01404bb9
4 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
django/test/testcases.py
View File

@@ -614,12 +614,14 @@ class TransactionTestCase(SimpleTestCase):
self.assertEqual(response.status_code, status_code,
msg_prefix + "Couldn't retrieve content: Response code was %d"
" (expected %d)" % (response.status_code, status_code))
text = force_text(text, encoding=response._charset)
if response.streaming:
content = b''.join(response.streaming_content)
else:
content = response.content
content = content.decode(response._charset)
if not isinstance(text, bytes) or html:
text = force_text(text, encoding=response._charset)
content = content.decode(response._charset)
if html:
content = assert_and_parse_html(self, content, None,
"Response's content is not valid HTML:")
@@ -654,8 +656,11 @@ class TransactionTestCase(SimpleTestCase):
self.assertEqual(response.status_code, status_code,
msg_prefix + "Couldn't retrieve content: Response code was %d"
" (expected %d)" % (response.status_code, status_code))
text = force_text(text, encoding=response._charset)
content = response.content.decode(response._charset)
content = response.content
if not isinstance(text, bytes) or html:
text = force_text(text, encoding=response._charset)
content = content.decode(response._charset)
if html:
content = assert_and_parse_html(self, content, None,
'Response\'s content is not valid HTML:')