Skip to content

Commit 6e23eff

Browse files
authored
tests(envtest): use comming log encoder in envtest suite when printing logs (#4917)
1 parent 4aab075 commit 6e23eff

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

internal/util/logging.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func MakeLogger(level string, formatter string, output io.Writer) (*zap.Logger,
5151
return lvl >= logLevel
5252
})
5353

54-
encoder, err := getZapEncoding(formatter)
54+
encoder, err := GetZapEncoding(formatter)
5555
if err != nil {
5656
return nil, fmt.Errorf("setting log formatter failed: %w", err)
5757
}
@@ -68,7 +68,7 @@ func getZapLevel(level string) (zapcore.Level, error) {
6868
return res, nil
6969
}
7070

71-
func getZapEncoding(typ string) (zapcore.Encoder, error) {
71+
func GetZapEncoding(typ string) (zapcore.Encoder, error) {
7272
switch typ {
7373
case "text", "console":
7474
return zapcore.NewConsoleEncoder(zapcore.EncoderConfig{

test/envtest/run.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/phayes/freeport"
1212
"github.com/samber/lo"
1313
"github.com/samber/mo"
14+
"github.com/stretchr/testify/assert"
1415
"github.com/stretchr/testify/require"
1516
"go.uber.org/zap"
1617
"go.uber.org/zap/zaptest/observer"
@@ -184,9 +185,14 @@ func RunManager(
184185
t.Cleanup(func() {
185186
wg.Wait()
186187
if t.Failed() {
188+
encoder, err := util.GetZapEncoding("text")
189+
require.NoError(t, err)
190+
187191
t.Logf("manager logs:")
188192
for _, entry := range logs.All() {
189-
t.Logf("%s - %s", entry.Time, entry.Message)
193+
b, err := encoder.EncodeEntry(entry.Entry, entry.Context)
194+
assert.NoError(t, err)
195+
t.Logf("%s", b.String())
190196
}
191197
}
192198
})

0 commit comments

Comments
 (0)