Skip to content

Add logr call depth to ktesting Enabled #434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nojnhuh wants to merge 1 commit into from
+20 −3
Closed

Add logr call depth to ktesting Enabled #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ktesting/testinglogger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ func (l tlogger) Info(level int, msg string, kvList ...interface{}) {
}

func (l tlogger) Enabled(level int) bool {
return l.shared.config.vstate.Enabled(verbosity.Level(level), 1)
return l.shared.config.vstate.Enabled(verbosity.Level(level), l.shared.callDepth+1)
}

func (l tlogger) Error(err error, msg string, kvList ...interface{}) {
Expand Down
21 changes: 19 additions & 2 deletions ktesting/testinglogger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,25 @@ func TestInfo(t *testing.T) {
}

func TestCallDepth(t *testing.T) {
logger := ktesting.NewLogger(t, ktesting.NewConfig())
logger.Info("hello world")
module := "testinglogger_test"
level := 10
config := ktesting.NewConfig()
if err := config.VModule().Set(fmt.Sprintf("%s=%d", module, level)); err != nil {
t.Fatalf("error setting vmodule: %v", err)
}

var buffer logToBuf
logger := ktesting.NewLogger(&buffer, config)

logger.V(level).Info("hello world")
expectedOutput := `Ixxx hello world
`

actual := buffer.String()
actual = headerRe.ReplaceAllString(actual, `${1}xxx `)
if actual != expectedOutput {
t.Errorf("Expected:\n%sActual:\n%s\n", expectedOutput, actual)
}
}

type logToBuf struct {
Expand Down
Loading