Small fixes to modulestore test refactoring

common/djangoapps/external_auth/tests/test_ssl.py

@@ -17,11 +17,11 @@ from external_auth.models import ExternalAuthMap
 import external_auth.views
 from mock import Mock
 
-from xmodule.modulestore.tests.django_utils import TEST_DATA_MOCK_MODULESTORE
 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()

common/lib/xmodule/xmodule/modulestore/tests/django_utils.py

@@ -43,9 +43,10 @@ def mixed_store_config(data_dir, mappings, include_xml=False, xml_course_dirs=No
         xml_course_dirs (list): The directories containing XML courses to load from disk.
 
         note: For the courses to be loaded into the XML modulestore and accessible do the following:
-            include_xml should be True
-            xml_course_dirs should be the list of courses you want to load
-            mappings should be configured, pointing the xml courses to the xml modulestore
+            * include_xml should be True
+            * xml_course_dirs should be the list of directories (relative to data_dir)
+                  containing the courses you want to load
+            * mappings should be configured, pointing the xml courses to the xml modulestore
 
     """
     stores = [

lms/djangoapps/courseware/tests/test_masquerade.py

@@ -21,7 +21,7 @@ from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.django_utils import TEST_DATA_MIXED_GRADED_MODULESTORE
 
 
-# TODO: the abtest in the sample course "graded" is currently preventing
+# TODO: the "abtest" node in the sample course "graded" is currently preventing
 # it from being successfully loaded in the mongo modulestore.
 # Fix this testcase class to not depend on that course, and let it use
 # the mocked modulestore instead of the XML.

lms/djangoapps/courseware/tests/test_module_render.py

@@ -3,7 +3,6 @@ Test for lms courseware app, module render unit
 """
 from functools import partial
 import json
-from unittest import skip
 
 import ddt
 from django.http import Http404, HttpResponse
@@ -373,7 +372,6 @@ class TestTOC(ModuleStoreTestCase):
     #     - it loads the active version at the start of the bulk operation
     #     - it loads the course definition for inheritance, because it's outside
     #     the bulk-operation marker that loaded the course descriptor
-    @skip
     @ddt.data((ModuleStoreEnum.Type.mongo, 3, 0, 0), (ModuleStoreEnum.Type.split, 6, 0, 2))
     @ddt.unpack
     def test_toc_toy_from_chapter(self, default_ms, setup_finds, setup_sends, toc_finds):
@@ -412,7 +410,6 @@ class TestTOC(ModuleStoreTestCase):
     #     - it loads the active version at the start of the bulk operation
     #     - it loads the course definition for inheritance, because it's outside
     #     the bulk-operation marker that loaded the course descriptor
-    @skip
     @ddt.data((ModuleStoreEnum.Type.mongo, 3, 0, 0), (ModuleStoreEnum.Type.split, 6, 0, 2))
     @ddt.unpack
     def test_toc_toy_from_section(self, default_ms, setup_finds, setup_sends, toc_finds):

lms/djangoapps/courseware/tests/test_navigation.py

@@ -2,7 +2,6 @@
 This test file will run through some LMS test scenarios regarding access and navigation of the LMS
 """
 import time
-import unittest
 
 from django.conf import settings
 from django.core.urlresolvers import reverse
@@ -121,7 +120,6 @@ class TestNavigation(ModuleStoreTestCase, LoginEnrollmentTestCase):
         self.assertTabActive('progress', response)
         self.assertTabInactive('courseware', response)
 
-    @unittest.skip
     @override_settings(SESSION_INACTIVITY_TIMEOUT_IN_SECONDS=1)
     def test_inactive_session_timeout(self):
         """