Replace hardcoded wait with loop

NitorCreations · Apr 27, 2020 · e74ce27 · e74ce27
1 parent d430723
commit e74ce27
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/nflow-tests/src/test/java/io/nflow/tests/MaintenanceWorkflowTest.java b/nflow-tests/src/test/java/io/nflow/tests/MaintenanceWorkflowTest.java
@@ -15,7 +15,10 @@
 import static org.joda.time.Period.seconds;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import javax.ws.rs.NotFoundException;
 
@@ -76,7 +79,17 @@ public void createWorkflows() {
   @Test
   @Order(4)
   public void waitForCleanup() throws InterruptedException {
-    SECONDS.sleep(6);
+    Set<Long> waiting = new HashSet<>(ids);
+    for (int i=0; i<10 && !waiting.isEmpty(); ++i) {
+      SECONDS.sleep(1);
+      for (Iterator<Long> it = waiting.iterator(); it.hasNext(); ) {
+        try {
+          getWorkflowInstance(it.next());
+        } catch (NotFoundException ex) {
+          it.remove();
+        }
+      }
+    }
   }
 
   @Test