From b165c44080715a157d170a126dc818de188bb335 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Fri, 31 Jul 2020 13:50:15 +0200 Subject: [PATCH] Reuse existing "WaitForUsersJoined" for test. --- src/signaling/backend_server_test.go | 48 +--------------------------- 1 file changed, 1 insertion(+), 47 deletions(-) diff --git a/src/signaling/backend_server_test.go b/src/signaling/backend_server_test.go index fa932b5..3ef3279 100644 --- a/src/signaling/backend_server_test.go +++ b/src/signaling/backend_server_test.go @@ -946,53 +946,7 @@ func TestBackendServer_ParticipantsUpdateTimeout(t *testing.T) { defer hubRoom.Close() } - // We will receive "joined" events for all clients. The ordering is not - // defined as messages are processed and sent by asynchronous NATS handlers. - msg1_1, err := client1.RunUntilMessage(ctx) - if err != nil { - t.Error(err) - } - msg1_2, err := client1.RunUntilMessage(ctx) - if err != nil { - t.Error(err) - } - msg2_1, err := client2.RunUntilMessage(ctx) - if err != nil { - t.Error(err) - } - msg2_2, err := client2.RunUntilMessage(ctx) - if err != nil { - t.Error(err) - } - - if err := client1.checkMessageJoined(msg1_1, hello1.Hello); err != nil { - // Ordering is "joined" from client 2, then from client 1 - if err := client1.checkMessageJoined(msg1_1, hello2.Hello); err != nil { - t.Error(err) - } - if err := client1.checkMessageJoined(msg1_2, hello1.Hello); err != nil { - t.Error(err) - } - } else { - // Ordering is "joined" from client 1, then from client 2 - if err := client1.checkMessageJoined(msg1_2, hello2.Hello); err != nil { - t.Error(err) - } - } - if err := client2.checkMessageJoined(msg2_1, hello1.Hello); err != nil { - // Ordering is "joined" from client 2, then from client 1 - if err := client2.checkMessageJoined(msg2_1, hello2.Hello); err != nil { - t.Error(err) - } - if err := client2.checkMessageJoined(msg2_2, hello1.Hello); err != nil { - t.Error(err) - } - } else { - // Ordering is "joined" from client 1, then from client 2 - if err := client2.checkMessageJoined(msg2_2, hello2.Hello); err != nil { - t.Error(err) - } - } + WaitForUsersJoined(ctx, t, client1, hello1, client2, hello2) var wg sync.WaitGroup