From dc06e76d10a203afe5aeaf2d9562ee283514c948 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Tue, 27 Aug 2019 14:22:46 +0200 Subject: [PATCH 1/2] e2e logging: disable brittle output test Because unrelated changes to util.go change the test output, it is better to exclude the test case where util.go (incorrectly!) is included. --- test/e2e/framework/log/logger_test.go | 29 +++++++++++++++------------ 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/test/e2e/framework/log/logger_test.go b/test/e2e/framework/log/logger_test.go index 79c38f4770d..2193e92ab3a 100644 --- a/test/e2e/framework/log/logger_test.go +++ b/test/e2e/framework/log/logger_test.go @@ -17,7 +17,7 @@ limitations under the License. package log_test import ( - "errors" + // "errors" "regexp" "sort" "strings" @@ -28,7 +28,7 @@ import ( "github.com/onsi/ginkgo/reporters" "github.com/onsi/gomega" - "k8s.io/kubernetes/test/e2e/framework" + // "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework/log" ) @@ -44,10 +44,10 @@ var _ = ginkgo.Describe("log", func() { ginkgo.It("asserts", func() { gomega.Expect(false).To(gomega.Equal(true), "false is never true") }) - ginkgo.It("error", func() { - err := errors.New("an error with a long, useless description") - framework.ExpectNoError(err, "hard-coded error") - }) + // ginkgo.It("error", func() { // TODO(pohly): enable again, see comment below. + // err := errors.New("an error with a long, useless description") + // framework.ExpectNoError(err, "hard-coded error") + // }) ginkgo.AfterEach(func() { log.Logf("after") gomega.Expect(true).To(gomega.Equal(false), "true is never false either") @@ -79,13 +79,16 @@ func TestFailureOutput(t *testing.T) { // TODO: should start with k8s.io/kubernetes/test/e2e/framework/log_test.glob..func1.3() stack: "\tassertion.go:75\nk8s.io/kubernetes/vendor/github.com/onsi/gomega/internal/assertion.(*Assertion).To()\n\tassertion.go:38\nk8s.io/kubernetes/test/e2e/framework/log_test.glob..func1.3()\n\tlogger_test.go:45\nk8s.io/kubernetes/vendor/github.com/onsi/ginkgo/internal/leafnodes.(*runner).runSync()\n\tlogger_test.go:65\n", }, - testResult{ - name: "[Top Level] log error", - output: "INFO: before\nFAIL: hard-coded error\nUnexpected error:\n <*errors.errorString>: {\n s: \"an error with a long, useless description\",\n }\n an error with a long, useless description\noccurred\nINFO: after\nFAIL: true is never false either\nExpected\n : true\nto equal\n : false\n", - failure: "hard-coded error\nUnexpected error:\n <*errors.errorString>: {\n s: \"an error with a long, useless description\",\n }\n an error with a long, useless description\noccurred", - // TODO: should start with k8s.io/kubernetes/test/e2e/framework/log_test.glob..func1.4() - stack: "\tutil.go:1368\nk8s.io/kubernetes/test/e2e/framework.ExpectNoError()\n\tutil.go:1362\nk8s.io/kubernetes/test/e2e/framework/log_test.glob..func1.4()\n\tlogger_test.go:49\nk8s.io/kubernetes/vendor/github.com/onsi/ginkgo/internal/leafnodes.(*runner).runSync()\n\tlogger_test.go:65\n", - }, + // That util.go appears in the output is a bug (https://github.com/kubernetes/kubernetes/issues/82013). + // Because it currently appears, this test case is brittle and breaks when someome makes unrelated + // changes in util.go which change the line number. Therefore it is commented out. + // testResult{ + // name: "[Top Level] log error", + // output: "INFO: before\nFAIL: hard-coded error\nUnexpected error:\n <*errors.errorString>: {\n s: \"an error with a long, useless description\",\n }\n an error with a long, useless description\noccurred\nINFO: after\nFAIL: true is never false either\nExpected\n : true\nto equal\n : false\n", + // failure: "hard-coded error\nUnexpected error:\n <*errors.errorString>: {\n s: \"an error with a long, useless description\",\n }\n an error with a long, useless description\noccurred", + // // TODO: should start with k8s.io/kubernetes/test/e2e/framework/log_test.glob..func1.4() + // stack: "\tutil.go:1362\nk8s.io/kubernetes/test/e2e/framework.ExpectNoError()\n\tutil.go:1356\nk8s.io/kubernetes/test/e2e/framework/log_test.glob..func1.4()\n\tlogger_test.go:49\nk8s.io/kubernetes/vendor/github.com/onsi/ginkgo/internal/leafnodes.(*runner).runSync()\n\tlogger_test.go:65\n", + // }, testResult{ name: "[Top Level] log fails", output: "INFO: before\nFAIL: I'm failing.\nINFO: after\nFAIL: true is never false either\nExpected\n : true\nto equal\n : false\n", From 0ffbbec6d855419e2391ee690e1893cf67dd407c Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Thu, 29 Aug 2019 21:21:13 +0200 Subject: [PATCH 2/2] bazel update --- test/e2e/framework/log/BUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/test/e2e/framework/log/BUILD b/test/e2e/framework/log/BUILD index f0ea02bfb32..b39c5d278f5 100644 --- a/test/e2e/framework/log/BUILD +++ b/test/e2e/framework/log/BUILD @@ -30,7 +30,6 @@ go_test( srcs = ["logger_test.go"], embed = [":go_default_library"], deps = [ - "//test/e2e/framework:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/ginkgo/config:go_default_library", "//vendor/github.com/onsi/ginkgo/reporters:go_default_library",