diff --git a/common/lib/xmodule/xmodule/tests/test_import.py b/common/lib/xmodule/xmodule/tests/test_import.py index bb0d200bb6..ecd99ebb58 100644 --- a/common/lib/xmodule/xmodule/tests/test_import.py +++ b/common/lib/xmodule/xmodule/tests/test_import.py @@ -323,8 +323,8 @@ class ImportTestCase(BaseCourseTestCase): location = Location(["i4x", "edX", "toy", "video", "Welcome"]) toy_video = modulestore.get_instance(toy_id, location) two_toy_video = modulestore.get_instance(two_toy_id, location) - self.assertEqual(etree.fromstring(toy_video.data).get('youtube'), "1.0:p2Q6BrNhdh8") - self.assertEqual(etree.fromstring(two_toy_video.data).get('youtube'), "1.0:p2Q6BrNhdh9") + self.assertEqual(toy_video.youtube_id_1_0, "p2Q6BrNhdh8") + self.assertEqual(two_toy_video.youtube_id_1_0, "p2Q6BrNhdh9") def test_colon_in_url_name(self): """Ensure that colons in url_names convert to file paths properly""" diff --git a/common/lib/xmodule/xmodule/video_module.py b/common/lib/xmodule/xmodule/video_module.py index e0cf534513..bb787b9f2a 100644 --- a/common/lib/xmodule/xmodule/video_module.py +++ b/common/lib/xmodule/xmodule/video_module.py @@ -90,12 +90,12 @@ class VideoDescriptor(VideoFields, stores_state = True template_dir_name = "video" - metadata_attributes = RawDescriptor.metadata_attributes + ('youtube_id_1_0', - 'youtube_id_0_75', - 'youtube_id_1_25', - 'youtube_id_1_5') + # metadata_attributes = RawDescriptor.metadata_attributes + ('youtube_id_1_0', + # 'youtube_id_0_75', + # 'youtube_id_1_25', + # 'youtube_id_1_5') - metadata_to_strip = RawDescriptor.metadata_to_strip + ('show_captions',) + # metadata_to_strip = RawDescriptor.metadata_to_strip + ('show_captions',) @property def non_editable_metadata_fields(self): diff --git a/common/test/data/full/sequential/Administrivia_and_Circuit_Elements.xml b/common/test/data/full/sequential/Administrivia_and_Circuit_Elements.xml index 47b19f75ed..28cb5aa42e 100644 --- a/common/test/data/full/sequential/Administrivia_and_Circuit_Elements.xml +++ b/common/test/data/full/sequential/Administrivia_and_Circuit_Elements.xml @@ -8,7 +8,7 @@ - diff --git a/common/test/data/full/vertical/vertical_58.xml b/common/test/data/full/vertical/vertical_58.xml index 5707e6acf3..cd262512ae 100644 --- a/common/test/data/full/vertical/vertical_58.xml +++ b/common/test/data/full/vertical/vertical_58.xml @@ -1,5 +1,5 @@ -