Merge pull request #7988 from edx/shr/bug/PLAT-612-video-component-missing-tests

edx-val-Fix VAL error on re-import

cms/djangoapps/contentstore/tests/test_import.py

@@ -283,3 +283,23 @@ class ContentStoreImportTest(SignalDisconnectTestMixin, ModuleStoreTestCase):
         }
 
         self.assertEqual(remapped_verticals, split_test_module.group_id_to_child)
+
+    @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split)
+    def test_video_components_present_while_import(self, store):
+        """
+        Test that video components with same edx_video_id are present while re-importing
+        """
+        with modulestore().default_store(store):
+            module_store = modulestore()
+            course_id = module_store.make_course_key('edX', 'test_import_course', '2012_Fall')
+
+            # Import first time
+            __, __, course = self.load_test_import_course(target_id=course_id, module_store=module_store)
+
+            # Re-import
+            __, __, re_course = self.load_test_import_course(target_id=course.id, module_store=module_store)
+
+            vertical = module_store.get_item(re_course.id.make_usage_key('vertical', 'vertical_test'))
+
+            video = module_store.get_item(vertical.children[1])
+            self.assertEqual(video.display_name, 'default')

common/test/data/test_import_course/video/separate_file_video.xml

-<video display_name="default" youtube_id_0_75="JMD_ifUUfsU" youtube_id_1_0="OEoXaMPEzfM" youtube_id_1_25="AKqURZnYqpk" youtube_id_1_5="DYpADpL7jAY" name="sample_video"/>
+<video display_name="default" youtube_id_0_75="JMD_ifUUfsU" youtube_id_1_0="OEoXaMPEzfM" youtube_id_1_25="AKqURZnYqpk" youtube_id_1_5="DYpADpL7jAY" name="sample_video" edx_video_id="dummy_edx_video_id">
+    <video_asset client_video_id="dummy.mp4" duration="390.82">
+        <encoded_video bitrate="0" file_size="0" profile="youtube" url="4TjAQhjwPAw"/>
+    </video_asset>
+</video>

requirements/edx/github.txt

@@ -42,7 +42,7 @@ git+https://github.com/hmarr/django-debug-toolbar-mongo.git@b0686a76f1ce3532088c
 -e git+https://github.com/edx/ease.git@c6dee053eae6b3ac4fdf6be11fa7a9f8265540aa#egg=ease
 -e git+https://github.com/edx/i18n-tools.git@7b89d5e01c1a7cc5d69d813bd8c6b706a8f75119#egg=i18n-tools
 -e git+https://github.com/edx/edx-oauth2-provider.git@0.5.1#egg=oauth2-provider
--e git+https://github.com/edx/edx-val.git@d6087908aa3dd05ceaa7f56a21284f86c53cb3f0#egg=edx-val
+-e git+https://github.com/edx/edx-val.git@b1e11c9af3233bc06a17acbb33179f46d43c3b87#egg=edx-val
 -e git+https://github.com/pmitros/RecommenderXBlock.git@9b07e807c89ba5761827d0387177f71aa57ef056#egg=recommender-xblock
 -e git+https://github.com/edx/edx-milestones.git@547f2250ee49e73ce8d7ff4e78ecf1b049892510#egg=edx-milestones
 -e git+https://github.com/edx/edx-search.git@59c7b4a8b61e8f7c4607669ea48e070555cca2fe#egg=edx-search