From 67ad03bad22083cc2675106a816fbdb5ec0b33dc Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 14 Oct 2020 15:50:40 +0100 Subject: [PATCH 1/2] Fix "Event with an invalid signature in the send_join response should not cause room join to fail" --- tests/50federation/30room-join.pl | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tests/50federation/30room-join.pl b/tests/50federation/30room-join.pl index a9ffe1699..47b0298d9 100644 --- a/tests/50federation/30room-join.pl +++ b/tests/50federation/30room-join.pl @@ -1017,7 +1017,7 @@ sub assert_is_valid_pdu { my $room_id = $room->room_id; my $event = $room->create_and_insert_event( - sender => "\@test:$local_server_name", + sender => "$creator_id", type => "test", room_id => $room_id, state_key => "", @@ -1089,14 +1089,17 @@ sub assert_is_valid_pdu { $body->{room_id} eq $room_id or die "Expected room_id to be $room_id"; - - matrix_get_my_member_event( $user, $room_id ) - })->then( sub { - my ( $event ) = @_; - - assert_json_keys( $event->{content}, qw( membership ) ); - - Future->done(1); + })->then(sub { + await_sync_timeline_contains( $user, $room_id, check => sub { + my ( $event ) = @_; + + assert_json_keys( $event, qw( type sender )); + return unless $event->{type} eq "m.room.member"; + assert_json_keys( $event->{content}, qw( membership ) ); + return unless $event->{sender} eq $user->user_id; + + Future->done(1); + }); }), ) }; From f809e9083ce0ae995eda46864159d813bec87d02 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 14 Oct 2020 15:53:21 +0100 Subject: [PATCH 2/2] Indentation, again, damnit --- tests/50federation/30room-join.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/50federation/30room-join.pl b/tests/50federation/30room-join.pl index 47b0298d9..931d8b1c0 100644 --- a/tests/50federation/30room-join.pl +++ b/tests/50federation/30room-join.pl @@ -1091,14 +1091,14 @@ sub assert_is_valid_pdu { die "Expected room_id to be $room_id"; })->then(sub { await_sync_timeline_contains( $user, $room_id, check => sub { - my ( $event ) = @_; + my ( $event ) = @_; - assert_json_keys( $event, qw( type sender )); - return unless $event->{type} eq "m.room.member"; - assert_json_keys( $event->{content}, qw( membership ) ); - return unless $event->{sender} eq $user->user_id; + assert_json_keys( $event, qw( type sender )); + return unless $event->{type} eq "m.room.member"; + assert_json_keys( $event->{content}, qw( membership ) ); + return unless $event->{sender} eq $user->user_id; - Future->done(1); + Future->done(1); }); }), )