Skip to content

Commit dc06e76

Browse files
committed
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.
1 parent 47214d6 commit dc06e76

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

test/e2e/framework/log/logger_test.go

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package log_test
1818

1919
import (
20-
"errors"
20+
// "errors"
2121
"regexp"
2222
"sort"
2323
"strings"
@@ -28,7 +28,7 @@ import (
2828
"github.com/onsi/ginkgo/reporters"
2929
"github.com/onsi/gomega"
3030

31-
"k8s.io/kubernetes/test/e2e/framework"
31+
// "k8s.io/kubernetes/test/e2e/framework"
3232
"k8s.io/kubernetes/test/e2e/framework/log"
3333
)
3434

@@ -44,10 +44,10 @@ var _ = ginkgo.Describe("log", func() {
4444
ginkgo.It("asserts", func() {
4545
gomega.Expect(false).To(gomega.Equal(true), "false is never true")
4646
})
47-
ginkgo.It("error", func() {
48-
err := errors.New("an error with a long, useless description")
49-
framework.ExpectNoError(err, "hard-coded error")
50-
})
47+
// ginkgo.It("error", func() { // TODO(pohly): enable again, see comment below.
48+
// err := errors.New("an error with a long, useless description")
49+
// framework.ExpectNoError(err, "hard-coded error")
50+
// })
5151
ginkgo.AfterEach(func() {
5252
log.Logf("after")
5353
gomega.Expect(true).To(gomega.Equal(false), "true is never false either")
@@ -79,13 +79,16 @@ func TestFailureOutput(t *testing.T) {
7979
// TODO: should start with k8s.io/kubernetes/test/e2e/framework/log_test.glob..func1.3()
8080
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",
8181
},
82-
testResult{
83-
name: "[Top Level] log error",
84-
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 <bool>: true\nto equal\n <bool>: false\n",
85-
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",
86-
// TODO: should start with k8s.io/kubernetes/test/e2e/framework/log_test.glob..func1.4()
87-
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",
88-
},
82+
// That util.go appears in the output is a bug (https://github.com/kubernetes/kubernetes/issues/82013).
83+
// Because it currently appears, this test case is brittle and breaks when someome makes unrelated
84+
// changes in util.go which change the line number. Therefore it is commented out.
85+
// testResult{
86+
// name: "[Top Level] log error",
87+
// 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 <bool>: true\nto equal\n <bool>: false\n",
88+
// 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",
89+
// // TODO: should start with k8s.io/kubernetes/test/e2e/framework/log_test.glob..func1.4()
90+
// 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",
91+
// },
8992
testResult{
9093
name: "[Top Level] log fails",
9194
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",

0 commit comments

Comments
 (0)