Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #21397 from edx/BOM-95

Browse Source 
BOM-95
This commit is contained in:
Ayub
2019-08-22 12:41:08 +05:00
committed by GitHub
parent b351c5e6c0 8a95a8e520
commit 85be57b64a
43 changed files with 167 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cms/djangoapps/contentstore/management/commands/tests/test_migrate_transcripts.py
View File

@@ -187,7 +187,7 @@ class TestMigrateTranscripts(ModuleStoreTestCase):
Test migrating transcripts
"""
translations = self.video_descriptor.available_translations(self.video_descriptor.get_transcripts_info())
self.assertItemsEqual(translations, ['hr', 'ge'])
six.assertCountEqual(self, translations, ['hr', 'ge'])
self.assertFalse(api.is_transcript_available(self.video_descriptor.edx_video_id, 'hr'))
self.assertFalse(api.is_transcript_available(self.video_descriptor.edx_video_id, 'ge'))
@@ -202,7 +202,7 @@ class TestMigrateTranscripts(ModuleStoreTestCase):
Test migrating transcripts multiple times
"""
translations = self.video_descriptor.available_translations(self.video_descriptor.get_transcripts_info())
self.assertItemsEqual(translations, ['hr', 'ge'])
six.assertCountEqual(self, translations, ['hr', 'ge'])
self.assertFalse(api.is_transcript_available(self.video_descriptor.edx_video_id, 'hr'))
self.assertFalse(api.is_transcript_available(self.video_descriptor.edx_video_id, 'ge'))

3
cms/djangoapps/contentstore/management/commands/tests/test_reindex_courses.py
View File

@@ -4,6 +4,7 @@ from __future__ import absolute_import
import ddt
import mock
from django.core.management import CommandError, call_command
import six
from six import text_type
from contentstore.courseware_index import SearchIndexingError
@@ -104,7 +105,7 @@ class TestReindexCourse(ModuleStoreTestCase):
patched_yes_no.assert_called_once_with(ReindexCommand.CONFIRMATION_PROMPT, default='no')
expected_calls = self._build_calls(self.first_course, self.second_course)
self.assertItemsEqual(patched_index.mock_calls, expected_calls)
six.assertCountEqual(self, patched_index.mock_calls, expected_calls)
def test_given_all_key_prompts_and_reindexes_all_courses_cancelled(self):
""" Test that does not reindex anything when --all key is given and cancelled """

2
cms/djangoapps/contentstore/management/commands/tests/test_reindex_library.py
View File

@@ -104,7 +104,7 @@ class TestReindexLibrary(ModuleStoreTestCase):
patched_yes_no.assert_called_once_with(ReindexCommand.CONFIRMATION_PROMPT, default='no')
expected_calls = self._build_calls(self.first_lib, self.second_lib)
self.assertItemsEqual(patched_index.mock_calls, expected_calls)
six.assertCountEqual(self, patched_index.mock_calls, expected_calls)
def test_given_all_key_prompts_and_reindexes_all_libraries_cancelled(self):
""" Test that does not reindex anything when --all key is given and cancelled """

2
cms/djangoapps/contentstore/views/tests/test_course_index.py
View File

@@ -554,7 +554,7 @@ class TestCourseOutline(CourseTestCase):
[component for component in advanced_modules if component in deprecated_block_types]
)
self.assertItemsEqual(info['blocks'], expected_blocks)
six.assertCountEqual(self, info['blocks'], expected_blocks)
self.assertEqual(
info['advance_settings_url'],
reverse_course_url('advanced_settings_handler', course_id)