github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

add caller info to the testHook

Browse Source 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
This commit is contained in:
Iceber Gu 2021-02-27 03:49:05 +08:00
parent 56f17a0856
commit bf9db47e8a
No known key found for this signature in database
GPG Key ID: F1632F7124070DD4
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
log/logtest/context.go
View File

@ -18,7 +18,10 @@ package logtest
import ( import (
"context" "context"
"fmt"
"io/ioutil" "io/ioutil"
"path/filepath"
"runtime"
"testing" "testing"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
@ -35,6 +38,7 @@ func WithT(ctx context.Context, t testing.TB) context.Context {
// Increase debug level for tests // Increase debug level for tests
l.SetLevel(logrus.DebugLevel) l.SetLevel(logrus.DebugLevel)
l.SetOutput(ioutil.Discard) l.SetOutput(ioutil.Discard)
l.SetReportCaller(true)
// Add testing hook // Add testing hook
l.AddHook(&testHook{ l.AddHook(&testHook{
@ -42,6 +46,9 @@ func WithT(ctx context.Context, t testing.TB) context.Context {
fmt: &logrus.TextFormatter{ fmt: &logrus.TextFormatter{
DisableColors: true, DisableColors: true,
TimestampFormat: log.RFC3339NanoFixed, TimestampFormat: log.RFC3339NanoFixed,
CallerPrettyfier: func(frame *runtime.Frame) (string, string) {
return filepath.Base(frame.Function), fmt.Sprintf("%s:%d", frame.File, frame.Line)
},
}, },
}) })