deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2026-03-14 14:35:44 +01:00
Code Issues Releases Wiki Activity

Fix race in flaky "DoTestSwitchToOne" / "DoTestSwitchToMultiple".

Browse source
This commit is contained in:
Joachim Bauch 2025-12-17 20:53:57 +01:00
commit 85dc414627
No known key found for this signature in database
GPG key ID: 77C1D22D53E15F02
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
hub_test.go
View file

@ -5032,11 +5032,17 @@ func DoTestSwitchToOne(t *testing.T, details api.StringMap) {
roomMsg := MustSucceed3(t, client1.JoinRoomWithRoomSession, ctx, roomId1, roomSessionId1)
require.Equal(roomId1, roomMsg.Room.RoomId)
// TODO: If we join both clients immediately and then afterwards wait for both with
// "WaitForUsersJoined", the clustered test sometimes fails under load because the
// second session receives the remote "joined" event before joining the room itself.
client1.RunUntilJoined(ctx, hello1.Hello)
roomSessionId2 := api.RoomSessionId("roomsession2")
roomMsg = MustSucceed3(t, client2.JoinRoomWithRoomSession, ctx, roomId1, roomSessionId2)
require.Equal(roomId1, roomMsg.Room.RoomId)
WaitForUsersJoined(ctx, t, client1, hello1, client2, hello2)
client1.RunUntilJoined(ctx, hello2.Hello)
client2.RunUntilJoined(ctx, hello1.Hello, hello2.Hello)
roomId2 := "test-room-2"
var sessions json.RawMessage
@ -5132,11 +5138,17 @@ func DoTestSwitchToMultiple(t *testing.T, details1 api.StringMap, details2 api.S
roomMsg := MustSucceed3(t, client1.JoinRoomWithRoomSession, ctx, roomId1, roomSessionId1)
require.Equal(roomId1, roomMsg.Room.RoomId)
// TODO: If we join both clients immediately and then afterwards wait for both with
// "WaitForUsersJoined", the clustered test sometimes fails under load because the
// second session receives the remote "joined" event before joining the room itself.
client1.RunUntilJoined(ctx, hello1.Hello)
roomSessionId2 := api.RoomSessionId("roomsession2")
roomMsg = MustSucceed3(t, client2.JoinRoomWithRoomSession, ctx, roomId1, roomSessionId2)
require.Equal(roomId1, roomMsg.Room.RoomId)
WaitForUsersJoined(ctx, t, client1, hello1, client2, hello2)
client1.RunUntilJoined(ctx, hello2.Hello)
client2.RunUntilJoined(ctx, hello1.Hello, hello2.Hello)
roomId2 := "test-room-2"
var sessions json.RawMessage