Changed some tests to use unicontent(r) instead of r.content, which decodes non-ascii content according to the response charset.

 - Legacy-Id: 13189

Author: levkowetz

ietf/community/tests.py

@@ -5,6 +5,8 @@
 from django.urls import reverse as urlreverse
 from django.contrib.auth.models import User
 
+import debug                            # pyflakes:ignore
+
 from ietf.community.models import CommunityList, SearchRule, EmailSubscription
 from ietf.community.utils import docs_matching_community_list_rule, community_list_rules_matching_doc
 from ietf.community.utils import reset_name_contains_index_for_rule
@@ -14,7 +16,7 @@
 from ietf.doc.utils import add_state_change_event
 from ietf.person.models import Person, Email
 from ietf.utils.test_data import make_test_data
-from ietf.utils.test_utils import login_testing_unauthorized, TestCase
+from ietf.utils.test_utils import login_testing_unauthorized, TestCase, unicontent
 from ietf.utils.mail import outbox
 from ietf.group.factories import GroupFactory
 from ietf.person.factories import PersonFactory
@@ -83,7 +85,7 @@ def test_view_list(self):
         )
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.name in r.content)
+        self.assertTrue(draft.name in unicontent(r))
 
     def test_manage_personal_list(self):
         draft = make_test_data()
@@ -103,7 +105,7 @@ def test_manage_personal_list(self):
         # document shows up on GET
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.name in r.content)
+        self.assertTrue(draft.name in unicontent(r))
 
         # remove document
         r = self.client.post(url, { "action": "remove_document", "document": draft.pk })
@@ -240,7 +242,7 @@ def test_csv(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         # this is a simple-minded test, we don't actually check the fields
-        self.assertTrue(draft.name in r.content)
+        self.assertTrue(draft.name in unicontent(r))
 
     def test_csv_for_group(self):
         draft = make_test_data()
@@ -273,12 +275,12 @@ def test_feed(self):
         )
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.name in r.content)
+        self.assertTrue(draft.name in unicontent(r))
 
         # only significant
         r = self.client.get(url + "?significant=1")
         self.assertEqual(r.status_code, 200)
-        self.assertTrue('<entry>' not in r.content)
+        self.assertTrue('<entry>' not in unicontent(r))
 
     def test_feed_for_group(self):
         draft = make_test_data()

ietf/iesg/tests.py

@@ -3,11 +3,12 @@
 import shutil
 import json
 import datetime
+from pyquery import PyQuery
 
 from django.conf import settings
 from django.urls import reverse as urlreverse
 
-from pyquery import PyQuery
+import debug                            # pyflakes:ignore
 
 from ietf.doc.models import DocEvent, BallotDocEvent, BallotPositionDocEvent, TelechatDocEvent
 from ietf.doc.models import Document, DocAlias, State, RelatedDocument
@@ -449,7 +450,7 @@ def test_reschedule(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         d_header_pos = r.content.find("IESG telechat %s" % d.isoformat())
-        draft_pos = r.content[d_header_pos:].find(draft.name)
+        draft_pos = unicontent(r)[d_header_pos:].find(draft.name)
         self.assertTrue(draft_pos>0)
 
         self.assertTrue(draft.latest_event(TelechatDocEvent, "scheduled_for_telechat"))