Merge pull request kubernetes#82229 from pohly/log-datetime-test-fix

k8s-ci-robot · web-flow · commit 6cb788c80e93 · 2019-09-03T17:24:58.000-07:00
e2e log: fix time stamp normalization in unit test
diff --git a/test/e2e/framework/log/logger_test.go b/test/e2e/framework/log/logger_test.go
@@ -138,7 +138,7 @@ func normalizeReport(report reporters.FakeReporter) suiteResults {
 }
 
 // timePrefix matches "Jul 17 08:08:25.950: " at the beginning of each line.
-var timePrefix = regexp.MustCompile(`(?m)^[[:alpha:]]{3} [[:digit:]]{1,2} [[:digit:]]{2}:[[:digit:]]{2}:[[:digit:]]{2}.[[:digit:]]{3}: `)
+var timePrefix = regexp.MustCompile(`(?m)^[[:alpha:]]{3} +[[:digit:]]{1,2} +[[:digit:]]{2}:[[:digit:]]{2}:[[:digit:]]{2}.[[:digit:]]{3}: `)
 
 func stripTimes(in string) string {
 	return timePrefix.ReplaceAllString(in, "")

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ func normalizeReport(report reporters.FakeReporter) suiteResults {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`// timePrefix matches "Jul 17 08:08:25.950: " at the beginning of each line.`
`141`		-var timePrefix = regexp.MustCompile(`(?m)^[[:alpha:]]{3} [[:digit:]]{1,2} [[:digit:]]{2}:[[:digit:]]{2}:[[:digit:]]{2}.[[:digit:]]{3}: `)
	`141`	+var timePrefix = regexp.MustCompile(`(?m)^[[:alpha:]]{3} +[[:digit:]]{1,2} +[[:digit:]]{2}:[[:digit:]]{2}:[[:digit:]]{2}.[[:digit:]]{3}: `)
`142`	`142`
`143`	`143`	`func stripTimes(in string) string {`
`144`	`144`	`return timePrefix.ReplaceAllString(in, "")`