Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Remove usage of deprecated assertDictContainsSubset unittest method. #34330

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

chore: Remove usage of deprecated assertDictContainsSubset unittest method. #34330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
823ebee
chore: Fix deprecation warning from cms-1 tests
lewisemm Feb 19, 2024
17bd0b5
chore: Fix deprecation warning from cms-2 tests
lewisemm Feb 19, 2024
def0183
chore: Fix deprecation logs from common-with-cms
lewisemm Feb 19, 2024
e5795d5
chore: Fix deprecation logs from common-with-lms
lewisemm Feb 20, 2024
ca15742
chore: Fix deprecation logs from lms-1
lewisemm Feb 20, 2024
2b446ce
chore: Fix deprecation logs from lms-3
lewisemm Feb 26, 2024
6bd583a
chore: Fix deprecation logs from lms-4
lewisemm Feb 26, 2024
718ce58
chore: Fix deprecation logs from lms-5
lewisemm Feb 26, 2024
cfcb307
chore: Fix deprecation logs from lms-6
lewisemm Mar 4, 2024
922218d
chore: Fix deprecation logs in openedx-1-with-cms
lewisemm Mar 4, 2024
87c4507
chore: Fix deprecation logs in openedx-1-with-lms
lewisemm Mar 4, 2024
442d3ba
chore: Fix deprecation logs in openedx-2-with-cms
lewisemm Mar 5, 2024
5cc19ce
chore: Fix deprecation logs in openedx-2-with-lms
lewisemm Mar 5, 2024
ce78568
chore: Fix deprecation logs in xmodule-with-cms
lewisemm Mar 5, 2024
e479208
chore: use unittest method assertLessEqual
lewisemm Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion cms/djangoapps/api/v1/tests/test_views/test_course_runs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,11 @@ def test_create_with_invalid_course_team(self):
data['team'] = [{'user': 'invalid-username'}]
response = self.client.post(self.list_url, data, format='json')
self.assertEqual(response.status_code, 400)
self.assertDictContainsSubset({'team': ['Course team user does not exist']}, response.data)
invalid_course_team_user = {'team': ['Course team user does not exist']}
self.assertLessEqual(
invalid_course_team_user.items(),
response.data.items()
)

def test_images_upload(self):
# http://www.django-rest-framework.org/api-guide/parsers/#fileuploadparser
Expand Down
23 changes: 12 additions & 11 deletions cms/djangoapps/contentstore/views/tests/test_block.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,17 +853,18 @@ def test_duplicate_event(self):
XBLOCK_DUPLICATED.connect(event_receiver)
usage_key = self._duplicate_and_verify(self.vert_usage_key, self.seq_usage_key)
event_receiver.assert_called()
self.assertDictContainsSubset(
{
"signal": XBLOCK_DUPLICATED,
"sender": None,
"xblock_info": DuplicatedXBlockData(
usage_key=usage_key,
block_type=usage_key.block_type,
source_usage_key=self.vert_usage_key,
),
},
event_receiver.call_args.kwargs,
duplicated_event = {
"signal": XBLOCK_DUPLICATED,
"sender": None,
"xblock_info": DuplicatedXBlockData(
usage_key=usage_key,
block_type=usage_key.block_type,
source_usage_key=self.vert_usage_key,
),
}
self.assertLessEqual(
duplicated_event.items(),
event_receiver.call_args.kwargs.items()
)

def test_ordering(self):
Expand Down
170 changes: 87 additions & 83 deletions common/djangoapps/student/tests/test_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,30 +271,31 @@ def test_enrollment_created_event_emitted(self):
enrollment = CourseEnrollment.enroll(self.user, self.course.id)

self.assertTrue(self.receiver_called)
self.assertDictContainsSubset(
{
"signal": COURSE_ENROLLMENT_CREATED,
"sender": None,
"enrollment": CourseEnrollmentData(
user=UserData(
pii=UserPersonalData(
username=self.user.username,
email=self.user.email,
name=self.user.profile.name,
),
id=self.user.id,
is_active=self.user.is_active,
enrollment_created_event = {
"signal": COURSE_ENROLLMENT_CREATED,
"sender": None,
"enrollment": CourseEnrollmentData(
user=UserData(
pii=UserPersonalData(
username=self.user.username,
email=self.user.email,
name=self.user.profile.name,
),
course=CourseData(
course_key=self.course.id,
display_name=self.course.display_name,
),
mode=enrollment.mode,
is_active=enrollment.is_active,
creation_date=enrollment.created,
id=self.user.id,
is_active=self.user.is_active,
),
},
event_receiver.call_args.kwargs
course=CourseData(
course_key=self.course.id,
display_name=self.course.display_name,
),
mode=enrollment.mode,
is_active=enrollment.is_active,
creation_date=enrollment.created,
),
}
self.assertLessEqual(
enrollment_created_event.items(),
event_receiver.call_args.kwargs.items()
)

def test_enrollment_changed_event_emitted(self):
Expand All @@ -314,30 +315,31 @@ def test_enrollment_changed_event_emitted(self):
enrollment.update_enrollment(mode="verified")

self.assertTrue(self.receiver_called)
self.assertDictContainsSubset(
{
"signal": COURSE_ENROLLMENT_CHANGED,
"sender": None,
"enrollment": CourseEnrollmentData(
user=UserData(
pii=UserPersonalData(
username=self.user.username,
email=self.user.email,
name=self.user.profile.name,
),
id=self.user.id,
is_active=self.user.is_active,
enrollment_changed_event = {
"signal": COURSE_ENROLLMENT_CHANGED,
"sender": None,
"enrollment": CourseEnrollmentData(
user=UserData(
pii=UserPersonalData(
username=self.user.username,
email=self.user.email,
name=self.user.profile.name,
),
course=CourseData(
course_key=self.course.id,
display_name=self.course.display_name,
),
mode=enrollment.mode,
is_active=enrollment.is_active,
creation_date=enrollment.created,
id=self.user.id,
is_active=self.user.is_active,
),
},
event_receiver.call_args.kwargs
course=CourseData(
course_key=self.course.id,
display_name=self.course.display_name,
),
mode=enrollment.mode,
is_active=enrollment.is_active,
creation_date=enrollment.created,
),
}
self.assertLessEqual(
enrollment_changed_event.items(),
event_receiver.call_args.kwargs.items()
)

def test_unenrollment_completed_event_emitted(self):
Expand All @@ -357,30 +359,31 @@ def test_unenrollment_completed_event_emitted(self):
CourseEnrollment.unenroll(self.user, self.course.id)

self.assertTrue(self.receiver_called)
self.assertDictContainsSubset(
{
"signal": COURSE_UNENROLLMENT_COMPLETED,
"sender": None,
"enrollment": CourseEnrollmentData(
user=UserData(
pii=UserPersonalData(
username=self.user.username,
email=self.user.email,
name=self.user.profile.name,
),
id=self.user.id,
is_active=self.user.is_active,
),
course=CourseData(
course_key=self.course.id,
display_name=self.course.display_name,
unenrollment_completed_event = {
"signal": COURSE_UNENROLLMENT_COMPLETED,
"sender": None,
"enrollment": CourseEnrollmentData(
user=UserData(
pii=UserPersonalData(
username=self.user.username,
email=self.user.email,
name=self.user.profile.name,
),
mode=enrollment.mode,
is_active=False,
creation_date=enrollment.created,
id=self.user.id,
is_active=self.user.is_active,
),
},
event_receiver.call_args.kwargs
course=CourseData(
course_key=self.course.id,
display_name=self.course.display_name,
),
mode=enrollment.mode,
is_active=False,
creation_date=enrollment.created,
),
}
self.assertLessEqual(
unenrollment_completed_event.items(),
event_receiver.call_args.kwargs.items()
)


Expand Down Expand Up @@ -430,25 +433,26 @@ def test_access_role_created_event_emitted(self, AccessRole):
role.add_users(self.user)

self.assertTrue(self.receiver_called)
self.assertDictContainsSubset(
{
"signal": COURSE_ACCESS_ROLE_ADDED,
"sender": None,
"course_access_role_data": CourseAccessRoleData(
user=UserData(
pii=UserPersonalData(
username=self.user.username,
email=self.user.email,
),
id=self.user.id,
is_active=self.user.is_active,
access_role_created_event = {
"signal": COURSE_ACCESS_ROLE_ADDED,
"sender": None,
"course_access_role_data": CourseAccessRoleData(
user=UserData(
pii=UserPersonalData(
username=self.user.username,
email=self.user.email,
),
course_key=self.course_key,
org_key=self.course_key.org,
role=role._role_name, # pylint: disable=protected-access
id=self.user.id,
is_active=self.user.is_active,
),
},
event_receiver.call_args.kwargs
course_key=self.course_key,
org_key=self.course_key.org,
role=role._role_name, # pylint: disable=protected-access
),
}
self.assertLessEqual(
access_role_created_event.items(),
event_receiver.call_args.kwargs.items()
)

@ddt.data(
Expand Down
2 changes: 1 addition & 1 deletion common/djangoapps/terrain/stubs/tests/test_edxnotes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def test_note_create(self):
assert 'created' in response_content
assert 'updated' in response_content
assert 'annotator_schema_version' in response_content
self.assertDictContainsSubset(dummy_note, response_content)
self.assertLessEqual(dummy_note.items(), response_content.items())

def test_note_read(self):
notes = self._get_notes()
Expand Down
19 changes: 15 additions & 4 deletions common/djangoapps/third_party_auth/tests/specs/test_testshib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,9 +396,14 @@ def test_debug_mode_login(self, debug_mode_enabled):
assert msg.startswith('SAML login %s')
assert action_type == 'request'
assert idp_name == self.PROVIDER_IDP_SLUG
self.assertDictContainsSubset(
{"idp": idp_name, "auth_entry": "login", "next": expected_next_url},
request_data
partial_request_data = {
"idp": idp_name,
"auth_entry": "login",
"next": expected_next_url
}
self.assertLessEqual(
partial_request_data.items(),
request_data.dict().items()
)
assert next_url == expected_next_url
assert '<samlp:AuthnRequest' in xml
Expand All @@ -407,7 +412,13 @@ def test_debug_mode_login(self, debug_mode_enabled):
assert msg.startswith('SAML login %s')
assert action_type == 'response'
assert idp_name == self.PROVIDER_IDP_SLUG
self.assertDictContainsSubset({"RelayState": idp_name}, response_data)
partial_response_data = {
"RelayState": idp_name
}
self.assertLessEqual(
partial_response_data.items(),
response_data.dict().items()
)
assert 'SAMLResponse' in response_data
assert next_url == expected_next_url
assert '<saml2p:Response' in xml
Expand Down
19 changes: 10 additions & 9 deletions common/djangoapps/third_party_auth/tests/test_identityserver3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,14 @@ def test_user_details_without_settings(self):
Test user details fields are mapped to default keys
"""
provider_config = self.configure_identityServer3_provider(enabled=True)
self.assertDictContainsSubset(
{
"username": "Edx",
"email": "[email protected]",
"first_name": "Edx",
"last_name": "Openid",
"fullname": "Edx Openid"
},
provider_config.backend_class().get_user_details(self.response)
user_details = {
"username": "Edx",
"email": "[email protected]",
"first_name": "Edx",
"last_name": "Openid",
"fullname": "Edx Openid"
}
self.assertLessEqual(
user_details.items(),
provider_config.backend_class().get_user_details(self.response).items()
)
10 changes: 6 additions & 4 deletions common/djangoapps/third_party_auth/tests/test_lti.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,11 @@ def test_validate_lti_valid_request(self):
lti_max_timestamp_age=10
)
assert parameters
self.assertDictContainsSubset({
subset_params = {
'custom_extra': 'parameter',
'user_id': '292832126'
}, parameters)
}
self.assertLessEqual(subset_params.items(), parameters.items())

def test_validate_lti_valid_request_with_get_params(self):
request = Request(
Expand All @@ -72,10 +73,11 @@ def test_validate_lti_valid_request_with_get_params(self):
lti_max_timestamp_age=10
)
assert parameters
self.assertDictContainsSubset({
subset_params = {
'custom_extra': 'parameter',
'user_id': '292832126'
}, parameters)
}
self.assertLessEqual(subset_params.items(), parameters.items())

def test_validate_lti_old_timestamp(self):
request = Request(
Expand Down
Loading
Loading