From f259a911c7c7de1857d713227275d3c97ad6517c Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Wed, 18 Sep 2019 17:25:58 -0400 Subject: [PATCH] BOM-618 Decode content we get from test requests. --- common/djangoapps/student/tests/test_email.py | 4 ++-- .../third_party_auth/tests/specs/base.py | 2 +- .../verify_student/tests/test_views.py | 20 +++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/common/djangoapps/student/tests/test_email.py b/common/djangoapps/student/tests/test_email.py index 25d6bc8265..76a9848b51 100644 --- a/common/djangoapps/student/tests/test_email.py +++ b/common/djangoapps/student/tests/test_email.py @@ -215,7 +215,7 @@ class ReactivationEmailTests(EmailTestMixin, CacheIsolationTestCase): Send the reactivation email to the specified user, and return the response as json data. """ - return json.loads(send_reactivation_email_for_user(user).content) + return json.loads(send_reactivation_email_for_user(user).content.decode('utf-8')) def assertReactivateEmailSent(self, email_user): """ @@ -480,7 +480,7 @@ class EmailChangeConfirmationTests(EmailTestMixin, EmailTemplateTagMixin, CacheI self.assertEqual(response.status_code, 200) self.assertEquals( mock_render_to_response(expected_template, expected_context).content, - response.content + response.content.decode('utf-8') ) def assertChangeEmailSent(self, test_body_type): diff --git a/common/djangoapps/third_party_auth/tests/specs/base.py b/common/djangoapps/third_party_auth/tests/specs/base.py index a85eadcf36..c8c9d6bf86 100644 --- a/common/djangoapps/third_party_auth/tests/specs/base.py +++ b/common/djangoapps/third_party_auth/tests/specs/base.py @@ -935,7 +935,7 @@ class IntegrationTest(testutil.TestCase, test.TestCase, HelperMixin): strategy.request.POST['password'] = 'bad_' + password if success is False else password self.assert_pipeline_running(strategy.request) - payload = json.loads(login_user(strategy.request).content) + payload = json.loads(login_user(strategy.request).content.decode('utf-8')) if success is None: # Request malformed -- just one of email/password given. diff --git a/lms/djangoapps/verify_student/tests/test_views.py b/lms/djangoapps/verify_student/tests/test_views.py index 4e51ad86af..98b4b1f4dd 100644 --- a/lms/djangoapps/verify_student/tests/test_views.py +++ b/lms/djangoapps/verify_student/tests/test_views.py @@ -1340,7 +1340,7 @@ class TestCreateOrderView(ModuleStoreTestCase): @patch.dict(settings.FEATURES, {'AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING': True}) def test_invalid_amount(self): response = self._create_order('1.a', self.course_id, expect_status_code=400) - self.assertIn('Selected price is not valid number.', response.content) + self.assertIn('Selected price is not valid number.', response.content.decode('utf-8')) @patch.dict(settings.FEATURES, {'AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING': True}) def test_invalid_mode(self): @@ -1348,7 +1348,7 @@ class TestCreateOrderView(ModuleStoreTestCase): course_id = 'Fake/999/Test_Course' CourseFactory.create(org='Fake', number='999', display_name='Test Course') response = self._create_order('50', course_id, expect_status_code=400) - self.assertIn('This course doesn\'t support paid certificates', response.content) + self.assertIn('This course doesn\'t support paid certificates', response.content.decode('utf-8')) @patch.dict(settings.FEATURES, {'AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING': True}) def test_create_order_fail_with_get(self): @@ -1672,7 +1672,7 @@ class TestPhotoVerificationResultsCallback(ModuleStoreTestCase): HTTP_AUTHORIZATION='test BBBBBBBBBBBBBBBBBBBB: testing', HTTP_DATE='testdate' ) - self.assertIn('Invalid JSON', response.content) + self.assertIn('Invalid JSON', response.content.decode('utf-8')) self.assertEqual(response.status_code, 400) def test_invalid_dict(self): @@ -1687,7 +1687,7 @@ class TestPhotoVerificationResultsCallback(ModuleStoreTestCase): HTTP_AUTHORIZATION='test BBBBBBBBBBBBBBBBBBBB:testing', HTTP_DATE='testdate' ) - self.assertIn('JSON should be dict', response.content) + self.assertIn('JSON should be dict', response.content.decode('utf-8')) self.assertEqual(response.status_code, 400) @patch( @@ -1712,7 +1712,7 @@ class TestPhotoVerificationResultsCallback(ModuleStoreTestCase): HTTP_AUTHORIZATION='test testing:testing', HTTP_DATE='testdate' ) - self.assertIn('Access key invalid', response.content) + self.assertIn('Access key invalid', response.content.decode('utf-8')) self.assertEqual(response.status_code, 400) @patch( @@ -1737,7 +1737,7 @@ class TestPhotoVerificationResultsCallback(ModuleStoreTestCase): HTTP_AUTHORIZATION='test BBBBBBBBBBBBBBBBBBBB:testing', HTTP_DATE='testdate' ) - self.assertIn('edX ID Invalid-Id not found', response.content) + self.assertIn('edX ID Invalid-Id not found', response.content.decode('utf-8')) self.assertEqual(response.status_code, 400) @patch( @@ -1780,7 +1780,7 @@ class TestPhotoVerificationResultsCallback(ModuleStoreTestCase): self.assertEqual(attempt.expiry_date.date(), expiry_date.date()) self.assertIsNone(old_verification.expiry_date) self.assertIsNone(old_verification.expiry_email_date) - self.assertEquals(response.content, 'OK!') + self.assertEquals(response.content.decode('utf-8'), 'OK!') self.assertEqual(len(mail.outbox), 1) @patch( @@ -1814,7 +1814,7 @@ class TestPhotoVerificationResultsCallback(ModuleStoreTestCase): attempt = SoftwareSecurePhotoVerification.objects.get(receipt_id=self.receipt_id) self.assertEqual(attempt.status, u'approved') self.assertEqual(attempt.expiry_date.date(), expiry_date.date()) - self.assertEquals(response.content, 'OK!') + self.assertEquals(response.content.decode('utf-8'), 'OK!') self.assertEqual(len(mail.outbox), 1) @patch( @@ -1872,7 +1872,7 @@ class TestPhotoVerificationResultsCallback(ModuleStoreTestCase): self.assertEqual(attempt.status, u'must_retry') self.assertEqual(attempt.error_code, u'You must retry the verification.') self.assertEqual(attempt.error_msg, u'"Memory overflow"') - self.assertEquals(response.content, 'OK!') + self.assertEquals(response.content.decode('utf-8'), 'OK!') @patch( 'lms.djangoapps.verify_student.ssencrypt.has_valid_signature', @@ -1896,7 +1896,7 @@ class TestPhotoVerificationResultsCallback(ModuleStoreTestCase): HTTP_AUTHORIZATION='test BBBBBBBBBBBBBBBBBBBB:testing', HTTP_DATE='testdate' ) - self.assertIn('Result Unknown not understood', response.content) + self.assertIn('Result Unknown not understood', response.content.decode('utf-8')) class TestReverifyView(TestCase):