From ae8126bf981702b65d6849696a42fbcef75fd8cf Mon Sep 17 00:00:00 2001 From: aarif Date: Fri, 13 Sep 2019 16:50:20 +0500 Subject: [PATCH] python 3 fixes --- common/djangoapps/student/tests/test_enrollment.py | 4 ++-- common/djangoapps/util/tests/test_json_request.py | 8 ++++---- openedx/core/djangoapps/enrollments/tests/test_views.py | 2 +- openedx/core/djangoapps/user_api/tests/test_helpers.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/djangoapps/student/tests/test_enrollment.py b/common/djangoapps/student/tests/test_enrollment.py index df241fc44b..90e8306655 100644 --- a/common/djangoapps/student/tests/test_enrollment.py +++ b/common/djangoapps/student/tests/test_enrollment.py @@ -104,7 +104,7 @@ class EnrollmentTest(UrlResetMixin, SharedModuleStoreTestCase): # Enroll in the course and verify the URL we get sent to resp = self._change_enrollment('enroll') self.assertEqual(resp.status_code, 200) - self.assertEqual(resp.content, full_url) + self.assertEqual(resp.content.decode('utf-8'), full_url) # If we're not expecting to be enrolled, verify that this is the case if enrollment_mode is None: @@ -181,7 +181,7 @@ class EnrollmentTest(UrlResetMixin, SharedModuleStoreTestCase): def test_embargo_allow(self): response = self._change_enrollment('enroll') self.assertEqual(response.status_code, 200) - self.assertEqual(response.content, '') + self.assertEqual(response.content.decode('utf-8'), '') # Verify that we were enrolled is_enrolled = CourseEnrollment.is_enrolled(self.user, self.course.id) diff --git a/common/djangoapps/util/tests/test_json_request.py b/common/djangoapps/util/tests/test_json_request.py index da604eb6ac..fbacb572e0 100644 --- a/common/djangoapps/util/tests/test_json_request.py +++ b/common/djangoapps/util/tests/test_json_request.py @@ -20,14 +20,14 @@ class JsonResponseTestCase(unittest.TestCase): def test_empty(self): resp = JsonResponse() self.assertIsInstance(resp, HttpResponse) - self.assertEqual(resp.content, "") + self.assertEqual(resp.content.decode('utf-8'), "") self.assertEqual(resp.status_code, 204) self.assertEqual(resp["content-type"], "application/json") def test_empty_string(self): resp = JsonResponse("") self.assertIsInstance(resp, HttpResponse) - self.assertEqual(resp.content, "") + self.assertEqual(resp.content.decode('utf-8'), "") self.assertEqual(resp.status_code, 204) self.assertEqual(resp["content-type"], "application/json") @@ -82,14 +82,14 @@ class JsonResponseBadRequestTestCase(unittest.TestCase): def test_empty(self): resp = JsonResponseBadRequest() self.assertIsInstance(resp, HttpResponseBadRequest) - self.assertEqual(resp.content, "") + self.assertEqual(resp.content.decode("utf-8"), "") self.assertEqual(resp.status_code, 400) self.assertEqual(resp["content-type"], "application/json") def test_empty_string(self): resp = JsonResponseBadRequest("") self.assertIsInstance(resp, HttpResponse) - self.assertEqual(resp.content, "") + self.assertEqual(resp.content.decode('utf-8'), "") self.assertEqual(resp.status_code, 400) self.assertEqual(resp["content-type"], "application/json") diff --git a/openedx/core/djangoapps/enrollments/tests/test_views.py b/openedx/core/djangoapps/enrollments/tests/test_views.py index 4a5a4ff502..42935a750f 100644 --- a/openedx/core/djangoapps/enrollments/tests/test_views.py +++ b/openedx/core/djangoapps/enrollments/tests/test_views.py @@ -1397,7 +1397,7 @@ class UnenrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase): self.assertEqual(response.status_code, status.HTTP_200_OK) response = self._submit_unenroll(self.superuser, self.user.username) self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) - self.assertEqual(response.content, "") + self.assertEqual(response.content.decode('utf-8'), "") self._assert_inactive() def _assert_active(self): diff --git a/openedx/core/djangoapps/user_api/tests/test_helpers.py b/openedx/core/djangoapps/user_api/tests/test_helpers.py index 54372a2a43..e62e5eb032 100644 --- a/openedx/core/djangoapps/user_api/tests/test_helpers.py +++ b/openedx/core/djangoapps/user_api/tests/test_helpers.py @@ -243,7 +243,7 @@ class StudentViewShimTest(TestCase): ) response = view(HttpRequest()) self.assertEqual(response.status_code, 200) - self.assertEqual(response.content, "") + self.assertEqual(response.content.decode('utf-8'), "") def test_error_from_json(self): view = self._shimmed_view(