From 8f65e6923bc85e200342423f774921115f14d4de Mon Sep 17 00:00:00 2001
From: Ayub khan <muhammadayubkhan6@gmail.com>
Date: Thu, 5 Sep 2019 18:03:12 +0500
Subject: [PATCH] BOM-106 python3 compatibility

---
 .../django_comment_client/base/tests.py       | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/lms/djangoapps/discussion/django_comment_client/base/tests.py b/lms/djangoapps/discussion/django_comment_client/base/tests.py
index a0822feb10..2546faf3ec 100644
--- a/lms/djangoapps/discussion/django_comment_client/base/tests.py
+++ b/lms/djangoapps/discussion/django_comment_client/base/tests.py
@@ -71,7 +71,11 @@ QUERY_COUNT_TABLE_BLACKLIST = WAFFLE_TABLES
 
 class MockRequestSetupMixin(object):
     def _create_response_mock(self, data):
-        return Mock(text=json.dumps(data), json=Mock(return_value=data))
+        return Mock(
+            text=json.dumps(data),
+            json=Mock(return_value=data),
+            status_code=200
+        )
 
     def _set_mock_request_data(self, mock_request, data):
         mock_request.return_value = self._create_response_mock(data)
@@ -88,7 +92,6 @@ class CreateThreadGroupIdTestCase(
 
     def call_view(self, mock_request, commentable_id, user, group_id, pass_group_id=True):
         self._set_mock_request_data(mock_request, {})
-        mock_request.return_value.status_code = 200
         request_data = {"body": "body", "title": "title", "thread_type": "discussion"}
         if pass_group_id:
             request_data["group_id"] = group_id
@@ -139,7 +142,6 @@ class ThreadActionGroupIdTestCase(
                 "commentable_id": "non_team_dummy_id"
             }
         )
-        mock_request.return_value.status_code = 200
         request = RequestFactory().post("dummy_url", post_params or {})
         request.user = user or self.student
         request.view_name = view_name
@@ -264,7 +266,6 @@ class ViewsTestCaseMixin(object):
         Ensure that mock_request returns the data necessary to make views
         function correctly
         """
-        mock_request.return_value.status_code = 200
         data = {
             "user_id": str(self.student.id),
             "closed": False,
@@ -278,7 +279,6 @@ class ViewsTestCaseMixin(object):
         """
         Issues a request to create a thread and verifies the result.
         """
-        mock_request.return_value.status_code = 200
         self._set_mock_request_data(mock_request, {
             "thread_type": "discussion",
             "title": "Hello",
@@ -747,7 +747,6 @@ class ViewsTestCase(
         self.flag_thread(mock_request, True)
 
     def flag_thread(self, mock_request, is_closed):
-        mock_request.return_value.status_code = 200
         self._set_mock_request_data(mock_request, {
             "title": "Hello",
             "body": "this is a post",
@@ -824,7 +823,6 @@ class ViewsTestCase(
         self.un_flag_thread(mock_request, True)
 
     def un_flag_thread(self, mock_request, is_closed):
-        mock_request.return_value.status_code = 200
         self._set_mock_request_data(mock_request, {
             "title": "Hello",
             "body": "this is a post",
@@ -902,7 +900,6 @@ class ViewsTestCase(
         self.flag_comment(mock_request, True)
 
     def flag_comment(self, mock_request, is_closed):
-        mock_request.return_value.status_code = 200
         self._set_mock_request_data(mock_request, {
             "body": "this is a comment",
             "course_id": "MITx/999/Robot_Super_Course",
@@ -974,7 +971,6 @@ class ViewsTestCase(
         self.un_flag_comment(mock_request, True)
 
     def un_flag_comment(self, mock_request, is_closed):
-        mock_request.return_value.status_code = 200
         self._set_mock_request_data(mock_request, {
             "body": "this is a comment",
             "course_id": "MITx/999/Robot_Super_Course",
@@ -1794,7 +1790,7 @@ class ForumEventTestCase(ForumsEnableMixin, SharedModuleStoreTestCase, MockReque
         self.assertEqual(event['anonymous'], False)
         self.assertEqual(event['group_id'], None)
         self.assertEqual(event['thread_type'], 'discussion')
-        self.assertEquals(event['anonymous_to_peers'], False)
+        self.assertEqual(event['anonymous_to_peers'], False)
 
     @patch('eventtracking.tracker.emit')
     @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
@@ -1802,7 +1798,6 @@ class ForumEventTestCase(ForumsEnableMixin, SharedModuleStoreTestCase, MockReque
         """
         Check to make sure an event is fired when a user responds to a thread.
         """
-        mock_request.return_value.status_code = 200
         self._set_mock_request_data(mock_request, {
             "closed": False,
             "commentable_id": 'test_commentable_id',
@@ -1877,7 +1872,6 @@ class ForumEventTestCase(ForumsEnableMixin, SharedModuleStoreTestCase, MockReque
         team = CourseTeamFactory.create(discussion_topic_id=TEAM_COMMENTABLE_ID)
         CourseTeamMembershipFactory.create(team=team, user=user)
 
-        mock_request.return_value.status_code = 200
         self._set_mock_request_data(mock_request, {
             'closed': False,
             'commentable_id': TEAM_COMMENTABLE_ID,
@@ -2037,7 +2031,7 @@ class SegmentIOForumThreadViewedEventTestCase(SegmentIOTrackingTestCaseBase):
         middleware.process_request(request)
         try:
             response = segmentio.segmentio_event(request)
-            self.assertEquals(response.status_code, 200)
+            self.assertEqual(response.status_code, 200)
         finally:
             middleware.process_response(request, None)