Commit 391db6a8 by Calen Pennington

Linting cleanups

parent da296442
...@@ -143,7 +143,7 @@ def get_test_system(course_id=SlashSeparatedCourseKey('org', 'course', 'run')): ...@@ -143,7 +143,7 @@ def get_test_system(course_id=SlashSeparatedCourseKey('org', 'course', 'run')):
render_template=mock_render_template, render_template=mock_render_template,
replace_urls=str, replace_urls=str,
user=user, user=user,
get_real_user=lambda(__): user, get_real_user=lambda __: user,
filestore=Mock(name='get_test_system.filestore'), filestore=Mock(name='get_test_system.filestore'),
debug=True, debug=True,
hostname="edx.org", hostname="edx.org",
...@@ -378,11 +378,17 @@ class CourseComparisonTest(BulkAssertionTest): ...@@ -378,11 +378,17 @@ class CourseComparisonTest(BulkAssertionTest):
) )
def assertBlocksEqualByFields(self, expected_block, actual_block): def assertBlocksEqualByFields(self, expected_block, actual_block):
"""
Compare block fields to check for equivalence.
"""
self.assertEqual(expected_block.fields, actual_block.fields) self.assertEqual(expected_block.fields, actual_block.fields)
for field in expected_block.fields.values(): for field in expected_block.fields.values():
self.assertFieldEqual(field, expected_block, actual_block) self.assertFieldEqual(field, expected_block, actual_block)
def assertFieldEqual(self, 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)): if isinstance(field, (Reference, ReferenceList, ReferenceValueDict)):
self.assertReferenceRelativelyEqual(field, expected_block, actual_block) self.assertReferenceRelativelyEqual(field, expected_block, actual_block)
else: else:
...@@ -436,6 +442,9 @@ class CourseComparisonTest(BulkAssertionTest): ...@@ -436,6 +442,9 @@ class CourseComparisonTest(BulkAssertionTest):
self._assertCoursesEqual(expected_items, actual_items, actual_course_key, expect_drafts=True) 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): def _assertCoursesEqual(self, expected_items, actual_items, actual_course_key, expect_drafts=False):
"""
Actual algorithm to compare courses.
"""
with self.bulk_assertions(): with self.bulk_assertions():
self.assertEqual(len(expected_items), len(actual_items)) self.assertEqual(len(expected_items), len(actual_items))
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"graceperiod": "2 days 5 hours 59 minutes 59 seconds", "graceperiod": "2 days 5 hours 59 minutes 59 seconds",
"start": "2015-07-17T12:00", "start": "2015-07-17T12:00",
"display_name": "Toy Course", "display_name": "Toy Course",
"graded": "true", "graded": "true"
}, },
"tabs": [ "tabs": [
{"type": "courseware"}, {"type": "courseware"},
...@@ -19,5 +19,5 @@ ...@@ -19,5 +19,5 @@
}, },
"html/secret:toylab": { "html/secret:toylab": {
"display_name": "Toy lab" "display_name": "Toy lab"
}, }
} }
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
"graceperiod": "2 days 5 hours 59 minutes 59 seconds", "graceperiod": "2 days 5 hours 59 minutes 59 seconds",
"start": "2015-07-17T12:00", "start": "2015-07-17T12:00",
"display_name": "Toy Course", "display_name": "Toy Course",
"graded": "true", "graded": "true"
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment