diff --git a/common/test/acceptance/tests/video/test_studio_video_editor.py b/common/test/acceptance/tests/video/test_studio_video_editor.py index f9874f3d6e..2bf878adea 100644 --- a/common/test/acceptance/tests/video/test_studio_video_editor.py +++ b/common/test/acceptance/tests/video/test_studio_video_editor.py @@ -3,7 +3,10 @@ """ Acceptance tests for CMS Video Editor. """ +from __future__ import absolute_import + import ddt + from common.test.acceptance.pages.common.utils import confirm_prompt from common.test.acceptance.tests.video.test_studio_video_module import CMSVideoBaseTest @@ -107,7 +110,7 @@ class VideoEditorTest(CMSVideoBaseTest): self.save_unit_settings() self.assertTrue(self.video.is_captions_visible()) self.assertIn(unicode_text, self.video.captions_text) - self.assertEqual(self.video.caption_languages.keys(), ['zh', 'uk']) + self.assertEqual(list(self.video.caption_languages.keys()), ['zh', 'uk']) def test_save_language_upload_no_transcript(self): """ @@ -128,7 +131,7 @@ class VideoEditorTest(CMSVideoBaseTest): translations_count = self.video.translations_count() self.video.select_translation_language(language_code, translations_count - 1) self.save_unit_settings() - self.assertNotIn(language_code, self.video.caption_languages.keys()) + self.assertNotIn(language_code, list(self.video.caption_languages.keys())) def test_upload_large_transcript(self): """ @@ -177,7 +180,7 @@ class VideoEditorTest(CMSVideoBaseTest): self.edit_component() self.open_advanced_tab() self.assertEqual(self.video.translations(), ['zh', 'uk']) - self.assertEqual(self.video.caption_languages.keys(), ['zh', 'uk']) + self.assertEqual(list(self.video.caption_languages.keys()), ['zh', 'uk']) zh_unicode_text = "好 各位同学".decode('utf-8') self.assertTrue(self.video.download_translation('zh', zh_unicode_text)) uk_unicode_text = "Привіт, edX вітає вас.".decode('utf-8') @@ -396,8 +399,8 @@ class VideoEditorTest(CMSVideoBaseTest): self.assertTrue(self.video.is_captions_visible()) unicode_text = "好 各位同学".decode('utf-8') self.assertIn(unicode_text, self.video.captions_text) - self.assertEqual(self.video.caption_languages.keys(), [u'ab', u'uk']) - self.assertEqual(self.video.caption_languages.keys()[0], 'ab') + self.assertEqual(list(self.video.caption_languages.keys()), [u'ab', u'uk']) + self.assertEqual(list(self.video.caption_languages.keys())[0], 'ab') def test_upload_transcript_with_BOM(self): """ diff --git a/common/test/acceptance/tests/video/test_studio_video_module.py b/common/test/acceptance/tests/video/test_studio_video_module.py index 2eaa70ec38..18388a86fa 100644 --- a/common/test/acceptance/tests/video/test_studio_video_module.py +++ b/common/test/acceptance/tests/video/test_studio_video_module.py @@ -3,12 +3,13 @@ """ Acceptance tests for CMS Video Module. """ +from __future__ import absolute_import + import os from unittest import skipIf -from mock import patch - from bok_choy.promise import EmptyPromise +from mock import patch from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.pages.common.auto_auth import AutoAuthPage diff --git a/common/test/acceptance/tests/video/test_studio_video_transcript.py b/common/test/acceptance/tests/video/test_studio_video_transcript.py index 1fea22a385..f119f65daf 100644 --- a/common/test/acceptance/tests/video/test_studio_video_transcript.py +++ b/common/test/acceptance/tests/video/test_studio_video_transcript.py @@ -18,6 +18,8 @@ front-end validation will not pass. one stored on YouTube t_not_exist - this file does not exist on YouTube; it exists locally """ +from __future__ import absolute_import + from common.test.acceptance.tests.video.test_studio_video_module import CMSVideoBaseTest @@ -72,26 +74,26 @@ class VideoTranscriptTest(CMSVideoBaseTest): # Currently we are working with 2nd field. It means, that if 2nd field # contain incorrect value, 1st and 3rd fields should be disabled until # 2nd field will be filled by correct correct value - self.assertEqual(self.video.url_field_status(1, 3).values(), [False, False]) + self.assertEqual(list(self.video.url_field_status(1, 3).values()), [False, False]) self.video.clear_fields() - self.assertEqual(self.video.url_field_status().values(), [True, True, True]) + self.assertEqual(list(self.video.url_field_status().values()), [True, True, True]) #User input URL with incorrect format self.video.set_url_field('http://link.c', 1) self.assertEqual(self.video.message('error'), 'Incorrect url format.') - self.assertEqual(self.video.url_field_status(2, 3).values(), [False, False]) + self.assertEqual(list(self.video.url_field_status(2, 3).values()), [False, False]) #User input URL with incorrect format self.video.set_url_field('http://goo.gl/pxxZrg', 1) self.video.set_url_field('http://goo.gl/pxxZrg', 2) self.assertEqual(self.video.message('error'), 'Links should be unique.') - self.assertEqual(self.video.url_field_status(1, 3).values(), [False, False]) + self.assertEqual(list(self.video.url_field_status(1, 3).values()), [False, False]) self.video.clear_fields() - self.assertEqual(self.video.url_field_status().values(), [True, True, True]) + self.assertEqual(list(self.video.url_field_status().values()), [True, True, True]) self.video.set_url_field('http://youtu.be/t_not_exist', 1) self.assertEqual(self.video.message('error'), '') - self.assertEqual(self.video.url_field_status().values(), [True, True, True]) + self.assertEqual(list(self.video.url_field_status().values()), [True, True, True]) def test_youtube_server_interaction(self): """ diff --git a/common/test/acceptance/tests/video/test_video_events.py b/common/test/acceptance/tests/video/test_video_events.py index b1a8d5bf97..bfeafb08c1 100644 --- a/common/test/acceptance/tests/video/test_video_events.py +++ b/common/test/acceptance/tests/video/test_video_events.py @@ -1,10 +1,13 @@ """Ensure videos emit proper events""" +from __future__ import absolute_import + import datetime import json from unittest import skip import ddt +import six from opaque_keys.edx.keys import CourseKey, UsageKey from common.test.acceptance.pages.lms.video.video import _parse_time_str @@ -122,7 +125,7 @@ class VideoEventsTest(VideoEventsTestMixin): 'session' ) for field in dynamic_string_fields: - self.assert_field_type(load_video_event, field, basestring) + self.assert_field_type(load_video_event, field, six.string_types) self.assertIn(field, load_video_event, u'{0} not found in the root of the event'.format(field)) del load_video_event[field] @@ -135,7 +138,7 @@ class VideoEventsTest(VideoEventsTestMixin): course_key = CourseKey.from_string(self.course_id) static_fields_pattern = { 'context': { - 'course_id': unicode(course_key), + 'course_id': six.text_type(course_key), 'org_id': course_key.org, 'path': '/event', 'user_id': self.user_info['user_id'] @@ -359,7 +362,7 @@ class VideoBumperEventsTest(VideoEventsTestMixin): 'session' ) for field in dynamic_string_fields: - self.assert_field_type(load_video_event, field, basestring) + self.assert_field_type(load_video_event, field, six.string_types) self.assertIn(field, load_video_event, u'{0} not found in the root of the event'.format(field)) del load_video_event[field] @@ -372,7 +375,7 @@ class VideoBumperEventsTest(VideoEventsTestMixin): course_key = CourseKey.from_string(self.course_id) static_fields_pattern = { 'context': { - 'course_id': unicode(course_key), + 'course_id': six.text_type(course_key), 'org_id': course_key.org, 'path': '/event', 'user_id': self.user_info['user_id'] diff --git a/common/test/acceptance/tests/video/test_video_handout.py b/common/test/acceptance/tests/video/test_video_handout.py index 14efed15c0..0aa3f06c73 100644 --- a/common/test/acceptance/tests/video/test_video_handout.py +++ b/common/test/acceptance/tests/video/test_video_handout.py @@ -3,6 +3,8 @@ """ Acceptance tests for CMS Video Handout. """ +from __future__ import absolute_import + from common.test.acceptance.tests.video.test_studio_video_module import CMSVideoBaseTest diff --git a/common/test/acceptance/tests/video/test_video_license.py b/common/test/acceptance/tests/video/test_video_license.py index 12fdbc0722..da03f76609 100644 --- a/common/test/acceptance/tests/video/test_video_license.py +++ b/common/test/acceptance/tests/video/test_video_license.py @@ -2,7 +2,7 @@ """ Acceptance tests for licensing of the Video module """ -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals from common.test.acceptance.fixtures.course import XBlockFixtureDesc from common.test.acceptance.pages.lms.courseware import CoursewarePage diff --git a/common/test/acceptance/tests/video/test_video_module.py b/common/test/acceptance/tests/video/test_video_module.py index 33c96e69bc..a80247ef0f 100644 --- a/common/test/acceptance/tests/video/test_video_module.py +++ b/common/test/acceptance/tests/video/test_video_module.py @@ -3,11 +3,14 @@ """ Acceptance tests for Video. """ +from __future__ import absolute_import + import os from unittest import skipIf from ddt import data, ddt, unpack from mock import patch +from six.moves import range from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc from common.test.acceptance.pages.common.auto_auth import AutoAuthPage diff --git a/common/test/acceptance/tests/video/test_video_times.py b/common/test/acceptance/tests/video/test_video_times.py index 9fd42cf7c9..0486b4233c 100644 --- a/common/test/acceptance/tests/video/test_video_times.py +++ b/common/test/acceptance/tests/video/test_video_times.py @@ -1,6 +1,8 @@ """ Acceptance tests for Video Times(Start, End and Finish) functionality. """ +from __future__ import absolute_import + from common.test.acceptance.tests.video.test_video_module import VideoBaseTest