BOM-95

assertItemsEqual with six.assertCountEqual

common/test/acceptance/tests/lms/test_lms_courseware.py

@@ -9,6 +9,7 @@ import json
 from datetime import datetime, timedelta
 
 import ddt
+import six
 from six.moves import range
 
 from openedx.core.lib.tests import attr
@@ -939,4 +940,4 @@ class WordCloudTests(UniqueCourseTest):
         self.assertTrue(self.courseware_page.is_word_cloud_rendered)
         self.courseware_page.input_word_cloud('test_wordcloud')
         self.courseware_page.save_word_cloud()
-        self.assertItemsEqual(expected_data, self.courseware_page.word_cloud_answer_list)
+        six.assertCountEqual(self, expected_data, self.courseware_page.word_cloud_answer_list)

common/test/acceptance/tests/studio/test_studio_container.py

@@ -8,6 +8,7 @@ from __future__ import absolute_import
 import datetime
 
 import ddt
+import six
 
 from common.test.acceptance.fixtures.course import XBlockFixtureDesc
 from common.test.acceptance.pages.lms.courseware import CoursewarePage
@@ -297,13 +298,13 @@ class BaseGroupConfigurationsTest(ContainerBase):
         """
         Check that the expected partition scheme is selected.
         """
-        self.assertItemsEqual(expected_scheme, visibility_editor.selected_partition_scheme)
+        six.assertCountEqual(self, expected_scheme, visibility_editor.selected_partition_scheme)
 
     def verify_selected_groups(self, visibility_editor, expected_groups):
         """
         Check the expected partition groups.
         """
-        self.assertItemsEqual(expected_groups, [group.text for group in visibility_editor.selected_groups])
+        six.assertCountEqual(self, expected_groups, [group.text for group in visibility_editor.selected_groups])
 
     def select_and_verify_saved(self, component, partition_label, groups=[]):
         """

common/test/acceptance/tests/studio/test_studio_outline.py

@@ -10,6 +10,7 @@ from datetime import datetime, timedelta
 from unittest import skip
 
 from pytz import UTC
+import six
 from six.moves import range
 
 from common.test.acceptance.fixtures.config import ConfigModelFixture
@@ -1713,7 +1714,7 @@ class DeprecationWarningMessageTest(CourseOutlineTest):
         self.assertEqual(self.course_outline_page.components_visible, components_present)
         if components_present:
             self.assertEqual(self.course_outline_page.components_list_heading, self.COMPONENT_LIST_HEADING)
-            self.assertItemsEqual(self.course_outline_page.components_display_names, components_display_name_list)
+            six.assertCountEqual(self, self.course_outline_page.components_display_names, components_display_name_list)
 
     def test_no_deprecation_warning_message_present(self):
         """