Skip to content

Commit a41a413

Browse files
chore: Remove assertQuerysetEqual (#37182)
replace assertQuerysetEqual with assertEqual dut to deprecation in Django 5.2
1 parent 1c0fb8d commit a41a413

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

common/djangoapps/student/tests/test_api.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def test_get_course_enrollments(self):
8888

8989
result = get_course_enrollments(self.user)
9090

91-
self.assertQuerySetEqual(expected, result)
91+
self.assertEqual(list(expected), list(result))
9292

9393
def test_get_filtered_course_enrollments(self):
9494
"""Verify a filtered subset of enrollments can be retrieved"""
@@ -99,4 +99,4 @@ def test_get_filtered_course_enrollments(self):
9999

100100
result = get_course_enrollments(self.user, True, course_ids=[course_2.id])
101101

102-
self.assertQuerySetEqual(expected, result)
102+
self.assertEqual(list(expected), list(result))

lms/djangoapps/verify_student/management/commands/tests/test_manual_verify_student.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def test_manual_verifications_created_date(self):
7777
created_at__gte=earliest_allowed_verification_date()
7878
)
7979

80-
self.assertQuerysetEqual(verification1, [repr(r) for r in verification2], transform=repr)
80+
self.assertEqual(list(map(repr, verification1)), list(map(repr, verification2)))
8181

8282
def test_user_doesnot_exist_log(self):
8383
"""

openedx/core/djangoapps/enrollments/tests/test_services.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ def test_get_enrollments_can_take_proctored_exams_by_course(self):
9797
{'username': 'user4', 'mode': 'professional'},
9898
{'username': 'user5', 'mode': 'verified'}
9999
]
100-
self.assertQuerysetEqual(enrollments, expected_values, self.enrollment_to_dict)
100+
actual_values = [self.enrollment_to_dict(e) for e in enrollments]
101+
self.assertEqual(actual_values, expected_values)
101102

102103
def test_get_enrollments_can_take_proctored_exams_by_course_ignore_inactive(self):
103104
"""
@@ -141,7 +142,8 @@ def test_get_enrollments_can_take_proctored_exams_allow_honor(self):
141142
{'username': 'user5', 'mode': 'verified'}
142143

143144
]
144-
self.assertQuerysetEqual(enrollments, expected_values, self.enrollment_to_dict)
145+
actual_values = [self.enrollment_to_dict(e) for e in enrollments]
146+
self.assertEqual(actual_values, expected_values)
145147

146148
def test_get_enrollments_can_take_proctored_exams_not_enable_proctored_exams(self):
147149
self.course.enable_proctored_exams = False
@@ -180,7 +182,8 @@ def test_text_search_partial_return_some(self):
180182
expected_values = [
181183
{'username': 'user3', 'mode': 'masters'}
182184
]
183-
self.assertQuerysetEqual(enrollments, expected_values, self.enrollment_to_dict)
185+
actual_values = [self.enrollment_to_dict(e) for e in enrollments]
186+
self.assertEqual(actual_values, expected_values)
184187

185188
@ddt.data('user1', 'USER1', '[email protected]', '[email protected]')
186189
def test_text_search_exact_return_one(self, text_search):
@@ -192,7 +195,8 @@ def test_text_search_exact_return_one(self, text_search):
192195
expected_values = [
193196
{'username': 'user1', 'mode': 'executive-education'}
194197
]
195-
self.assertQuerysetEqual(enrollments, expected_values, self.enrollment_to_dict)
198+
actual_values = [self.enrollment_to_dict(e) for e in enrollments]
199+
self.assertEqual(actual_values, expected_values)
196200

197201
def test_text_search_return_none(self):
198202
enrollments = self.service.get_enrollments_can_take_proctored_exams(

0 commit comments

Comments
 (0)