From 6cecc0ab37588e63b65760372bdde61423c2b2df Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Fri, 30 Aug 2019 08:51:21 +0200
Subject: [PATCH] e2e log: skip log.Failf in stack information

The function itself isn't relevant.
---
 test/e2e/framework/log/logger.go      | 2 +-
 test/e2e/framework/log/logger_test.go | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/e2e/framework/log/logger.go b/test/e2e/framework/log/logger.go
index c57c15d5a5d..d2a4ce45de4 100644
--- a/test/e2e/framework/log/logger.go
+++ b/test/e2e/framework/log/logger.go
@@ -41,7 +41,7 @@ func Logf(format string, args ...interface{}) {
 
 // Failf logs the fail info.
 func Failf(format string, args ...interface{}) {
-	FailfWithOffset(1, format, args...)
+	FailfWithOffset(2, format, args...)
 }
 
 // FailfWithOffset calls "Fail" and logs the error at "offset" levels above its caller
diff --git a/test/e2e/framework/log/logger_test.go b/test/e2e/framework/log/logger_test.go
index eeb364a9373..11770c8a332 100644
--- a/test/e2e/framework/log/logger_test.go
+++ b/test/e2e/framework/log/logger_test.go
@@ -89,8 +89,7 @@ func TestFailureOutput(t *testing.T) {
 			name:    "[Top Level] log fails",
 			output:  "INFO: before\nFAIL: I'm failing.\nINFO: after\nFAIL: true is never false either\nExpected\n    <bool>: true\nto equal\n    <bool>: false\n",
 			failure: "I'm failing.",
-			// TODO: should framework/log.Failf be skipped?
-			stack: "k8s.io/kubernetes/test/e2e/framework/log.Failf()\n\tlogger.go:44\nk8s.io/kubernetes/test/e2e/framework/log_test.glob..func1.2.1(...)\n\tlogger_test.go:41\nk8s.io/kubernetes/test/e2e/framework/log_test.glob..func1.2()\n\tlogger_test.go:42\nk8s.io/kubernetes/test/e2e/framework/log_test.TestFailureOutput()\n\tlogger_test.go:65",
+			stack:   "k8s.io/kubernetes/test/e2e/framework/log_test.glob..func1.2.1(...)\n\tlogger_test.go:41\nk8s.io/kubernetes/test/e2e/framework/log_test.glob..func1.2()\n\tlogger_test.go:42\nk8s.io/kubernetes/test/e2e/framework/log_test.TestFailureOutput()\n\tlogger_test.go:65",
 		},
 	}
 	// Compare individual fields. Comparing the slices leads to unreadable error output when there is any mismatch.