Merge pull request kubernetes-sigs#4048 from Skarlso/fix-eventually-condition

k8s-ci-robot · web-flow · commit 69c97b0dd24c · 2023-02-07T23:42:59.000-08:00
Fix error condition on eventually
diff --git a/test/e2e/shared/aws.go b/test/e2e/shared/aws.go
@@ -450,7 +450,7 @@ func deleteResourcesInCloudFormation(prov client.ConfigProvider, t *cfn_bootstra
 			role := val.(*cfn_iam.Role)
 			Eventually(func(gomega Gomega) bool {
 				_, err := iamSvc.DeleteRole(&iam.DeleteRoleInput{RoleName: aws.String(role.RoleName)})
-				return awserrors.IsNotFound(err) || err != nil
+				return awserrors.IsNotFound(err) || err == nil
 			}, 5*time.Minute, 5*time.Second).Should(BeTrue())
 		}
 		if val.AWSCloudFormationType() == "AWS::IAM::InstanceProfile" {

Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,7 @@ func deleteResourcesInCloudFormation(prov client.ConfigProvider, t *cfn_bootstra`
`450`	`450`	`role := val.(*cfn_iam.Role)`
`451`	`451`	`Eventually(func(gomega Gomega) bool {`
`452`	`452`	`_, err := iamSvc.DeleteRole(&iam.DeleteRoleInput{RoleName: aws.String(role.RoleName)})`
`453`		`- return awserrors.IsNotFound(err) \|\| err != nil`
	`453`	`+ return awserrors.IsNotFound(err) \|\| err == nil`
`454`	`454`	`}, 5time.Minute, 5time.Second).Should(BeTrue())`
`455`	`455`	`}`
`456`	`456`	`if val.AWSCloudFormationType() == "AWS::IAM::InstanceProfile" {`