Update helpers with PR feedback

Nick Young · Nick Young · commit 675a132352e8 · 2022-07-12T05:19:05.000Z
Signed-off-by: Nick Young &lt;ynick@vmware.com&gt;
diff --git a/conformance/utils/kubernetes/helpers.go b/conformance/utils/kubernetes/helpers.go
@@ -81,7 +81,8 @@ func GWCMustBeAccepted(t *testing.T, c client.Client, gwcName string, seconds in
 		}
 
 		controllerName = string(gwc.Spec.ControllerName)
-		return findConditionInList(t, gwc.Status.Conditions, "Accepted", "True", "Accepted"), nil
+		// Passing an empty string as the Reason means that any Reason will do.
+		return findConditionInList(t, gwc.Status.Conditions, "Accepted", "True", ""), nil
 	})
 	require.NoErrorf(t, waitErr, "error waiting for %s GatewayClass to have Accepted condition set to True: %v", gwcName, waitErr)
 
@@ -106,7 +107,8 @@ func NamespacesMustBeReady(t *testing.T, c client.Client, namespaces []string, s
 				t.Errorf("Error listing Gateways: %v", err)
 			}
 			for _, gw := range gwList.Items {
-				if !findConditionInList(t, gw.Status.Conditions, "Ready", "True", "Ready") {
+				// Passing an empty string as the Reason means that any Reason will do.
+				if !findConditionInList(t, gw.Status.Conditions, "Ready", "True", "") {
 					t.Logf("%s/%s Gateway not ready yet", ns, gw.Name)
 					return false, nil
 				}

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,8 @@ func GWCMustBeAccepted(t *testing.T, c client.Client, gwcName string, seconds in`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`controllerName = string(gwc.Spec.ControllerName)`
`84`		`- return findConditionInList(t, gwc.Status.Conditions, "Accepted", "True", "Accepted"), nil`
	`84`	`+ // Passing an empty string as the Reason means that any Reason will do.`
	`85`	`+ return findConditionInList(t, gwc.Status.Conditions, "Accepted", "True", ""), nil`
`85`	`86`	`})`
`86`	`87`	`require.NoErrorf(t, waitErr, "error waiting for %s GatewayClass to have Accepted condition set to True: %v", gwcName, waitErr)`
`87`	`88`
`@@ -106,7 +107,8 @@ func NamespacesMustBeReady(t *testing.T, c client.Client, namespaces []string, s`
`106`	`107`	`t.Errorf("Error listing Gateways: %v", err)`
`107`	`108`	`}`
`108`	`109`	`for _, gw := range gwList.Items {`
`109`		`- if !findConditionInList(t, gw.Status.Conditions, "Ready", "True", "Ready") {`
	`110`	`+ // Passing an empty string as the Reason means that any Reason will do.`
	`111`	`+ if !findConditionInList(t, gw.Status.Conditions, "Ready", "True", "") {`
`110`	`112`	`t.Logf("%s/%s Gateway not ready yet", ns, gw.Name)`
`111`	`113`	`return false, nil`
`112`	`114`	`}`