diff --git a/common/djangoapps/external_auth/tests/test_ssl.py b/common/djangoapps/external_auth/tests/test_ssl.py index ba47942b6e..fd9d6afe6c 100644 --- a/common/djangoapps/external_auth/tests/test_ssl.py +++ b/common/djangoapps/external_auth/tests/test_ssl.py @@ -21,7 +21,6 @@ from student.models import CourseEnrollment from student.roles import CourseStaffRole from student.tests.factories import UserFactory from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase -from xmodule.modulestore.tests.django_utils import TEST_DATA_MOCK_MODULESTORE from xmodule.modulestore.tests.factories import CourseFactory FEATURES_WITH_SSL_AUTH = settings.FEATURES.copy() @@ -319,8 +318,7 @@ class SSLClientTest(ModuleStoreTestCase): self.assertTrue(self.mock.called) @unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Test only valid in lms') - @override_settings(FEATURES=FEATURES_WITH_SSL_AUTH_AUTO_ACTIVATE, - MODULESTORE=TEST_DATA_MOCK_MODULESTORE) + @override_settings(FEATURES=FEATURES_WITH_SSL_AUTH_AUTO_ACTIVATE) def test_ssl_lms_redirection(self): """ Auto signup auth user and ensure they return to the original diff --git a/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py b/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py index 6d37702ec5..7fcb8e2ad4 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py @@ -196,11 +196,6 @@ TEST_DATA_SPLIT_MODULESTORE = mixed_store_config( store_order=[StoreConstructors.split, StoreConstructors.draft] ) -# Unit tests that are not specifically testing the modulestore implementation but just need course context can use a mocked modulestore. -# Use this modulestore if you do not care about the underlying implementation. -# TODO: acutally mock out the modulestore for this in a subsequent PR. -TEST_DATA_MOCK_MODULESTORE = mixed_store_config(mkdtemp(), {}, include_xml=False) - class ModuleStoreTestCase(TestCase): """ @@ -240,7 +235,7 @@ class ModuleStoreTestCase(TestCase): your `setUp()` method. """ - MODULESTORE = TEST_DATA_MOCK_MODULESTORE + MODULESTORE = mixed_store_config(mkdtemp(), {}, include_xml=False) def setUp(self, **kwargs): """ diff --git a/lms/djangoapps/courseware/tests/test_courses.py b/lms/djangoapps/courseware/tests/test_courses.py index bf7d5958e8..17211f4f56 100644 --- a/lms/djangoapps/courseware/tests/test_courses.py +++ b/lms/djangoapps/courseware/tests/test_courses.py @@ -24,9 +24,7 @@ from xmodule.modulestore.django import _get_modulestore_branch_setting, modulest from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore.xml_importer import import_course_from_xml from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase -from xmodule.modulestore.tests.django_utils import ( - TEST_DATA_MOCK_MODULESTORE, TEST_DATA_MIXED_TOY_MODULESTORE -) +from xmodule.modulestore.tests.django_utils import TEST_DATA_MIXED_TOY_MODULESTORE from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory from xmodule.tests.xml import factories as xml from xmodule.tests.xml import XModuleXmlImportTest @@ -39,9 +37,7 @@ TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT class CoursesTest(ModuleStoreTestCase): """Test methods related to fetching courses.""" - @override_settings( - MODULESTORE=TEST_DATA_MOCK_MODULESTORE, CMS_BASE=CMS_BASE_TEST - ) + @override_settings(CMS_BASE=CMS_BASE_TEST) def test_get_cms_course_block_link(self): """ Tests that get_cms_course_link_by_id and get_cms_block_link_by_id return the right thing @@ -81,9 +77,7 @@ class ModuleStoreBranchSettingTest(ModuleStoreTestCase): self.assertEqual(_get_modulestore_branch_setting(), 'fake_default_branch') -@override_settings( - MODULESTORE=TEST_DATA_MOCK_MODULESTORE, CMS_BASE=CMS_BASE_TEST -) +@override_settings(CMS_BASE=CMS_BASE_TEST) class MongoCourseImageTestCase(ModuleStoreTestCase): """Tests for course image URLs when using a mongo modulestore.""" diff --git a/lms/djangoapps/django_comment_client/base/tests.py b/lms/djangoapps/django_comment_client/base/tests.py index f949f434f9..aef768e026 100644 --- a/lms/djangoapps/django_comment_client/base/tests.py +++ b/lms/djangoapps/django_comment_client/base/tests.py @@ -2,7 +2,6 @@ import logging import json from django.test.client import Client, RequestFactory -from django.test.utils import override_settings from django.contrib.auth.models import User from django.core.management import call_command from django.core.urlresolvers import reverse @@ -11,7 +10,6 @@ from nose.tools import assert_true, assert_equal # pylint: disable=no-name-in-m from opaque_keys.edx.locations import SlashSeparatedCourseKey from lms.lib.comment_client import Thread -from xmodule.modulestore.tests.django_utils import TEST_DATA_MOCK_MODULESTORE from django_comment_client.base import views from django_comment_client.tests.group_id import CohortedTopicGroupIdTestMixin, NonCohortedTopicGroupIdTestMixin, GroupIdAssertionMixin from django_comment_client.tests.utils import CohortedTestCase @@ -993,7 +991,6 @@ class CreateSubCommentUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin, Moc del Thread.commentable_id -@override_settings(MODULESTORE=TEST_DATA_MOCK_MODULESTORE) class ForumEventTestCase(ModuleStoreTestCase, MockRequestSetupMixin): """ Forum actions are expected to launch analytics events. Test these here. @@ -1092,7 +1089,6 @@ class ForumEventTestCase(ModuleStoreTestCase, MockRequestSetupMixin): self.assertEqual(event['options']['followed'], False) -@override_settings(MODULESTORE=TEST_DATA_MOCK_MODULESTORE) class UsersEndpointTestCase(ModuleStoreTestCase, MockRequestSetupMixin): def set_post_counts(self, mock_request, threads_count=1, comments_count=1): diff --git a/lms/djangoapps/instructor/tests/test_api.py b/lms/djangoapps/instructor/tests/test_api.py index 638db67d17..e15cf1e03b 100644 --- a/lms/djangoapps/instructor/tests/test_api.py +++ b/lms/djangoapps/instructor/tests/test_api.py @@ -32,7 +32,6 @@ from opaque_keys.edx.locations import SlashSeparatedCourseKey from course_modes.models import CourseMode from courseware.models import StudentModule from courseware.tests.factories import StaffFactory, InstructorFactory, BetaTesterFactory -from xmodule.modulestore.tests.django_utils import TEST_DATA_MOCK_MODULESTORE from courseware.tests.helpers import LoginEnrollmentTestCase from django_comment_common.models import FORUM_ROLE_COMMUNITY_TA from django_comment_common.utils import seed_permissions_roles @@ -2320,7 +2319,6 @@ class TestInstructorAPIRegradeTask(ModuleStoreTestCase, LoginEnrollmentTestCase) self.assertEqual(response.status_code, 400) -@override_settings(MODULESTORE=TEST_DATA_MOCK_MODULESTORE) @patch.dict(settings.FEATURES, {'ENTRANCE_EXAMS': True}) class TestEntranceExamInstructorAPIRegradeTask(ModuleStoreTestCase, LoginEnrollmentTestCase): """ @@ -2565,7 +2563,6 @@ class TestEntranceExamInstructorAPIRegradeTask(ModuleStoreTestCase, LoginEnrollm self.assertContains(response, message) -@override_settings(MODULESTORE=TEST_DATA_MOCK_MODULESTORE) @patch('bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message')) @patch.dict(settings.FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True, 'REQUIRE_COURSE_EMAIL_AUTH': False}) class TestInstructorSendEmail(ModuleStoreTestCase, LoginEnrollmentTestCase):