github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 19:23:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #113390 from pohly/e2e-framework-fix-failure-stack

Browse Source 
e2e framework: fix incorrect backtrace in Failf
This commit is contained in:
Kubernetes Prow Robot 2022-10-27 13:20:30 -07:00 committed by GitHub
commit 0d4878e448
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/framework/log.go
View File

@ -41,11 +41,11 @@ func Logf(format string, args ...interface{}) {
log("INFO", format, args...) log("INFO", format, args...)
} }
// Failf logs the fail info, including a stack trace starts at 2 levels above its caller // Failf logs the fail info, including a stack trace starts with its direct caller
// (for example, for call chain f -> g -> Failf("foo", ...) error would be logged for "f"). // (for example, for call chain f -> g -> Failf("foo", ...) error would be logged for "g").
func Failf(format string, args ...interface{}) { func Failf(format string, args ...interface{}) {
msg := fmt.Sprintf(format, args...) msg := fmt.Sprintf(format, args...)
skip := 2 skip := 1
log("FAIL", "%s\n\nFull Stack Trace\n%s", msg, PrunedStack(skip)) log("FAIL", "%s\n\nFull Stack Trace\n%s", msg, PrunedStack(skip))
fail(nowStamp()+": "+msg, skip) fail(nowStamp()+": "+msg, skip)
panic("unreachable") panic("unreachable")

6
test/e2e/framework/log_test.go
View File

@ -154,10 +154,14 @@ k8s.io/kubernetes/test/e2e/framework_test.glob..func1.5()
FAIL: I'm failing. FAIL: I'm failing.
Full Stack Trace Full Stack Trace
k8s.io/kubernetes/test/e2e/framework_test.glob..func1.3.1(...)
log_test.go:56
k8s.io/kubernetes/test/e2e/framework_test.glob..func1.3() k8s.io/kubernetes/test/e2e/framework_test.glob..func1.3()
log_test.go:57` + commonOutput, log_test.go:57` + commonOutput,
Failure: "I'm failing.", Failure: "I'm failing.",
Stack: `k8s.io/kubernetes/test/e2e/framework_test.glob..func1.3() Stack: `k8s.io/kubernetes/test/e2e/framework_test.glob..func1.3.1(...)
log_test.go:56
k8s.io/kubernetes/test/e2e/framework_test.glob..func1.3()
log_test.go:57`, log_test.go:57`,
}, },
output.TestResult{ output.TestResult{