Merge pull request #21703 from edx/BOM-273

BOM-273

lms/djangoapps/grades/tests/test_tasks.py

@@ -309,10 +309,10 @@ class RecalculateSubsectionGradeTest(HasCourseWithProblemsMixin, ModuleStoreTest
                 mock_score=MagicMock(modified=modified_datetime)
             )
         else:
-            with patch(
-                'lms.djangoapps.grades.api',
-                return_value=MockGradesService(mocked_return_value=MagicMock(modified=modified_datetime))
-            ):
+            with patch('lms.djangoapps.grades.api') as mock_grade_service:
+                mock_grade_service.get_subsection_grade_override = MagicMock(
+                    return_value=MagicMock(modified=modified_datetime)
+                )
                 recalculate_subsection_grade_v3.apply(kwargs=self.recalculate_subsection_grade_kwargs)
 
         self._assert_retry_called(mock_retry)
@@ -343,9 +343,8 @@ class RecalculateSubsectionGradeTest(HasCourseWithProblemsMixin, ModuleStoreTest
                     mock_score=MagicMock(module_type='any_block_type')
                 )
         elif score_db_table == ScoreDatabaseTableEnum.overrides:
-            with patch('lms.djangoapps.grades.api',
-                       return_value=MockGradesService(mocked_return_value=None)) as mock_service:
-                mock_service.get_subsection_grade_override.return_value = None
+            with patch('lms.djangoapps.grades.api') as mock_grade_service:
+                mock_grade_service.get_subsection_grade_override.return_value = None
                 recalculate_subsection_grade_v3.apply(kwargs=self.recalculate_subsection_grade_kwargs)
         else:
             self._apply_recalculate_subsection_grade(mock_score=None)
@@ -652,10 +651,10 @@ class FreezeGradingAfterCourseEndTest(HasCourseWithProblemsMixin, ModuleStoreTes
 
         with override_waffle_flag(self.freeze_grade_flag, active=freeze_flag_value):
             modified_datetime = datetime.utcnow().replace(tzinfo=pytz.UTC) - timedelta(days=1)
-            with patch(
-                'lms.djangoapps.grades.api',
-                return_value=MockGradesService(mocked_return_value=MagicMock(modified=modified_datetime))
-            ) as mock_grade_service:
+            with patch('lms.djangoapps.grades.api') as mock_grade_service:
+                mock_grade_service.get_subsection_grade_override = MagicMock(
+                    return_value=MagicMock(modified=modified_datetime)
+                )
                 result = recalculate_subsection_grade_v3.apply_async(kwargs=self.recalculate_subsection_grade_kwargs)
                 self._assert_for_freeze_grade_flag(
                     result,