More assertContains() and BytesIO() related changes.

 - Legacy-Id: 16411

Author: levkowetz

ietf/doc/tests_review.py

@@ -659,8 +659,8 @@ def test_complete_review_upload_content(self):
         # check the review document page
         url = urlreverse('ietf.doc.views_doc.document_main', kwargs={ "name": assignment.review.name })
         r = self.client.get(url)
-        self.assertContains("{} Review".format(assignment.review_request.type.name))
-        self.assertContains("This is a review")
+        self.assertContains(r, "{} Review".format(assignment.review_request.type.name))
+        self.assertContains(r, "This is a review")
 
 
     def test_complete_review_enter_content(self):
@@ -763,7 +763,7 @@ def test_complete_review_link_to_mailing_list(self, mock):
             "state": ReviewAssignmentStateName.objects.get(slug="completed").pk,
             "reviewed_rev": assignment.review_request.doc.rev,
             "review_submission": "link",
-            "review_content": response.content,
+            "review_content": response.content.decode(),
             "review_url": "http://example.com/testreview/",
             "review_file": "",
         })

ietf/ietfauth/tests.py

@@ -589,28 +589,24 @@ def test_apikey_errors(self):
 
             # missing apikey
             r = self.client.post(url, {'dummy':'dummy',})
-            self.assertEqual(r.status_code, 400)
-            self.assertContains(r, 'Missing apikey parameter')
+            self.assertContains(r, 'Missing apikey parameter', status_code=400)
 
             # invalid apikey
             r = self.client.post(url, {'apikey':BAD_KEY, 'dummy':'dummy',})
-            self.assertEqual(r.status_code, 400)
-            self.assertContains(r, 'Invalid apikey')
+            self.assertContains(r, 'Invalid apikey', status_code=400)
 
             # too long since regular login
             person.user.last_login = datetime.datetime.now() - datetime.timedelta(days=settings.UTILS_APIKEY_GUI_LOGIN_LIMIT_DAYS+1)
             person.user.save()
             r = self.client.post(url, {'apikey':key.hash(), 'dummy':'dummy',})
-            self.assertEqual(r.status_code, 400)
-            self.assertContains(r, 'Too long since last regular login')
+            self.assertContains(r, 'Too long since last regular login', status_code=400)
             person.user.last_login = datetime.datetime.now()
             person.user.save()
 
             # endpoint mismatch
             key2 = PersonalApiKey.objects.create(person=person, endpoint='/')
             r = self.client.post(url, {'apikey':key2.hash(), 'dummy':'dummy',})
-            self.assertEqual(r.status_code, 400)
-            self.assertContains(r, 'Apikey endpoint mismatch')
+            self.assertContains(r, 'Apikey endpoint mismatch', status_code=400)
             key2.delete()
 
     def test_send_apikey_report(self):