Bmoric/improve flakiness (#9853)

Improve some test that were flaky because of their asynchronous nature.
airbytehq · Feb 1, 2022 · 0ed15f2 · 0ed15f2
1 parent eccee12
commit 0ed15f2
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/...s/src/test/java/io/airbyte/workers/temporal/scheduling/ConnectionManagerWorkflowTest.java b/...s/src/test/java/io/airbyte/workers/temporal/scheduling/ConnectionManagerWorkflowTest.java
@@ -355,7 +355,7 @@ public void deleteSync() {
   }
 
   @Nested
-  @DisplayName("Test which without a long running child workflow")
+  @DisplayName("Test which with a long running child workflow")
   class SynchronousWorkflow {
 
     @BeforeEach
@@ -399,14 +399,14 @@ public void manualRun() {
       WorkflowClient.start(workflow::run, input);
       testEnv.sleep(Duration.ofMinutes(2L));
       workflow.submitManualSync();
+      testEnv.shutdown();
 
       final Queue<ChangedStateEvent> events = testStateListener.events(testId);
 
       Assertions.assertThat(events)
           .filteredOn(changedStateEvent -> changedStateEvent.getField() == StateField.SKIPPED_SCHEDULING && changedStateEvent.isValue())
           .isEmpty();
 
-      testEnv.shutdown();
     }
 
     @Test
@@ -428,9 +428,10 @@ public void cancelRunning() {
 
       WorkflowClient.start(workflow::run, input);
       workflow.submitManualSync();
-      testEnv.sleep(Duration.ofSeconds(30L));
+      testEnv.sleep(Duration.ofSeconds(10L));
       workflow.cancelJob();
-      testEnv.sleep(Duration.ofMinutes(1L));
+      testEnv.sleep(Duration.ofMinutes(2L));
+      testEnv.shutdown();
 
       final Queue<ChangedStateEvent> events = testStateListener.events(testId);
 
@@ -439,8 +440,6 @@ public void cancelRunning() {
           .hasSizeGreaterThanOrEqualTo(1);
 
       Mockito.verify(mJobCreationAndStatusUpdateActivity).jobCancelled(Mockito.any());
-
-      testEnv.shutdown();
     }
 
     @Test
@@ -464,6 +463,7 @@ public void resetStart() {
       testEnv.sleep(Duration.ofSeconds(30L));
       workflow.resetConnection();
       testEnv.sleep(Duration.ofSeconds(90L));
+      testEnv.shutdown();
 
       final Queue<ChangedStateEvent> events = testStateListener.events(testId);
 
@@ -473,7 +473,6 @@ public void resetStart() {
 
       Mockito.verify(mJobCreationAndStatusUpdateActivity).jobSuccess(Mockito.any());
 
-      testEnv.shutdown();
     }
 
     @Test
@@ -497,7 +496,8 @@ public void resetCancelRunningWorkflow() {
       workflow.submitManualSync();
       testEnv.sleep(Duration.ofSeconds(30L));
       workflow.resetConnection();
-      testEnv.sleep(Duration.ofSeconds(30L));
+      testEnv.sleep(Duration.ofMinutes(2L));
+      testEnv.shutdown();
 
       final Queue<ChangedStateEvent> events = testStateListener.events(testId);
 
@@ -507,7 +507,6 @@ public void resetCancelRunningWorkflow() {
 
       Mockito.verify(mJobCreationAndStatusUpdateActivity).jobCancelled(Mockito.any());
 
-      testEnv.shutdown();
     }
 
     @Test