fix: test cases

Author: irtazaakram

lms/djangoapps/courseware/tests/test_block_render.py

@@ -111,7 +111,7 @@
 from xmodule.modulestore.tests.test_asides import AsideTestType  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.services import RebindUserServiceError
 from xmodule.video_block import VideoBlock  # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.x_module import STUDENT_VIEW, ModuleStoreRuntime  # lint-amnesty, pylint: disable=wrong-import-order
+from xmodule.x_module import STUDENT_VIEW, ModuleStoreRuntime, XModuleMixin  # lint-amnesty, pylint: disable=wrong-import-order
 
 TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT
 
@@ -1951,8 +1951,8 @@ def _get_anonymous_id(self, course_id, xblock_class, should_get_deprecated_id: b
             days_early_for_beta=None,
         )
         block.runtime = ModuleStoreRuntime(None, None, None)
-        # Use the xblock_class's bind_for_student method
-        block.bind_for_student = partial(xblock_class.bind_for_student, block)
+        # Use XModuleMixin.bind_for_student since it's no longer defined on the block classes directly
+        block.bind_for_student = partial(XModuleMixin.bind_for_student, block)
 
         if hasattr(xblock_class, 'module_class'):
             block.module_class = xblock_class.module_class

lms/djangoapps/courseware/tests/test_discussion_xblock.py

@@ -55,6 +55,7 @@ def setUp(self):
         })
         scope_ids = mock.Mock()
         scope_ids.usage_id.course_key = self.course_id
+        scope_ids.usage_id.context_key = self.course_id
         self.block = DiscussionXBlock(
             self.runtime,
             field_data=self.data,

xmodule/modulestore/__init__.py

@@ -14,8 +14,8 @@
 from operator import itemgetter
 from zoneinfo import ZoneInfo
 
-from django.db import transaction
 from django.conf import settings
+from django.db import transaction
 from opaque_keys.edx.keys import AssetKey, CourseKey
 from opaque_keys.edx.locations import Location  # For import backwards compatibility
 from sortedcontainers import SortedKeyList