[java] Making router test more stable by waiting for readiness

Author: barancev

java/server/test/org/openqa/selenium/grid/router/RouterTest.java

@@ -45,6 +45,7 @@
 import org.openqa.selenium.remote.http.HttpResponse;
 import org.openqa.selenium.remote.tracing.DefaultTestTracer;
 import org.openqa.selenium.remote.tracing.Tracer;
+import org.openqa.selenium.support.ui.FluentWait;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -55,7 +56,6 @@
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 import static org.openqa.selenium.grid.data.Availability.DOWN;
 import static org.openqa.selenium.grid.data.Availability.UP;
 import static org.openqa.selenium.json.Json.MAP_TYPE;
@@ -94,12 +94,12 @@ public void setUp() {
     handler.addHandler(queuer);
 
     distributor = new LocalDistributor(
-        tracer,
-        bus,
-        clientFactory,
-        sessions,
-        queuer,
-        registrationSecret);
+      tracer,
+      bus,
+      clientFactory,
+      sessions,
+      queuer,
+      registrationSecret);
     handler.addHandler(distributor);
 
     router = new Router(tracer, clientFactory, sessions, queuer, distributor);
@@ -119,10 +119,10 @@ public void addingANodeThatIsDownMeansTheGridIsNotReady() throws URISyntaxExcept
     AtomicReference<Availability> isUp = new AtomicReference<>(DOWN);
 
     Node node = LocalNode.builder(tracer, bus, uri, uri, registrationSecret)
-        .add(capabilities, new TestSessionFactory((id, caps) -> new Session(id, uri, new ImmutableCapabilities(), caps, Instant.now())))
-        .advanced()
-        .healthCheck(() -> new HealthCheck.Result(isUp.get(), "TL;DR"))
-        .build();
+      .add(capabilities, new TestSessionFactory((id, caps) -> new Session(id, uri, new ImmutableCapabilities(), caps, Instant.now())))
+      .advanced()
+      .healthCheck(() -> new HealthCheck.Result(isUp.get(), "TL;DR"))
+      .build();
     distributor.add(node);
 
     Map<String, Object> status = getStatus(router);
@@ -137,14 +137,13 @@ public void aNodeThatIsUpAndHasSpareSessionsMeansTheGridIsReady() throws URISynt
     AtomicReference<Availability> isUp = new AtomicReference<>(UP);
 
     Node node = LocalNode.builder(tracer, bus, uri, uri, registrationSecret)
-        .add(capabilities, new TestSessionFactory((id, caps) -> new Session(id, uri, new ImmutableCapabilities(), caps, Instant.now())))
-        .advanced()
-        .healthCheck(() -> new HealthCheck.Result(isUp.get(), "TL;DR"))
-        .build();
+      .add(capabilities, new TestSessionFactory((id, caps) -> new Session(id, uri, new ImmutableCapabilities(), caps, Instant.now())))
+      .advanced()
+      .healthCheck(() -> new HealthCheck.Result(isUp.get(), "TL;DR"))
+      .build();
     distributor.add(node);
 
-    Map<String, Object> status = getStatus(router);
-    assertTrue(status.toString(), (Boolean) status.get("ready"));
+    waitUntilReady(router, Duration.ofSeconds(5));
   }
 
   @Test
@@ -163,4 +162,15 @@ private Map<String, Object> getStatus(Router router) {
     assertNotNull(status);
     return status;
   }
+
+  private static void waitUntilReady(Router router, Duration duration) {
+    new FluentWait<>(router)
+      .withTimeout(duration)
+      .pollingEvery(Duration.ofMillis(100))
+      .until(r -> {
+        HttpResponse response = r.execute(new HttpRequest(GET, "/status"));
+        Map<String, Object> status = Values.get(response, MAP_TYPE);
+        return Boolean.TRUE.equals(status.get("ready"));
+      });
+  }
 }