deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2024-05-03 22:33:10 +02:00
Code Issues Releases Wiki Activity

Support multiple "joined" entries when waiting for clients.

Browse source
This commit is contained in:
Joachim Bauch 2022-02-16 12:09:15 +01:00
parent 75493c4327
commit 42a5506da7
No known key found for this signature in database
GPG key ID: 77C1D22D53E15F02
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
testclient_test.go
View file

@ -566,19 +566,30 @@ func (c *TestClient) RunUntilJoined(ctx context.Context, hello ...*HelloServerMe
return err
}
if err := c.checkSingleMessageJoined(message); err != nil {
if err := checkMessageType(message, "event"); err != nil {
return err
} else if message.Event.Target != "room" {
return fmt.Errorf("Expected event target room, got %+v", message.Event)
} else if message.Event.Type != "join" {
return fmt.Errorf("Expected event type join, got %+v", message.Event)
}
found := false
for idx, h := range hello {
if err := c.checkMessageJoined(message, h); err == nil {
hello = append(hello[:idx], hello[idx+1:]...)
found = true
break
for len(message.Event.Join) > 0 {
found := false
loop:
for idx, h := range hello {
for idx2, evt := range message.Event.Join {
if evt.SessionId == h.SessionId && evt.UserId == h.UserId {
hello = append(hello[:idx], hello[idx+1:]...)
message.Event.Join = append(message.Event.Join[:idx2], message.Event.Join[idx2+1:]...)
found = true
break loop
}
}
}
if !found {
return fmt.Errorf("expected one of the passed hello sessions, got %+v", message.Event.Join[0])
}
}
if !found {
return fmt.Errorf("expected one of the passed hello sessions, got %+v", message.Event.Join[0])
}
}
return nil