Skip to content

Commit c06e64b

Browse files
author
David Robertson
authored
Allow HSes to omit device display names (#1307)
* Allow HSes to omit device display names Hopefully gets matrix-org/synapse#10015 over the line. * Fix perl syntax?!?!
1 parent da1c9e2 commit c06e64b

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

tests/41end-to-end-keys/06-device-lists.pl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,12 @@ sub sync_until_user_in_device_list_id
208208
my $alice_device_keys = $alice_keys->{ $user2->device_id };
209209

210210
# TODO: Check that the content matches what we uploaded.
211-
212-
assert_eq( $alice_device_keys->{"unsigned"}->{"device_display_name"},
213-
"test display name" );
211+
# Device display names aren't mandated in the POST /user/keys/query response,
212+
# and they're considered optional in the GET /user/devices/{userId} response.
213+
# So accept either a match or a lack of key.
214+
my $device_display_name = $alice_device_keys->{"unsigned"}->{"device_display_name"};
215+
(!defined $device_display_name) or ($device_display_name == "test display name") or
216+
croak "Unexpected device_display_name: $device_display_name";
214217

215218
Future->done(1)
216219
});

0 commit comments

Comments
 (0)