UPSTREAM: 90452: refactor/improve CRD publishing e2e tests in an HA setup

p0lyn0mial · soltysh · commit 7fbb6a4e9b79 · 2022-09-20T19:22:01.000+02:00
openshift-rebase(v1.24):source=ce8d63d76a0
diff --git a/test/e2e/apimachinery/crd_publish_openapi.go b/test/e2e/apimachinery/crd_publish_openapi.go
@@ -522,7 +522,7 @@ func setupCRDAndVerifySchema(f *framework.Framework, schema, expect []byte, grou
 
 func setupCRDAndVerifySchemaWithOptions(f *framework.Framework, schema, expect []byte, groupSuffix string, versions []string, options ...crd.Option) (tCRD *crd.TestCrd, err error) {
 	defer func() {
-		if err == nil {
+		if err != nil {
 			framework.Logf("sleeping 45 seconds before running the actual tests, we hope that during all API servers converge during that window, see %q for more", "https://github.com/kubernetes/kubernetes/pull/90452")
 			time.Sleep(time.Second * 45)
 		}

Original file line number	Diff line number	Diff line change
`@@ -522,7 +522,7 @@ func setupCRDAndVerifySchema(f *framework.Framework, schema, expect []byte, grou`
`522`	`522`
`523`	`523`	`func setupCRDAndVerifySchemaWithOptions(f framework.Framework, schema, expect []byte, groupSuffix string, versions []string, options ...crd.Option) (tCRD crd.TestCrd, err error) {`
`524`	`524`	`defer func() {`
`525`		`- if err == nil {`
	`525`	`+ if err != nil {`
`526`	`526`	`framework.Logf("sleeping 45 seconds before running the actual tests, we hope that during all API servers converge during that window, see %q for more", "https://github.com/kubernetes/kubernetes/pull/90452")`
`527`	`527`	`time.Sleep(time.Second * 45)`
`528`	`528`	`}`