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

Move log test helpers to separate package.

Browse source
This commit is contained in:
Joachim Bauch 2026-01-12 13:58:33 +01:00
commit ee6f026bbb
No known key found for this signature in database
GPG key ID: 77C1D22D53E15F02
42 changed files with 236 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

35
server/backend_server_test.go
View file

@ -52,6 +52,7 @@ import (
grpctest "github.com/strukturag/nextcloud-spreed-signaling/grpc/test"
"github.com/strukturag/nextcloud-spreed-signaling/internal"
"github.com/strukturag/nextcloud-spreed-signaling/log"
logtest "github.com/strukturag/nextcloud-spreed-signaling/log/test"
"github.com/strukturag/nextcloud-spreed-signaling/nats"
natstest "github.com/strukturag/nextcloud-spreed-signaling/nats/test"
"github.com/strukturag/nextcloud-spreed-signaling/talk"
@ -107,7 +108,7 @@ func CreateBackendServerForTestFromConfig(t *testing.T, config *goconf.ConfigFil
config.AddOption("clients", "internalsecret", string(testInternalSecret))
config.AddOption("geoip", "url", "none")
events := eventstest.GetAsyncEventsForTest(t)
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
hub, err := NewHub(ctx, config, events, nil, nil, nil, r, "no-version")
require.NoError(err)
@ -169,7 +170,7 @@ func CreateBackendServerWithClusteringForTestFromConfig(t *testing.T, config1 *g
config1.AddOption("clients", "internalsecret", string(testInternalSecret))
config1.AddOption("geoip", "url", "none")
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
events1, err := events.NewAsyncEvents(ctx, nats.ClientURL())
@ -404,7 +405,7 @@ func TestBackendServer_RoomInvite(t *testing.T) {
for _, backend := range eventstest.EventBackendsForTest {
t.Run(backend, func(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
RunTestBackendServer_RoomInvite(ctx, t)
})
@ -474,7 +475,7 @@ func TestBackendServer_RoomDisinvite(t *testing.T) {
for _, backend := range eventstest.EventBackendsForTest {
t.Run(backend, func(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
RunTestBackendServer_RoomDisinvite(ctx, t)
})
@ -555,7 +556,7 @@ func RunTestBackendServer_RoomDisinvite(ctx context.Context, t *testing.T) {
func TestBackendServer_RoomDisinviteDifferentRooms(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
require := require.New(t)
assert := assert.New(t)
@ -638,7 +639,7 @@ func TestBackendServer_RoomUpdate(t *testing.T) {
for _, backend := range eventstest.EventBackendsForTest {
t.Run(backend, func(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
RunTestBackendServer_RoomUpdate(ctx, t)
})
@ -710,7 +711,7 @@ func TestBackendServer_RoomDelete(t *testing.T) {
for _, backend := range eventstest.EventBackendsForTest {
t.Run(backend, func(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
RunTestBackendServer_RoomDelete(ctx, t)
})
@ -779,7 +780,7 @@ func TestBackendServer_ParticipantsUpdatePermissions(t *testing.T) {
for _, subtest := range clusteredTests {
t.Run(subtest, func(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
require := require.New(t)
assert := assert.New(t)
@ -877,7 +878,7 @@ func TestBackendServer_ParticipantsUpdatePermissions(t *testing.T) {
func TestBackendServer_ParticipantsUpdateEmptyPermissions(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
require := require.New(t)
assert := assert.New(t)
@ -942,7 +943,7 @@ func TestBackendServer_ParticipantsUpdateEmptyPermissions(t *testing.T) {
func TestBackendServer_ParticipantsUpdateTimeout(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
require := require.New(t)
assert := assert.New(t)
@ -1105,7 +1106,7 @@ func TestBackendServer_InCallAll(t *testing.T) {
for _, subtest := range clusteredTests {
t.Run(subtest, func(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
require := require.New(t)
assert := assert.New(t)
@ -1277,7 +1278,7 @@ func TestBackendServer_InCallAll(t *testing.T) {
func TestBackendServer_RoomMessage(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
require := require.New(t)
assert := assert.New(t)
@ -1447,7 +1448,7 @@ func Test_IsNumeric(t *testing.T) {
func TestBackendServer_DialoutNoSipBridge(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
require := require.New(t)
assert := assert.New(t)
@ -1491,7 +1492,7 @@ func TestBackendServer_DialoutNoSipBridge(t *testing.T) {
func TestBackendServer_DialoutAccepted(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
require := require.New(t)
assert := assert.New(t)
@ -1578,7 +1579,7 @@ func TestBackendServer_DialoutAccepted(t *testing.T) {
func TestBackendServer_DialoutAcceptedCompat(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
require := require.New(t)
assert := assert.New(t)
@ -1665,7 +1666,7 @@ func TestBackendServer_DialoutAcceptedCompat(t *testing.T) {
func TestBackendServer_DialoutRejected(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
require := require.New(t)
assert := assert.New(t)
@ -1750,7 +1751,7 @@ func TestBackendServer_DialoutRejected(t *testing.T) {
func TestBackendServer_DialoutFirstFailed(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
require := require.New(t)
assert := assert.New(t)

3
server/hub_sfu_janus_test.go
View file

@ -35,6 +35,7 @@ import (
"github.com/strukturag/nextcloud-spreed-signaling/api"
"github.com/strukturag/nextcloud-spreed-signaling/log"
logtest "github.com/strukturag/nextcloud-spreed-signaling/log/test"
"github.com/strukturag/nextcloud-spreed-signaling/mock"
"github.com/strukturag/nextcloud-spreed-signaling/sfu"
sfujanus "github.com/strukturag/nextcloud-spreed-signaling/sfu/janus"
@ -56,7 +57,7 @@ func newMcuJanusForTesting(t *testing.T) (JanusSFU, *janustest.JanusGateway) {
if strings.Contains(t.Name(), "Filter") {
config.AddOption("mcu", "blockedcandidates", "192.0.0.0/24, 192.168.0.0/16")
}
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
mcu, err := sfujanus.NewJanusSFUWithGateway(ctx, gateway, config)
require.NoError(t, err)

7
server/hub_test.go
View file

@ -61,6 +61,7 @@ import (
grpctest "github.com/strukturag/nextcloud-spreed-signaling/grpc/test"
"github.com/strukturag/nextcloud-spreed-signaling/internal"
"github.com/strukturag/nextcloud-spreed-signaling/log"
logtest "github.com/strukturag/nextcloud-spreed-signaling/log/test"
"github.com/strukturag/nextcloud-spreed-signaling/mock"
natstest "github.com/strukturag/nextcloud-spreed-signaling/nats/test"
"github.com/strukturag/nextcloud-spreed-signaling/session"
@ -164,7 +165,7 @@ func getTestConfigWithMultipleUrls(server *httptest.Server) (*goconf.ConfigFile,
}
func CreateHubForTestWithConfig(t *testing.T, getConfigFunc func(*httptest.Server) (*goconf.ConfigFile, error)) (*Hub, events.AsyncEvents, *mux.Router, *httptest.Server) {
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
require := require.New(t)
r := mux.NewRouter()
@ -215,7 +216,7 @@ func CreateHubWithMultipleUrlsForTest(t *testing.T) (*Hub, events.AsyncEvents, *
}
func CreateClusteredHubsForTestWithConfig(t *testing.T, getConfigFunc func(*httptest.Server) (*goconf.ConfigFile, error)) (*Hub, *Hub, *mux.Router, *mux.Router, *httptest.Server, *httptest.Server) {
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
require := require.New(t)
assert := assert.New(t)
@ -5037,7 +5038,7 @@ func TestGeoipOverrides(t *testing.T) {
func TestDialoutStatus(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
require := require.New(t)
assert := assert.New(t)

9
server/room_ping_test.go
View file

@ -32,6 +32,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/strukturag/nextcloud-spreed-signaling/log"
logtest "github.com/strukturag/nextcloud-spreed-signaling/log/test"
"github.com/strukturag/nextcloud-spreed-signaling/talk"
)
@ -62,7 +63,7 @@ func NewRoomPingForTest(ctx context.Context, t *testing.T) (*url.URL, *RoomPing)
func TestSingleRoomPing(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
assert := assert.New(t)
u, ping := NewRoomPingForTest(ctx, t)
@ -106,7 +107,7 @@ func TestSingleRoomPing(t *testing.T) {
func TestMultiRoomPing(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
assert := assert.New(t)
u, ping := NewRoomPingForTest(ctx, t)
@ -146,7 +147,7 @@ func TestMultiRoomPing(t *testing.T) {
func TestMultiRoomPing_Separate(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
assert := assert.New(t)
u, ping := NewRoomPingForTest(ctx, t)
@ -182,7 +183,7 @@ func TestMultiRoomPing_Separate(t *testing.T) {
func TestMultiRoomPing_DeleteRoom(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
assert := assert.New(t)
u, ping := NewRoomPingForTest(ctx, t)

11
server/room_test.go
View file

@ -36,6 +36,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/strukturag/nextcloud-spreed-signaling/log"
logtest "github.com/strukturag/nextcloud-spreed-signaling/log/test"
"github.com/strukturag/nextcloud-spreed-signaling/talk"
)
@ -80,7 +81,7 @@ func TestRoom_InCall(t *testing.T) {
func TestRoom_Update(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
require := require.New(t)
assert := assert.New(t)
@ -175,7 +176,7 @@ loop:
func TestRoom_Delete(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
require := require.New(t)
assert := assert.New(t)
@ -273,7 +274,7 @@ loop:
func TestRoom_RoomJoinFeatures(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
require := require.New(t)
assert := assert.New(t)
@ -311,7 +312,7 @@ func TestRoom_RoomJoinFeatures(t *testing.T) {
func TestRoom_RoomSessionData(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
require := require.New(t)
assert := assert.New(t)
@ -355,7 +356,7 @@ func TestRoom_RoomSessionData(t *testing.T) {
func TestRoom_InCallAll(t *testing.T) {
t.Parallel()
logger := log.NewLoggerForTest(t)
logger := logtest.NewLoggerForTest(t)
ctx := log.NewLoggerContext(t.Context(), logger)
require := require.New(t)
assert := assert.New(t)