Flaky unit test - fails to change DRPC status

Signed-off-by: Elena Gershkovich <elenage@il.ibm.com>
Shwetha-Acharya · Jun 19, 2023 · 79607ae · 79607ae
1 parent 5127005
commit 79607ae
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/controllers/drplacementcontrol_controller_test.go b/controllers/drplacementcontrol_controller_test.go
@@ -735,9 +735,23 @@ func getLatestDRPC() *rmn.DRPlacementControl {
 }
 
 func clearDRPCStatus() {
-	latestDRPC := getLatestDRPC()
-	latestDRPC.Status = rmn.DRPlacementControlStatus{}
-	err := k8sClient.Status().Update(context.TODO(), latestDRPC)
+	localRetries := 0
+
+	var err error
+
+	for localRetries < updateRetries {
+		latestDRPC := getLatestDRPC()
+		latestDRPC.Status = rmn.DRPlacementControlStatus{}
+
+		err = k8sClient.Status().Update(context.TODO(), latestDRPC)
+		if errors.IsConflict(err) {
+			localRetries++
+
+			continue
+		}
+
+		break
+	}
 	Expect(err).NotTo(HaveOccurred())
 }