Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests fail with split modulestore.

Browse Source 
Have not been able to work out why.
This commit is contained in:
cahrens
2015-01-26 20:43:18 -05:00
parent 5fb30f333a
commit 6272817c07
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common/djangoapps/contentserver/tests/test.py
View File

@@ -13,8 +13,8 @@ from django.test.utils import override_settings
from xmodule.contentstore.django import contentstore from xmodule.contentstore.django import contentstore
from xmodule.modulestore.django import modulestore from xmodule.modulestore.django import modulestore
from opaque_keys.edx.locations import SlashSeparatedCourseKey
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore import ModuleStoreEnum
from xmodule.modulestore.xml_importer import import_from_xml from xmodule.modulestore.xml_importer import import_from_xml
from contentserver.middleware import parse_range_header from contentserver.middleware import parse_range_header
@@ -45,22 +45,23 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
self.client = Client() self.client = Client()
self.contentstore = contentstore() self.contentstore = contentstore()
store = modulestore()._get_modulestore_by_type(ModuleStoreEnum.Type.mongo) # pylint: disable=protected-access
self.course_key = SlashSeparatedCourseKey('edX', 'toy', '2012_Fall') self.course_key = store.make_course_key('edX', 'toy', '2012_Fall')
import_from_xml( import_from_xml(
modulestore(), self.user.id, TEST_DATA_DIR, ['toy'], store, self.user.id, TEST_DATA_DIR, ['toy'],
static_content_store=self.contentstore, verbose=True static_content_store=self.contentstore, verbose=True
) )
# A locked asset # A locked asset
self.locked_asset = self.course_key.make_asset_key('asset', 'sample_static.txt') self.locked_asset = self.course_key.make_asset_key('asset', 'sample_static.txt')
self.url_locked = self.locked_asset.to_deprecated_string() self.url_locked = unicode(self.locked_asset)
self.contentstore.set_attr(self.locked_asset, 'locked', True) self.contentstore.set_attr(self.locked_asset, 'locked', True)
# An unlocked asset # An unlocked asset
self.unlocked_asset = self.course_key.make_asset_key('asset', 'another_static.txt') self.unlocked_asset = self.course_key.make_asset_key('asset', 'another_static.txt')
self.url_unlocked = self.unlocked_asset.to_deprecated_string() self.url_unlocked = unicode(self.unlocked_asset)
self.length_unlocked = self.contentstore.get_attr(self.unlocked_asset, 'length') self.length_unlocked = self.contentstore.get_attr(self.unlocked_asset, 'length')
def test_unlocked_asset(self): def test_unlocked_asset(self):