Merge branch 'rav/unflake_rejoin_test' into rav/unpick_update_auth_events_and_context_for_auth/4

Author: richvdh

tests/30rooms/31forget.pl

@@ -167,7 +167,8 @@
          any { $_->{type} eq "m.room.message" && $_->{content}->{body} eq "before leave" } @{ $body->{chunk} }
             or die "Should have seen before leave message";
 
-         matrix_send_room_text_message( $creator, $room_id, body => "after rejoin" );
+         # have the creator send another message, and ensure the joiner can see it.
+         matrix_send_room_text_message_synced( $creator, $room_id, body => "after rejoin" );
       })->then( sub {
          matrix_get_room_messages( $user, $room_id, limit => 1 );
       })->then( sub {