From 16f05373f43ad6267543542450eb9e30c5ed03b4 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Tue, 18 Oct 2022 13:44:36 +0200 Subject: [PATCH] e2e framework internal: normalize anonymous functions with parameters This will become relevant for ginkgo.BeforeEach(func(ctx context.Context) { ... }) --- test/e2e/framework/internal/output/output.go | 4 ++-- test/e2e/framework/log_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/framework/internal/output/output.go b/test/e2e/framework/internal/output/output.go index c778a72576e..54d28bda574 100644 --- a/test/e2e/framework/internal/output/output.go +++ b/test/e2e/framework/internal/output/output.go @@ -124,8 +124,8 @@ func stripAddresses(in string) string { // locally) or one of a few relative paths (built in the Kubernetes CI). var stackLocation = regexp.MustCompile(`(?:/|vendor/|test/|GOROOT/).*/([[:^space:]]+.go:[[:digit:]]+)( \+0x[0-9a-fA-F]+)?`) -// functionArgs matches "(...)". -var functionArgs = regexp.MustCompile(`([[:alpha:]]+)\(.*\)`) +// functionArgs matches "(...)" where may be an anonymous function (e.g. "pod_test.glob..func1.1") +var functionArgs = regexp.MustCompile(`([[:alpha:][:digit:].]+)\(.*\)`) // klogPrefix matches "I0822 16:10:39.343790 989127 " var klogPrefix = regexp.MustCompile(`(?m)^[IEF][[:digit:]]{4} [[:digit:]]{2}:[[:digit:]]{2}:[[:digit:]]{2}\.[[:digit:]]{6}[[:space:]]+[[:digit:]]+ `) diff --git a/test/e2e/framework/log_test.go b/test/e2e/framework/log_test.go index 8eff74c06dd..91ffe3d78d5 100644 --- a/test/e2e/framework/log_test.go +++ b/test/e2e/framework/log_test.go @@ -154,12 +154,12 @@ k8s.io/kubernetes/test/e2e/framework_test.glob..func1.5() FAIL: I'm failing. Full Stack Trace -k8s.io/kubernetes/test/e2e/framework_test.glob..func1.3.1(...) +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` + commonOutput, Failure: "I'm failing.", - Stack: `k8s.io/kubernetes/test/e2e/framework_test.glob..func1.3.1(...) + 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`,