From e74ce27e338958cf7047b238ead90d9547943a13 Mon Sep 17 00:00:00 2001
From: Mikko Tiihonen <gmokki@gmail.com>
Date: Sat, 18 Apr 2020 21:11:21 +0300
Subject: [PATCH] Replace hardcoded wait with loop

---
 .../io/nflow/tests/MaintenanceWorkflowTest.java   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 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
index 3b3f38ee4..2845afaed 100644
--- 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