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

Allow HSes to omit device display names #1307

Merged
merged 2 commits into from
Oct 18, 2022
Merged

Allow HSes to omit device display names #1307

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f033a14
Allow HSes to omit device display names
Oct 18, 2022
db2df71
Fix perl syntax?!?!
Oct 18, 2022
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
9 changes: 6 additions & 3 deletions tests/41end-to-end-keys/06-device-lists.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,12 @@ sub sync_until_user_in_device_list_id
my $alice_device_keys = $alice_keys->{ $user2->device_id };

# TODO: Check that the content matches what we uploaded.

assert_eq( $alice_device_keys->{"unsigned"}->{"device_display_name"},
"test display name" );
# Device display names aren't mandated in the POST /user/keys/query response,
# and they're considered optional in the GET /user/devices/{userId} response.
# So accept either a match or a lack of key.
my $device_display_name = $alice_device_keys->{"unsigned"}->{"device_display_name"};
(!defined $device_display_name) or ($device_display_name == "test display name") or
croak "Unexpected device_display_name: $device_display_name";

Future->done(1)
});
Expand Down