From 79607ae0c9d9dd436ccc09117781f75850fc64ed Mon Sep 17 00:00:00 2001
From: Elena Gershkovich <elenage@il.ibm.com>
Date: Sun, 18 Jun 2023 16:30:37 +0300
Subject: [PATCH] Flaky unit test - fails to change DRPC status

Signed-off-by: Elena Gershkovich <elenage@il.ibm.com>
---
 .../drplacementcontrol_controller_test.go     | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/controllers/drplacementcontrol_controller_test.go b/controllers/drplacementcontrol_controller_test.go
index 58a164780..7d082ffb4 100644
--- 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())
 }