Fix retrying in Helm e2e helper func

mboersma · k8s-infra-cherrypick-robot · commit 3f1dd4e7368b · 2023-08-01T17:43:16.000Z
diff --git a/test/e2e/helm.go b/test/e2e/helm.go
@@ -68,11 +68,11 @@ func InstallHelmChart(ctx context.Context, clusterProxy framework.ClusterProxy,
 	}
 
 	// Install the chart and retry if needed
-	Eventually(func(g Gomega) {
+	Eventually(func() error {
 		cmd := exec.Command(helm, args...)
 		Logf("Helm command: %s", cmd.String())
 		output, err := cmd.CombinedOutput()
 		Logf("Helm install output: %s", string(output))
-		Expect(err).NotTo(HaveOccurred())
+		return err
 	}, helmInstallTimeout, retryableOperationSleepBetweenRetries).Should(Succeed())
 }

Original file line number	Diff line number	Diff line change
`@@ -68,11 +68,11 @@ func InstallHelmChart(ctx context.Context, clusterProxy framework.ClusterProxy,`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`// Install the chart and retry if needed`
`71`		`- Eventually(func(g Gomega) {`
	`71`	`+ Eventually(func() error {`
`72`	`72`	`cmd := exec.Command(helm, args...)`
`73`	`73`	`Logf("Helm command: %s", cmd.String())`
`74`	`74`	`output, err := cmd.CombinedOutput()`
`75`	`75`	`Logf("Helm install output: %s", string(output))`
`76`		`- Expect(err).NotTo(HaveOccurred())`
	`76`	`+ return err`
`77`	`77`	`}, helmInstallTimeout, retryableOperationSleepBetweenRetries).Should(Succeed())`
`78`	`78`	`}`