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

e2e internal: support Ginkgo v2 log time stamps

Browse Source 
When using By or some other Ginkgo output functions, Ginkgo v2 now adds a time
stamp at the end of the line that we need to ignore. Will become relevant when
testing more complete output.
This commit is contained in:
Patrick Ohly 2022-09-06 15:51:26 +02:00
parent 53e1c7b4c3
commit f7864977b6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/framework/internal/output/output.go
View File

@ -29,7 +29,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
) )
func TestGinkgoOutput(t *testing.T, expected SuiteResults) { func TestGinkgoOutput(t *testing.T, expected SuiteResults, runSpecsArgs ...interface{}) {
// Run the Ginkgo suite with spec results collected via ReportAfterEach // Run the Ginkgo suite with spec results collected via ReportAfterEach
// in adddition to the default one. To see what the full // in adddition to the default one. To see what the full
// Ginkgo output looks like, run this test with "go test -v". // Ginkgo output looks like, run this test with "go test -v".
@ -39,7 +39,7 @@ func TestGinkgoOutput(t *testing.T, expected SuiteResults) {
report = append(report, spec) report = append(report, spec)
}) })
fakeT := &testing.T{} fakeT := &testing.T{}
ginkgo.RunSpecs(fakeT, "Logging Suite") ginkgo.RunSpecs(fakeT, "Logging Suite", runSpecsArgs...)
// Now check the output. // Now check the output.
actual := normalizeReport(report) actual := normalizeReport(report)
@ -103,9 +103,13 @@ var timePrefix = regexp.MustCompile(`(?m)^[[:alpha:]]{3} +[[:digit:]]{1,2} +[[:d
// elapsedSuffix matches "Elapsed: 16.189µs" // elapsedSuffix matches "Elapsed: 16.189µs"
var elapsedSuffix = regexp.MustCompile(`Elapsed: [[:digit:]]+(\.[[:digit:]]+)?(µs|ns|ms|s|m)`) var elapsedSuffix = regexp.MustCompile(`Elapsed: [[:digit:]]+(\.[[:digit:]]+)?(µs|ns|ms|s|m)`)
// timeSuffix matches "09/06/22 15:36:43.445" as printed by Ginkgo v2 for log output.
var timeSuffix = regexp.MustCompile(`(?m)[[:space:]][[:digit:]]{2}/[[:digit:]]{2}/[[:digit:]]{2} [[:digit:]]{2}:[[:digit:]]{2}:[[:digit:]]{2}\.[[:digit:]]{1,3}$`)
func stripTimes(in string) string { func stripTimes(in string) string {
out := timePrefix.ReplaceAllString(in, "") out := timePrefix.ReplaceAllString(in, "")
out = elapsedSuffix.ReplaceAllString(out, "Elapsed: <elapsed>") out = elapsedSuffix.ReplaceAllString(out, "Elapsed: <elapsed>")
out = timeSuffix.ReplaceAllString(out, "")
return out return out
} }