diff --git a/common/lib/xmodule/xmodule/tests/__init__.py b/common/lib/xmodule/xmodule/tests/__init__.py index 6b6edda4c4..e8dc7ab1d8 100644 --- a/common/lib/xmodule/xmodule/tests/__init__.py +++ b/common/lib/xmodule/xmodule/tests/__init__.py @@ -143,7 +143,7 @@ def get_test_system(course_id=SlashSeparatedCourseKey('org', 'course', 'run')): render_template=mock_render_template, replace_urls=str, user=user, - get_real_user=lambda(__): user, + get_real_user=lambda __: user, filestore=Mock(name='get_test_system.filestore'), debug=True, hostname="edx.org", @@ -378,11 +378,17 @@ class CourseComparisonTest(BulkAssertionTest): ) def assertBlocksEqualByFields(self, expected_block, actual_block): + """ + Compare block fields to check for equivalence. + """ self.assertEqual(expected_block.fields, actual_block.fields) for field in expected_block.fields.values(): self.assertFieldEqual(field, expected_block, actual_block) def assertFieldEqual(self, field, expected_block, actual_block): + """ + Compare a single block field for equivalence. + """ if isinstance(field, (Reference, ReferenceList, ReferenceValueDict)): self.assertReferenceRelativelyEqual(field, expected_block, actual_block) else: @@ -436,6 +442,9 @@ class CourseComparisonTest(BulkAssertionTest): self._assertCoursesEqual(expected_items, actual_items, actual_course_key, expect_drafts=True) def _assertCoursesEqual(self, expected_items, actual_items, actual_course_key, expect_drafts=False): + """ + Actual algorithm to compare courses. + """ with self.bulk_assertions(): self.assertEqual(len(expected_items), len(actual_items)) diff --git a/common/test/data/aside/policies/2012_Fall.json b/common/test/data/aside/policies/2012_Fall.json index c3ba2f869e..4a59afde57 100644 --- a/common/test/data/aside/policies/2012_Fall.json +++ b/common/test/data/aside/policies/2012_Fall.json @@ -3,7 +3,7 @@ "graceperiod": "2 days 5 hours 59 minutes 59 seconds", "start": "2015-07-17T12:00", "display_name": "Toy Course", - "graded": "true", + "graded": "true" }, "tabs": [ {"type": "courseware"}, @@ -19,5 +19,5 @@ }, "html/secret:toylab": { "display_name": "Toy lab" - }, + } } diff --git a/common/test/data/xml_dag/policies/2012_Fall.json b/common/test/data/xml_dag/policies/2012_Fall.json index 82bfa20787..a135872075 100644 --- a/common/test/data/xml_dag/policies/2012_Fall.json +++ b/common/test/data/xml_dag/policies/2012_Fall.json @@ -3,6 +3,6 @@ "graceperiod": "2 days 5 hours 59 minutes 59 seconds", "start": "2015-07-17T12:00", "display_name": "Toy Course", - "graded": "true", + "graded": "true" } }