UPSTREAM: <carry>: allow annotating with a specific suite

stbenjam · stbenjam · commit b25e156ce353 · 2022-10-10T12:23:41.000-04:00
If a test specifies a suite, don't append another one to it. We want the
ability to add tests to a particular suite without automatically being
added to parallel conformance.
diff --git a/openshift-hack/e2e/annotate/annotate.go b/openshift-hack/e2e/annotate/annotate.go
@@ -206,7 +206,8 @@ func (r *ginkgoTestRenamer) generateRename(name string, node types.TestSpec) {
 		}
 	}
 
-	if !r.excludedTestsFilter.MatchString(newName) {
+	// Append suite name to test, if it doesn't already have one
+	if !r.excludedTestsFilter.MatchString(newName) && !strings.Contains(newName, "[Suite:") {
 		isSerial := strings.Contains(newName, "[Serial]")
 		isConformance := strings.Contains(newName, "[Conformance]")
 		switch {

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,8 @@ func (r *ginkgoTestRenamer) generateRename(name string, node types.TestSpec) {`
`206`	`206`	`}`
`207`	`207`	`}`
`208`	`208`
`209`		`- if !r.excludedTestsFilter.MatchString(newName) {`
	`209`	`+ // Append suite name to test, if it doesn't already have one`
	`210`	`+ if !r.excludedTestsFilter.MatchString(newName) && !strings.Contains(newName, "[Suite:") {`
`210`	`211`	`isSerial := strings.Contains(newName, "[Serial]")`
`211`	`212`	`isConformance := strings.Contains(newName, "[Conformance]")`
`212`	`213`	`switch {`