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

Merge pull request #22643 from edx/feanil/2to3_asserts

Browse Source 
Run `2to3 -f asserts . -w` on edx-platform.
This commit is contained in:
Feanil Patel
2019-12-30 12:13:42 -05:00
committed by GitHub
parent 61e1eda20d 39d3a7ca17
commit 2df8b8226b
214 changed files with 1459 additions and 1464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/djangoapps/course_api/tests/test_api.py
View File

@@ -205,7 +205,7 @@ class TestGetCourseListMultipleCourses(CourseListTestMixin, ModuleStoreTestCase)
]
for filter_, expected_courses in test_cases:
filtered_courses = self._make_api_call(self.staff_user, self.staff_user, filter_=filter_)
self.assertEquals(
self.assertEqual(
{course.id for course in filtered_courses},
{course.id for course in expected_courses},
u"testing course_api.api.list_courses with filter_={}".format(filter_),

20
lms/djangoapps/course_api/tests/test_views.py
View File

@@ -204,7 +204,7 @@ class CourseListViewTestCaseMultipleCourses(CourseApiTestViewMixin, ModuleStoreT
if filter_:
params.update(filter_)
response = self.verify_response(params=params)
self.assertEquals(
self.assertEqual(
{course['course_id'] for course in response.data['results']},
{six.text_type(course.id) for course in expected_courses},
u"testing course_api.views.CourseListView with filter_={}".format(filter_),
@@ -236,7 +236,7 @@ class CourseListViewTestCaseMultipleCourses(CourseApiTestViewMixin, ModuleStoreT
# Requesting the courses as the non-staff user should *not* be allowed.
self.setup_user(self.honor_user)
filtered_response = self.verify_response(params={'username': self.honor_user.username, 'role': 'staff'})
self.assertEquals(len(filtered_response.data['results']), 0)
self.assertEqual(len(filtered_response.data['results']), 0)
def test_filter_by_roles_course_staff(self):
"""
@@ -257,30 +257,30 @@ class CourseListViewTestCaseMultipleCourses(CourseApiTestViewMixin, ModuleStoreT
'username': course_staff_user.username,
'role': 'staff'
})
self.assertEquals(len(filtered_response.data['results']), 1)
self.assertEquals(filtered_response.data['results'][0]['org'], self.course.org)
self.assertEqual(len(filtered_response.data['results']), 1)
self.assertEqual(filtered_response.data['results'][0]['org'], self.course.org)
# The course staff user does *not* have the course instructor role on any courses.
filtered_response = self.verify_response(params={
'username': course_staff_user.username,
'role': 'instructor'
})
self.assertEquals(len(filtered_response.data['results']), 0)
self.assertEqual(len(filtered_response.data['results']), 0)
# The course instructor user only has the course instructor role on one course.
filtered_response = self.verify_response(params={
'username': course_instructor_user.username,
'role': 'instructor'
})
self.assertEquals(len(filtered_response.data['results']), 1)
self.assertEquals(filtered_response.data['results'][0]['org'], alternate_course.org)
self.assertEqual(len(filtered_response.data['results']), 1)
self.assertEqual(filtered_response.data['results'][0]['org'], alternate_course.org)
# The honor user does *not* have the course staff -or- instructor role on any courses.
filtered_response = self.verify_response(params={
'username': self.honor_user.username,
'role': 'staff,instructor'
})
self.assertEquals(len(filtered_response.data['results']), 0)
self.assertEqual(len(filtered_response.data['results']), 0)
# The course instructor user has the inferred course staff role on one course.
self.setup_user(course_instructor_user)
@@ -288,7 +288,7 @@ class CourseListViewTestCaseMultipleCourses(CourseApiTestViewMixin, ModuleStoreT
'username': course_instructor_user.username,
'role': 'staff'
})
self.assertEquals(len(filtered_response.data['results']), 1)
self.assertEqual(len(filtered_response.data['results']), 1)
class CourseDetailViewTestCase(CourseApiTestViewMixin, SharedModuleStoreTestCase):
@@ -355,7 +355,7 @@ class CourseDetailViewTestCase(CourseApiTestViewMixin, SharedModuleStoreTestCase
request.query_params = {}
request.user = self.staff_user
response = CourseDetailView().dispatch(request, course_key_string='a:b:c')
self.assertEquals(response.status_code, 400)
self.assertEqual(response.status_code, 400)
@override_settings(ELASTIC_FIELD_MAPPINGS={