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

Wait for hub housekeeping to finish before continuing tests.

Browse source
This commit is contained in:
Joachim Bauch 2025-12-09 11:25:07 +01:00
commit 65edf5c03a
No known key found for this signature in database
GPG key ID: 77C1D22D53E15F02
1 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

24
hub_test.go
View file

@ -809,16 +809,6 @@ func registerBackendHandlerUrl(t *testing.T, router *mux.Router, url string) {
}
}
func performHousekeeping(hub *Hub, now time.Time) *sync.WaitGroup {
var wg sync.WaitGroup
wg.Add(1)
go func() {
hub.performHousekeeping(now)
wg.Done()
}()
return &wg
}
func Benchmark_DecodePrivateSessionIdCached(b *testing.B) {
require := require.New(b)
decodeCaches := make([]*LruCache[*SessionIdData], 0, numDecodeCaches)
@ -940,7 +930,7 @@ func TestExpectClientHello(t *testing.T) {
// Perform housekeeping in the future, this will cause the connection to
// be terminated due to the missing "Hello" request.
performHousekeeping(hub, time.Now().Add(initialHelloTimeout+time.Second))
hub.performHousekeeping(time.Now().Add(initialHelloTimeout + time.Second))
ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
defer cancel()
@ -1486,7 +1476,7 @@ func TestClientHelloResumeThrottle(t *testing.T) {
// Perform housekeeping in the future, this will cause the session to be
// cleaned up after it is expired.
performHousekeeping(hub, time.Now().Add(sessionExpireDuration+time.Second)).Wait()
hub.performHousekeeping(time.Now().Add(sessionExpireDuration + time.Second))
client = NewTestClient(t, server, hub)
defer client.CloseWithBye()
@ -1523,7 +1513,7 @@ func TestClientHelloResumeExpired(t *testing.T) {
// Perform housekeeping in the future, this will cause the session to be
// cleaned up after it is expired.
performHousekeeping(hub, time.Now().Add(sessionExpireDuration+time.Second)).Wait()
hub.performHousekeeping(time.Now().Add(sessionExpireDuration + time.Second))
client = NewTestClient(t, server, hub)
defer client.CloseWithBye()
@ -2803,7 +2793,7 @@ func TestExpectAnonymousJoinRoom(t *testing.T) {
// Perform housekeeping in the future, this will cause the connection to
// be terminated because the anonymous client didn't join a room.
performHousekeeping(hub, time.Now().Add(anonmyousJoinRoomTimeout+time.Second))
hub.performHousekeeping(time.Now().Add(anonmyousJoinRoomTimeout + time.Second))
if message, ok := client.RunUntilMessage(ctx); ok {
if checkMessageType(t, message, "bye") {
@ -2840,7 +2830,7 @@ func TestExpectAnonymousJoinRoomAfterLeave(t *testing.T) {
// Perform housekeeping in the future, this will keep the connection as the
// session joined a room.
performHousekeeping(hub, time.Now().Add(anonmyousJoinRoomTimeout+time.Second))
hub.performHousekeeping(time.Now().Add(anonmyousJoinRoomTimeout + time.Second))
// No message about the closing is sent to the new connection.
ctx2, cancel2 := context.WithTimeout(context.Background(), 200*time.Millisecond)
@ -2854,7 +2844,7 @@ func TestExpectAnonymousJoinRoomAfterLeave(t *testing.T) {
// Perform housekeeping in the future, this will cause the connection to
// be terminated because the anonymous client didn't join a room.
performHousekeeping(hub, time.Now().Add(anonmyousJoinRoomTimeout+time.Second))
hub.performHousekeeping(time.Now().Add(anonmyousJoinRoomTimeout + time.Second))
if message, ok := client.RunUntilMessage(ctx); ok {
if checkMessageType(t, message, "bye") {
@ -5421,7 +5411,7 @@ func TestGracefulShutdownOnExpiration(t *testing.T) {
case <-time.After(100 * time.Millisecond):
}
performHousekeeping(hub, time.Now().Add(sessionExpireDuration+time.Second))
hub.performHousekeeping(time.Now().Add(sessionExpireDuration + time.Second))
select {
case <-hub.ShutdownChannel():