From 97e8bf5f84a690e38037054926d5f0c96501f93c Mon Sep 17 00:00:00 2001 From: Antonin Bas Date: Thu, 27 Feb 2020 16:53:29 -0800 Subject: [PATCH] Fix default regular expressions in conformance tests runner [Serial] should be \[Serial\] [Conformance] should be \[Conformance\] --- cluster/images/conformance/go-runner/cmd_test.go | 2 +- cluster/images/conformance/go-runner/const.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/images/conformance/go-runner/cmd_test.go b/cluster/images/conformance/go-runner/cmd_test.go index 0dc24671680..747d220dbae 100644 --- a/cluster/images/conformance/go-runner/cmd_test.go +++ b/cluster/images/conformance/go-runner/cmd_test.go @@ -74,7 +74,7 @@ func TestGetCmd(t *testing.T) { }, expectArgs: []string{ "ginkgobin", "--p", - "--focus=", "--skip=[Serial]", + "--focus=", "--skip=\\[Serial\\]", "--noColor=true", "testbin", "--", "--disable-log-dump", "--repo-root=/kubernetes", "--provider=", "--report-dir=", "--kubeconfig=", diff --git a/cluster/images/conformance/go-runner/const.go b/cluster/images/conformance/go-runner/const.go index 161c498fb89..38bdb335e02 100644 --- a/cluster/images/conformance/go-runner/const.go +++ b/cluster/images/conformance/go-runner/const.go @@ -54,7 +54,7 @@ const ( extraArgsSeparaterEnvKey = "E2E_EXTRA_ARGS_SEP" defaultSkip = "" - defaultFocus = "[Conformance]" + defaultFocus = "\\[Conformance\\]" defaultProvider = "local" defaultParallel = "1" defaultResultsDir = "/tmp/results" @@ -63,5 +63,5 @@ const ( // serialTestsRegexp is the default skip value if running in parallel. Will not // override an explicit E2E_SKIP value. - serialTestsRegexp = "[Serial]" + serialTestsRegexp = "\\[Serial\\]" )