diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py index 14e54f6f565a..7d5cd3cbcbf4 100644 --- a/cms/djangoapps/contentstore/tests/test_contentstore.py +++ b/cms/djangoapps/contentstore/tests/test_contentstore.py @@ -3,6 +3,9 @@ import json import shutil import mock + +from textwrap import dedent + from django.test.client import Client from django.test.utils import override_settings from django.conf import settings @@ -312,7 +315,14 @@ def test_no_static_link_rewrites_on_import(self): handouts = module_store.get_item(Location(['i4x', 'edX', 'toy', 'html', 'toyhtml', None])) self.assertIn('/static/', handouts.data) - def test_import_textbook_as_content_element(self): + @mock.patch('xmodule.course_module.requests.get') + def test_import_textbook_as_content_element(self, mock_get): + mock_get.return_value.text = dedent(""" + + + + """).strip() + module_store = modulestore('direct') import_from_xml(module_store, 'common/test/data/', ['toy']) @@ -845,7 +855,14 @@ def verify_content_existence(self, store, root_dir, location, dirname, category_ filesystem = OSFS(root_dir / ('test_export/' + dirname)) self.assertTrue(filesystem.exists(item.location.name + filename_suffix)) - def test_export_course(self): + @mock.patch('xmodule.course_module.requests.get') + def test_export_course(self, mock_get): + mock_get.return_value.text = dedent(""" + + + + """).strip() + module_store = modulestore('direct') draft_store = modulestore('draft') content_store = contentstore() diff --git a/lms/djangoapps/courseware/tests/tests.py b/lms/djangoapps/courseware/tests/tests.py index 98bcba4ed096..31dfea8e5f3b 100644 --- a/lms/djangoapps/courseware/tests/tests.py +++ b/lms/djangoapps/courseware/tests/tests.py @@ -1,9 +1,12 @@ """ Test for LMS courseware app. """ +import mock from django.core.urlresolvers import reverse from django.test.utils import override_settings +from textwrap import dedent + from xmodule.error_module import ErrorDescriptor from xmodule.modulestore.django import modulestore from xmodule.modulestore import Location @@ -156,10 +159,14 @@ def setUp(self): self.store = modulestore() import_from_xml(self.store, TEST_DATA_DIR, ['toy']) - def test_toy_course_loads(self): - self.check_all_pages_load('edX/toy/2012_Fall') + @mock.patch('xmodule.course_module.requests.get') + def test_toy_textbooks_loads(self, mock_get): + mock_get.return_value.text = dedent(""" + + + + """).strip() - def test_toy_textbooks_loads(self): location = Location(['i4x', 'edX', 'toy', 'course', '2012_Fall', None]) course = self.store.get_item(location) self.assertGreater(len(course.textbooks), 0)