Improvements on Test Flakyness

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/retry/GenericRetryExecution.java

@@ -6,8 +6,8 @@ public class GenericRetryExecution implements RetryExecution {
 
   private final GenericRetry genericRetry;
 
-  private int lastAttemptIndex = 0;
-  private long currentInterval;
+  private volatile int lastAttemptIndex = 0;
+  private volatile long currentInterval;
 
   public GenericRetryExecution(GenericRetry genericRetry) {
     this.genericRetry = genericRetry;

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/DefaultEventHandlerTest.java

@@ -160,14 +160,14 @@ public void executesTheControllerInstantlyAfterErrorIfEventsBuffered() {
     PostExecutionControl postExecutionControl =
         PostExecutionControl.exceptionDuringExecution(new RuntimeException("test"));
 
+    when(eventDispatcherMock.handleExecution(any()))
+        .thenReturn(postExecutionControl)
+        .thenReturn(PostExecutionControl.defaultDispatch());
+
     // start processing an event
     defaultEventHandlerWithRetry.handleEvent(event);
-    // buffer an another event
+    // buffer another event
     defaultEventHandlerWithRetry.handleEvent(event);
-    verify(eventDispatcherMock, timeout(SEPARATE_EXECUTION_TIMEOUT).times(1))
-        .handleExecution(any());
-
-    defaultEventHandlerWithRetry.eventProcessingFinished(executionScope, postExecutionControl);
 
     ArgumentCaptor<ExecutionScope> executionScopeArgumentCaptor =
         ArgumentCaptor.forClass(ExecutionScope.class);
@@ -187,7 +187,7 @@ public void successfulExecutionResetsTheRetry() {
     Event event = prepareCREvent();
     TestCustomResource customResource = testCustomResource();
     customResource.getMetadata().setUid(event.getRelatedCustomResourceUid());
-    ExecutionScope executionScope = new ExecutionScope(Arrays.asList(event), customResource, null);
+
     PostExecutionControl postExecutionControlWithException =
         PostExecutionControl.exceptionDuringExecution(new RuntimeException("test"));
     PostExecutionControl defaultDispatchControl = PostExecutionControl.defaultDispatch();
@@ -200,15 +200,14 @@ public void successfulExecutionResetsTheRetry() {
         ArgumentCaptor.forClass(ExecutionScope.class);
 
     defaultEventHandlerWithRetry.handleEvent(event);
-
     verify(eventDispatcherMock, timeout(SEPARATE_EXECUTION_TIMEOUT).times(1))
         .handleExecution(any());
-    defaultEventHandlerWithRetry.handleEvent(event);
 
+    defaultEventHandlerWithRetry.handleEvent(event);
     verify(eventDispatcherMock, timeout(SEPARATE_EXECUTION_TIMEOUT).times(2))
         .handleExecution(any());
-    defaultEventHandlerWithRetry.handleEvent(event);
 
+    defaultEventHandlerWithRetry.handleEvent(event);
     verify(eventDispatcherMock, timeout(SEPARATE_EXECUTION_TIMEOUT).times(3))
         .handleExecution(executionScopeArgumentCaptor.capture());
     log.info("Finished successfulExecutionResetsTheRetry");

operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/OperatorExtension.java

@@ -135,6 +135,11 @@ public <T extends HasMetadata> T replace(Class<T> type, T resource) {
     return kubernetesClient.resources(type).inNamespace(namespace).replace(resource);
   }
 
+  public <T extends HasMetadata> T get(Class<T> type, String name) {
+    return kubernetesClient.resources(type).inNamespace(namespace).withName(name).get();
+  }
+
+
   @SuppressWarnings("unchecked")
   protected void before(ExtensionContext context) {
     namespace = context.getRequiredTestClass().getSimpleName();

operator-framework/src/test/java/io/javaoperatorsdk/operator/SubResourceUpdateIT.java

@@ -12,9 +12,9 @@
 import io.javaoperatorsdk.operator.sample.subresource.SubResourceTestCustomResource;
 import io.javaoperatorsdk.operator.sample.subresource.SubResourceTestCustomResourceController;
 import io.javaoperatorsdk.operator.sample.subresource.SubResourceTestCustomResourceSpec;
-import io.javaoperatorsdk.operator.sample.subresource.SubResourceTestCustomResourceStatus;
 import io.javaoperatorsdk.operator.support.TestUtils;
 
+import static io.javaoperatorsdk.operator.sample.subresource.SubResourceTestCustomResourceStatus.State.SUCCESS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
@@ -87,7 +87,7 @@ public void updateCustomResourceAfterSubResourceChange() {
     awaitStatusUpdated(resource.getMetadata().getName());
 
     // wait for sure, there are no more events
-    waitXms(200);
+    waitXms(500);
     // there is no event on status update processed
     assertThat(TestUtils.getNumberOfExecutions(operator))
         .isEqualTo(3);
@@ -104,7 +104,7 @@ void awaitStatusUpdated(String name) {
               assertThat(cr).isNotNull();
               assertThat(cr.getStatus()).isNotNull();
               assertThat(cr.getStatus().getState())
-                  .isEqualTo(SubResourceTestCustomResourceStatus.State.SUCCESS);
+                  .isEqualTo(SUCCESS);
             });
   }