fix contentstore indexing tests and quality

common/lib/xmodule/xmodule/tests/test_video.py

@@ -977,7 +977,7 @@ class VideoDescriptorIndexingTestCase(unittest.TestCase):
         '''
 
         descriptor = instantiate_descriptor(data=xml_data_transcripts)
-        translations = descriptor.available_translations(descriptor.get_transcripts_info())
+        translations = descriptor.available_translations(descriptor.get_transcripts_info(include_val_transcripts=False))
         self.assertEqual(translations, ['hr', 'ge'])
 
     def test_video_with_no_transcripts_translation_retrieval(self):
@@ -987,13 +987,17 @@ class VideoDescriptorIndexingTestCase(unittest.TestCase):
         does not throw an exception.
         """
         descriptor = instantiate_descriptor(data=None)
-        translations_with_fallback = descriptor.available_translations(descriptor.get_transcripts_info())
+        translations_with_fallback = descriptor.available_translations(
+            descriptor.get_transcripts_info(include_val_transcripts=False)
+        )
         self.assertEqual(translations_with_fallback, ['en'])
 
         with patch.dict(settings.FEATURES, FALLBACK_TO_ENGLISH_TRANSCRIPTS=False):
             # Some organizations don't have English transcripts for all videos
             # This feature makes it configurable
-            translations_no_fallback = descriptor.available_translations(descriptor.get_transcripts_info())
+            translations_no_fallback = descriptor.available_translations(
+                descriptor.get_transcripts_info(include_val_transcripts=False)
+            )
             self.assertEqual(translations_no_fallback, [])
 
     @override_settings(ALL_LANGUAGES=ALL_LANGUAGES)
@@ -1017,7 +1021,11 @@ class VideoDescriptorIndexingTestCase(unittest.TestCase):
             </video>
         '''
         descriptor = instantiate_descriptor(data=xml_data_transcripts)
-        translations = descriptor.available_translations(descriptor.get_transcripts_info(), verify_assets=False)
+        translations = descriptor.available_translations(
+            descriptor.get_transcripts_info(include_val_transcripts=False),
+            include_val_transcripts=False,
+            verify_assets=False
+        )
         self.assertNotEqual(translations, ['ur'])
 
     def assert_validation_message(self, validation, expected_msg):
@@ -1073,6 +1081,6 @@ class VideoDescriptorIndexingTestCase(unittest.TestCase):
         """
         descriptor = instantiate_descriptor(data=None)
         descriptor.transcripts = None
-        response = descriptor.get_transcripts_info()
+        response = descriptor.get_transcripts_info(include_val_transcripts=False)
         expected = {'transcripts': {}, 'sub': ''}
         self.assertEquals(expected, response)

common/lib/xmodule/xmodule/video_module/bumper_utils.py

@@ -121,7 +121,7 @@ def bumper_metadata(video, sources):
     """
     Generate bumper metadata.
     """
-    transcripts = video.get_transcripts_info(is_bumper=True)
+    transcripts = video.get_transcripts_info(is_bumper=True, include_val_transcripts=False)
     unused_track_url, bumper_transcript_language, bumper_languages = video.get_transcripts_for_student(transcripts)
 
     metadata = OrderedDict({

common/lib/xmodule/xmodule/video_module/transcripts_utils.py

@@ -770,12 +770,16 @@ class VideoTranscriptsMixin(object):
             transcript_language = u'en'
         return transcript_language
 
-    def get_transcripts_info(self, is_bumper=False):
+    def get_transcripts_info(self, is_bumper=False, include_val_transcripts=True):
         """
         Returns a transcript dictionary for the video.
 
         Arguments:
             is_bumper(bool): If True, the request is for the bumper transcripts
+            include_val_transcripts(bool): If True, val transcripts will also get included
+
+        Note: Do not include VAL transcripts into the transcripts metadata if the request is for bumper transcripts.
+        Currently, we don't handle video pre-load/bumper transcripts in edx-val.
         """
         if is_bumper:
             transcripts = copy.deepcopy(get_bumper_settings(self).get('transcripts', {}))
@@ -790,10 +794,7 @@ class VideoTranscriptsMixin(object):
             for language_code, transcript_file in transcripts.items() if transcript_file != ''
         }
 
-        # Do not include VAL transcripts into the transcripts metadata
-        # if the request is for bumper transcripts. Currently, we don't
-        # handle video pre-load/bumper transcripts in edx-val.
-        if not is_bumper:
+        if include_val_transcripts:
             transcript_languages = get_available_transcript_languages(
                 edx_video_id=self.edx_video_id,
                 youtube_id_1_0=self.youtube_id_1_0,

common/lib/xmodule/xmodule/video_module/video_handlers.py

@@ -226,7 +226,7 @@ class VideoStudentViewHandlers(object):
         is_bumper = request.GET.get('is_bumper', False)
         # Currently, we don't handle video pre-load/bumper transcripts in edx-val.
         include_val_transcripts = not is_bumper
-        transcripts = self.get_transcripts_info(is_bumper)
+        transcripts = self.get_transcripts_info(is_bumper, include_val_transcripts=include_val_transcripts)
         if dispatch.startswith('translation'):
             language = dispatch.replace('translation', '').strip('/')
 

common/lib/xmodule/xmodule/video_module/video_module.py

@@ -922,7 +922,8 @@ class VideoDescriptor(VideoFields, VideoTranscriptsMixin, VideoStudioViewHandler
         def _update_transcript_for_index(language=None):
             """ Find video transcript - if not found, don't update index """
             try:
-                transcripts = self.get_transcripts_info()
+                # This is to index contentstore transcripts so, do not include VAL transcripts.
+                transcripts = self.get_transcripts_info(include_val_transcripts=False)
                 transcript = self.get_transcript(
                     transcripts, transcript_format='txt', lang=language
                 )[0].replace("\n", " ")

lms/djangoapps/mobile_api/video_outlines/tests.py

@@ -889,7 +889,7 @@ class TestVideoSummaryList(TestVideoAPITestCase, MobileAuthTestMixin, MobileCour
     @ddt.unpack
     @patch('xmodule.video_module.transcripts_utils.edxval_api.get_available_transcript_languages')
     def test_val_transcript_languages(self, transcripts, english_sub, val_transcripts,
-                                                  expected_transcripts, mock_get_transcript_languages):
+                                      expected_transcripts, mock_get_transcript_languages):
         """
         Tests that serialized course outline includes the VAL transcripts/translations languages as well.
         """