From 28844739803804ef13b0d63ea4f12305fc8ef587 Mon Sep 17 00:00:00 2001
From: csviri <csviri@gmail.com>
Date: Wed, 8 Feb 2023 12:52:11 +0100
Subject: [PATCH] fix: flaky MultiVersionCRDIT

---
 .../operator/MultiVersionCRDIT.java             | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java
index 12230a7e2a..491848b896 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java
@@ -41,11 +41,18 @@ class MultiVersionCRDIT {
           .build();
 
   private static class TestInformerStoppedHandler implements InformerStoppedHandler {
-    private String resourceClassName;
-    private String resourceCreateAsVersion;
+    private volatile String resourceClassName;
+    private volatile String resourceCreateAsVersion;
 
-    private String failedResourceVersion;
-    private String errorMessage;
+    private volatile String failedResourceVersion;
+    private volatile String errorMessage;
+
+    public void reset() {
+      resourceClassName = null;
+      resourceCreateAsVersion = null;
+      failedResourceVersion = null;
+      errorMessage = null;
+    }
 
     @Override
     @SuppressWarnings("rawtypes")
@@ -111,6 +118,7 @@ private String acceptOnlyIfUnsetOrEqualToAlreadySet(String existing, String newV
 
   @Test
   void multipleCRDVersions() {
+    informerStoppedHandler.reset();
     operator.create(createTestResourceV1WithoutLabel());
     operator.create(createTestResourceV2WithLabel());
 
@@ -132,6 +140,7 @@ void multipleCRDVersions() {
 
   @Test
   void invalidEventsShouldStopInformerAndCallInformerStoppedHandler() {
+    informerStoppedHandler.reset();
     var v2res = createTestResourceV2WithLabel();
     v2res.getMetadata().getLabels().clear();
     operator.create(v2res);