[java] ensure an Error will stop the StressTest

Author: joerg1985

java/test/org/openqa/selenium/grid/router/StressTest.java

@@ -21,7 +21,6 @@
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.StringReader;
 import java.util.LinkedList;
@@ -77,7 +76,7 @@ public void setupServers() {
                         + "\n"
                         + "session-timeout = 11"
                         + "\n"
-                        + "overwrite-max-sessions = true"
+                        + "override-max-sessions = true"
                         + "\n"
                         + "max-sessions = "
                         + Runtime.getRuntime().availableProcessors() * 2
@@ -116,30 +115,26 @@ void multipleSimultaneousSessions() throws Exception {
     CompletableFuture<?>[] futures = new CompletableFuture<?>[10];
     for (int i = 0; i < futures.length; i++) {
       CompletableFuture<Object> future = new CompletableFuture<>();
-      futures[i] = future;
-
-      executor.submit(
-          () -> {
-            try {
-              WebDriver driver =
-                  RemoteWebDriver.builder()
-                      .oneOf(
-                          browser
-                              .getCapabilities()
-                              .merge(new MutableCapabilities(Map.of("se:downloadsEnabled", true))))
-                      .address(server.getUrl())
-                      .build();
-
-              driver.get(appServer.getUrl().toString());
-              driver.findElement(By.tagName("body"));
-
-              // And now quit
-              driver.quit();
-              future.complete(true);
-            } catch (Exception e) {
-              future.completeExceptionally(e);
-            }
-          });
+      futures[i] =
+          CompletableFuture.runAsync(
+              () -> {
+                WebDriver driver =
+                    RemoteWebDriver.builder()
+                        .oneOf(
+                            browser
+                                .getCapabilities()
+                                .merge(
+                                    new MutableCapabilities(Map.of("se:downloadsEnabled", true))))
+                        .address(server.getUrl())
+                        .build();
+
+                driver.get(appServer.getUrl().toString());
+                driver.findElement(By.tagName("body"));
+
+                // And now quit
+                driver.quit();
+              },
+              executor);
     }
 
     CompletableFuture.allOf(futures).get(4, MINUTES);
@@ -151,35 +146,48 @@ void multipleSimultaneousSessionsTimedOut() throws Exception {
 
     CompletableFuture<?>[] futures = new CompletableFuture<?>[10];
     for (int i = 0; i < futures.length; i++) {
-      CompletableFuture<Object> future = new CompletableFuture<>();
-      futures[i] = future;
-
-      executor.submit(
-          () -> {
-            try {
-              WebDriver driver =
-                  RemoteWebDriver.builder()
-                      .oneOf(browser.getCapabilities())
-                      .address(server.getUrl())
-                      .build();
-              driver.get(appServer.getUrl().toString());
-              Thread.sleep(11000);
-              NoSuchSessionException exception =
-                  assertThrows(NoSuchSessionException.class, driver::getTitle);
-              assertTrue(exception.getMessage().startsWith("Cannot find session with id:"));
-              WebDriverException webDriverException =
-                  assertThrows(
-                      WebDriverException.class,
-                      () -> ((RemoteWebDriver) driver).getDownloadableFiles());
-              assertTrue(
-                  webDriverException
-                      .getMessage()
-                      .startsWith("Cannot find downloads file system for session id:"));
-              future.complete(true);
-            } catch (Exception e) {
-              future.completeExceptionally(e);
-            }
-          });
+      futures[i] =
+          CompletableFuture.runAsync(
+              () -> {
+                WebDriver driver =
+                    RemoteWebDriver.builder()
+                        .oneOf(browser.getCapabilities())
+                        .address(server.getUrl())
+                        .build();
+                driver.get(appServer.getUrl().toString());
+                try {
+                  Thread.sleep(11000);
+                } catch (InterruptedException ex) {
+                  Thread.currentThread().interrupt();
+                  throw new RuntimeException(ex);
+                }
+                // note: As soon as the session cleanup of the node is performed, the grid is unable
+                // to route the request. All commands to a session in this state will fail with:
+                // "Unable to find session with ID:"
+                NoSuchSessionException exception =
+                    assertThrows(NoSuchSessionException.class, driver::getTitle);
+                assertThat(exception.getMessage())
+                    .matches(
+                        (msg) ->
+                            // the session timed out, the cleanup is pending
+                            msg.startsWith("Cannot find session with id:")
+                                // the session timed out, the cleanup is done
+                                || msg.startsWith("Unable to find session with ID:"),
+                        "Cannot find session … / Unable to find session …");
+                WebDriverException webDriverException =
+                    assertThrows(
+                        WebDriverException.class,
+                        () -> ((RemoteWebDriver) driver).getDownloadableFiles());
+                assertThat(webDriverException.getMessage())
+                    .matches(
+                        (msg) ->
+                            // the session timed out, the cleanup is pending
+                            msg.startsWith("Cannot find downloads file system for session id:")
+                                // the session timed out, the cleanup is done
+                                || msg.startsWith("Unable to find session with ID:"),
+                        "Cannot find downloads … / Unable to find session …");
+              },
+              executor);
     }
 
     CompletableFuture.allOf(futures).get(5, MINUTES);