fixup - re-enable Asset checking.

common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py

@@ -33,6 +33,14 @@ class DraftVersioningModuleStore(ModuleStoreDraftAndPublished, SplitMongoModuleS
             org, course, run, user_id, master_branch=master_branch, **kwargs
         )
         self._auto_publish_no_children(item.location, item.location.category, user_id, **kwargs)
+
+        # create any other necessary things as a side effect: ensure they populate the draft branch
+        # and rely on auto publish to populate the published branch
+        with self.branch_setting(ModuleStoreEnum.Branch.draft_preferred, item.id):
+            super(SplitMongoModuleStore, self).create_course(
+                org, course, run, user_id, **kwargs
+            )
+
         return item
 
     def get_course(self, course_id, depth=0):

common/lib/xmodule/xmodule/modulestore/xml_importer.py

@@ -303,6 +303,8 @@ def _import_course_module(
 
     log.debug('course data_dir={0}'.format(source_course.data_dir))
 
+    with store.branch_setting(ModuleStoreEnum.Branch.draft_preferred, dest_course_id):
+
         course = _import_module_and_update_references(
             source_course, store, user_id,
             course_key,

common/lib/xmodule/xmodule/tests/__init__.py

@@ -203,12 +203,12 @@ class CourseComparisonTest(unittest.TestCase):
         self._assertCoursesEqual(expected_items, actual_items, actual_course_key)
 
         # compare draft
-        if expected_store.get_modulestore_type() == ModuleStoreEnum.Type.split:
+        if expected_store.get_modulestore_type(None) == ModuleStoreEnum.Type.split:
             revision = ModuleStoreEnum.RevisionOption.draft_only
         else:
             revision = None
         expected_items = expected_store.get_items(expected_course_key, revision=revision)
-        if actual_store.get_modulestore_type() == ModuleStoreEnum.Type.split:
+        if actual_store.get_modulestore_type(None) == ModuleStoreEnum.Type.split:
             revision = ModuleStoreEnum.RevisionOption.draft_only
         else:
             revision = None
@@ -276,10 +276,7 @@ class CourseComparisonTest(unittest.TestCase):
                     # get_children was returning drafts for published parents :-(
                     if expect_drafts or not getattr(item_child, 'is_draft', False)
                 ]
-                try:
                 self.assertEqual(expected_children, actual_children)
-                except:
-                    pass
 
     def assertAssetEqual(self, expected_course_key, expected_asset, actual_course_key, actual_asset):
         """
@@ -319,7 +316,6 @@ class CourseComparisonTest(unittest.TestCase):
         ``actual_course_key`` in ``actual_store`` are identical, allowing for differences related
         to their being from different course keys.
         """
-        return  # FIXME remove
         expected_content, expected_count = expected_store.get_all_content_for_course(expected_course_key)
         actual_content, actual_count = actual_store.get_all_content_for_course(actual_course_key)