Use test-related logger for embedded etcd.

This commit is contained in:
Joachim Bauch 2025-11-24 14:04:15 +01:00
commit e90760a2f1
No known key found for this signature in database
GPG key ID: 77C1D22D53E15F02
2 changed files with 4 additions and 1 deletions

View file

@ -79,6 +79,7 @@ func NewEtcdForTestWithTls(t *testing.T, withTLS bool) (*embed.Etcd, string, str
os.Chmod(cfg.Dir, 0700) // nolint
cfg.LogLevel = "warn"
cfg.Name = "signalingtest"
cfg.ZapLoggerBuilder = embed.NewZapLoggerBuilder(zaptest.NewLogger(t, zaptest.Level(zap.WarnLevel)))
u, err := url.Parse(etcdListenUrl)
require.NoError(err)
@ -119,7 +120,6 @@ func NewEtcdForTestWithTls(t *testing.T, withTLS bool) (*embed.Etcd, string, str
cfg.ListenPeerUrls = []url.URL{*peerListener}
cfg.AdvertisePeerUrls = []url.URL{*peerListener}
cfg.InitialCluster = "signalingtest=" + peerListener.String()
cfg.ZapLoggerBuilder = embed.NewZapLoggerBuilder(zaptest.NewLogger(t, zaptest.Level(zap.WarnLevel)))
etcd, err = embed.StartEtcd(cfg)
if isErrorAddressAlreadyInUse(err) {
continue

View file

@ -41,6 +41,8 @@ import (
"github.com/stretchr/testify/require"
"go.etcd.io/etcd/server/v3/embed"
"go.etcd.io/etcd/server/v3/lease"
"go.uber.org/zap"
"go.uber.org/zap/zaptest"
signaling "github.com/strukturag/nextcloud-spreed-signaling"
)
@ -73,6 +75,7 @@ func newEtcdForTesting(t *testing.T) *embed.Etcd {
cfg.Dir = t.TempDir()
os.Chmod(cfg.Dir, 0700) // nolint
cfg.LogLevel = "warn"
cfg.ZapLoggerBuilder = embed.NewZapLoggerBuilder(zaptest.NewLogger(t, zaptest.Level(zap.WarnLevel)))
u, err := url.Parse(etcdListenUrl)
require.NoError(t, err)