Merge pull request kubernetes#125966 from pohly/e2e-framework-label-filter-skip-fix

k8s-ci-robot · web-flow · commit 06c7d9a565fc · 2024-07-09T04:12:38.000-07:00
e2e framework: don't add default skip when --label-filter is used
diff --git a/test/e2e/framework/test_context.go b/test/e2e/framework/test_context.go
@@ -399,7 +399,7 @@ func CreateGinkgoConfig() (types.SuiteConfig, types.ReporterConfig) {
 	// Randomize specs as well as suites
 	suiteConfig.RandomizeAllSpecs = true
 	// Disable skipped tests unless they are explicitly requested.
-	if len(suiteConfig.FocusStrings) == 0 && len(suiteConfig.SkipStrings) == 0 {
+	if len(suiteConfig.FocusStrings) == 0 && len(suiteConfig.SkipStrings) == 0 && suiteConfig.LabelFilter == "" {
 		suiteConfig.SkipStrings = []string{`\[Flaky\]|\[Feature:.+\]`}
 	}
 	return suiteConfig, reporterConfig

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ func CreateGinkgoConfig() (types.SuiteConfig, types.ReporterConfig) {`
`399`	`399`	`// Randomize specs as well as suites`
`400`	`400`	`suiteConfig.RandomizeAllSpecs = true`
`401`	`401`	`// Disable skipped tests unless they are explicitly requested.`
`402`		`- if len(suiteConfig.FocusStrings) == 0 && len(suiteConfig.SkipStrings) == 0 {`
	`402`	`+ if len(suiteConfig.FocusStrings) == 0 && len(suiteConfig.SkipStrings) == 0 && suiteConfig.LabelFilter == "" {`
`403`	`403`	suiteConfig.SkipStrings = []string{`\[Flaky\]\|\[Feature:.+\]`}
`404`	`404`	`}`
`405`	`405`	`return suiteConfig, reporterConfig`