@@ -367,7 +367,6 @@ func TestMessagesOverFederation(t *testing.T) {
367367 bob .MustJoinRoom (t , roomID , []spec.ServerName {
368368 deployment .GetFullyQualifiedHomeserverName (t , "hs1" ),
369369 })
370- awaitPartialStateJoinCompletion (t , roomID , bob )
371370 aliceSince = alice .MustSyncUntil (t , client.SyncReq {Since : aliceSince }, client .SyncJoinedTo (bob .UserID , roomID ))
372371
373372 // Bob leaves the room
@@ -415,7 +414,6 @@ func _sendAndTestMessageHistory(
415414 bob .MustJoinRoom (t , roomID , []spec.ServerName {
416415 serverToJoinVia ,
417416 })
418- awaitPartialStateJoinCompletion (t , roomID , bob )
419417
420418 // Make it easy to cross-reference the events being talked about in the logs
421419 for eventIndex , eventID := range eventIDs {
@@ -629,20 +627,3 @@ func assertMessagesInTimelineInOrder(t *testing.T, actualEventIDs []string, expe
629627 }
630628 }
631629}
632-
633- // awaitPartialStateJoinCompletion waits until the joined room is no longer partial-stated
634- func awaitPartialStateJoinCompletion (
635- t * testing.T , room_id string , user * client.CSAPI ,
636- ) {
637- t .Helper ()
638-
639- // Use a `/members` request to wait for the room to be un-partial stated.
640- // We avoid using `/sync`, as it only waits (or used to wait) for full state at
641- // particular events, rather than the whole room.
642- user .MustDo (
643- t ,
644- "GET" ,
645- []string {"_matrix" , "client" , "v3" , "rooms" , room_id , "members" },
646- )
647- t .Logf ("%s's partial state join to %s completed." , user .UserID , room_id )
648- }
0 commit comments