Fix flaky test

sapcc · Sep 21, 2023 · ada0a4b · ada0a4b
1 parent c45c321
commit ada0a4b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -63,7 +63,7 @@ jobs:
 
       - name: Install Ginkgo CLI
         run: |
-          go install github.com/onsi/ginkgo/v2/[email protected].0
+          go install github.com/onsi/ginkgo/v2/[email protected].1
           go install sigs.k8s.io/controller-runtime/tools/[email protected]
 
       - name: Run tests

diff --git a/internal/controllers/vpa_controller_test.go b/internal/controllers/vpa_controller_test.go
@@ -89,7 +89,9 @@ var _ = Describe("VpaController", func() {
 			Expect(k8sClient.Get(context.Background(), name, &vpa)).To(Succeed())
 			unmodified := vpa.DeepCopy()
 			vpa.Labels = map[string]string{"cloud.sap/reconcile": "please"}
-			Expect(k8sClient.Patch(context.Background(), &vpa, client.MergeFrom(unmodified))).To(Succeed())
+			Expect(k8sClient.Patch(context.Background(), &vpa, client.MergeFrom(unmodified))).To(
+				Satisfy(func(err error) bool { return err == nil || errors.IsNotFound(err) }),
+			)
 
 			Eventually(func(g Gomega) bool {
 				err := k8sClient.Get(context.Background(), name, &vpa)