diff --git a/cms/djangoapps/contentstore/views/preview.py b/cms/djangoapps/contentstore/views/preview.py index 56b2fe2258..66e4d9de18 100644 --- a/cms/djangoapps/contentstore/views/preview.py +++ b/cms/djangoapps/contentstore/views/preview.py @@ -185,7 +185,8 @@ def _preview_module_system(request, descriptor, field_data): wrappers=wrappers, error_descriptor_class=ErrorDescriptor, get_user_role=lambda: get_user_role(request.user, course_id), - descriptor_runtime=descriptor.runtime, + # Get the raw DescriptorSystem, not the CombinedSystem + descriptor_runtime=descriptor._runtime, # pylint: disable=protected-access services={ "i18n": ModuleI18nService(), "field-data": field_data, diff --git a/common/lib/xmodule/xmodule/tests/__init__.py b/common/lib/xmodule/xmodule/tests/__init__.py index 6b6b6ddbd4..53c0dc15b9 100644 --- a/common/lib/xmodule/xmodule/tests/__init__.py +++ b/common/lib/xmodule/xmodule/tests/__init__.py @@ -94,7 +94,7 @@ def get_test_system(course_id=SlashSeparatedCourseKey('org', 'course', 'run')): """ user = Mock(name='get_test_system.user', is_staff=False) - descriptor_system = get_test_descriptor_system(), + descriptor_system = get_test_descriptor_system() def get_module(descriptor): """Mocks module_system get_module function""" @@ -107,7 +107,7 @@ def get_test_system(course_id=SlashSeparatedCourseKey('org', 'course', 'run')): # Descriptors can all share a single DescriptorSystem. # So, bind to the same one as the current descriptor. - module_system.descriptor_runtime = descriptor.runtime._descriptor_system + module_system.descriptor_runtime = descriptor._runtime # pylint: disable=protected-access descriptor.bind_for_student(module_system, descriptor._field_data) diff --git a/common/lib/xmodule/xmodule/tests/test_library_content.py b/common/lib/xmodule/xmodule/tests/test_library_content.py index 77835c04b1..f8e80513f1 100644 --- a/common/lib/xmodule/xmodule/tests/test_library_content.py +++ b/common/lib/xmodule/xmodule/tests/test_library_content.py @@ -54,14 +54,14 @@ class LibraryContentTest(MixedSplitTestCase): Bind a module (part of self.course) so we can access student-specific data. """ module_system = get_test_system(course_id=self.course.location.course_key) - module_system.descriptor_runtime = module.runtime + module_system.descriptor_runtime = module.runtime._descriptor_system # pylint: disable=protected-access module_system._services['library_tools'] = self.tools # pylint: disable=protected-access def get_module(descriptor): """Mocks module_system get_module function""" sub_module_system = get_test_system(course_id=self.course.location.course_key) sub_module_system.get_module = get_module - sub_module_system.descriptor_runtime = descriptor.runtime + sub_module_system.descriptor_runtime = descriptor._runtime # pylint: disable=protected-access descriptor.bind_for_student(sub_module_system, descriptor._field_data) # pylint: disable=protected-access return descriptor diff --git a/common/lib/xmodule/xmodule/tests/test_split_test_module.py b/common/lib/xmodule/xmodule/tests/test_split_test_module.py index bd16cdbecc..97f71114b0 100644 --- a/common/lib/xmodule/xmodule/tests/test_split_test_module.py +++ b/common/lib/xmodule/xmodule/tests/test_split_test_module.py @@ -78,7 +78,7 @@ class SplitTestModuleTest(XModuleXmlImportTest, PartitionTestCase): self.course_sequence = self.course.get_children()[0] self.module_system = get_test_system() - self.module_system.descriptor_runtime = self.course.runtime._descriptor_system # pylint: disable=protected-access + self.module_system.descriptor_runtime = self.course._runtime # pylint: disable=protected-access self.course.runtime.export_fs = MemoryFS() self.partitions_service = StaticPartitionService( diff --git a/common/lib/xmodule/xmodule/tests/test_vertical.py b/common/lib/xmodule/xmodule/tests/test_vertical.py index e515ed2c03..9da65d75d0 100644 --- a/common/lib/xmodule/xmodule/tests/test_vertical.py +++ b/common/lib/xmodule/xmodule/tests/test_vertical.py @@ -27,7 +27,7 @@ class BaseVerticalModuleTest(XModuleXmlImportTest): course_seq = self.course.get_children()[0] self.module_system = get_test_system() - self.module_system.descriptor_runtime = self.course.runtime._descriptor_system # pylint: disable=protected-access + self.module_system.descriptor_runtime = self.course._runtime # pylint: disable=protected-access self.course.runtime.export_fs = MemoryFS() self.vertical = course_seq.get_children()[0] diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py index 892e0a99ae..468cd81533 100644 --- a/common/lib/xmodule/xmodule/x_module.py +++ b/common/lib/xmodule/xmodule/x_module.py @@ -3,6 +3,7 @@ import os import sys import yaml +from contracts import contract, new_contract from functools import partial from lxml import etree from collections import namedtuple @@ -1307,6 +1308,9 @@ class DescriptorSystem(MetricsMixin, ConfigurableFragmentWrapper, Runtime): # p pass +new_contract('DescriptorSystem', DescriptorSystem) + + class XMLParsingSystem(DescriptorSystem): def __init__(self, process_xml, **kwargs): """ @@ -1427,6 +1431,8 @@ class ModuleSystem(MetricsMixin, ConfigurableFragmentWrapper, Runtime): # pylin Note that these functions can be closures over e.g. a django request and user, or other environment-specific info. """ + + @contract(descriptor_runtime='DescriptorSystem') def __init__( self, static_url, track_function, get_module, render_template, replace_urls, descriptor_runtime, user=None, filestore=None, diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py index 93cb59a49f..6fe7f2b276 100644 --- a/lms/djangoapps/courseware/module_render.py +++ b/lms/djangoapps/courseware/module_render.py @@ -642,7 +642,7 @@ def get_module_system_for_user(user, field_data_cache, 'user': DjangoXBlockUserService(user, user_is_staff=user_is_staff), }, get_user_role=lambda: get_user_role(user, course_id), - descriptor_runtime=descriptor.runtime, + descriptor_runtime=descriptor._runtime, # pylint: disable=protected-access rebind_noauth_module_to_user=rebind_noauth_module_to_user, user_location=user_location, request_token=request_token, diff --git a/lms/djangoapps/courseware/tests/test_module_render.py b/lms/djangoapps/courseware/tests/test_module_render.py index b4156ccc35..95c9e08e94 100644 --- a/lms/djangoapps/courseware/tests/test_module_render.py +++ b/lms/djangoapps/courseware/tests/test_module_render.py @@ -41,7 +41,7 @@ from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore.django import modulestore from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.tests.factories import ItemFactory, CourseFactory, check_mongo_calls -from xmodule.x_module import XModuleDescriptor, XModule, STUDENT_VIEW +from xmodule.x_module import XModuleDescriptor, XModule, STUDENT_VIEW, CombinedSystem TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT @@ -903,13 +903,16 @@ class TestAnonymousStudentId(ModuleStoreTestCase, LoginEnrollmentTestCase): _field_data=Mock(spec=FieldData), location=location, static_asset_path=None, - runtime=Mock( + _runtime=Mock( spec=Runtime, resources_fs=None, - mixologist=Mock(_mixins=()) + mixologist=Mock(_mixins=(), name='mixologist'), + name='runtime', ), scope_ids=Mock(spec=ScopeIds), + name='descriptor' ) + descriptor.runtime = CombinedSystem(descriptor._runtime, None) # pylint: disable=protected-access # Use the xblock_class's bind_for_student method descriptor.bind_for_student = partial(xblock_class.bind_for_student, descriptor) @@ -919,10 +922,10 @@ class TestAnonymousStudentId(ModuleStoreTestCase, LoginEnrollmentTestCase): return render.get_module_for_descriptor_internal( user=self.user, descriptor=descriptor, - field_data_cache=Mock(spec=FieldDataCache), + field_data_cache=Mock(spec=FieldDataCache, name='field_data_cache'), course_id=course_id, - track_function=Mock(), # Track Function - xqueue_callback_url_prefix=Mock(), # XQueue Callback Url Prefix + track_function=Mock(name='track_function'), # Track Function + xqueue_callback_url_prefix=Mock(name='xqueue_callback_url_prefix'), # XQueue Callback Url Prefix request_token='request_token', ).xmodule_runtime.anonymous_student_id