Re-enable testing of all Grid modes in the EndToEndTest

SeleniumHQ · Apr 26, 2021 · 93c9ec7 · 93c9ec7
1 parent c13ec4e
commit 93c9ec7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/java/server/test/org/openqa/selenium/grid/router/DeploymentTypes.java b/java/server/test/org/openqa/selenium/grid/router/DeploymentTypes.java
@@ -81,7 +81,8 @@ public Deployment start(Capabilities capabilities, Config additionalConfig) {
           additionalConfig,
           new TomlConfig(new StringReader(String.join("\n", rawConfig)))));
 
-      Server<?> server = new Standalone().asServer(new CompoundConfig(setRandomPort(), config)).start();waitUntilReady(server, Duration.ofSeconds(5));
+      Server<?> server = new Standalone().asServer(new CompoundConfig(setRandomPort(), config)).start();
+      waitUntilReady(server, Duration.ofSeconds(5));
 
       return new Deployment(server, server::stop);
     }

diff --git a/java/server/test/org/openqa/selenium/grid/router/EndToEndTest.java b/java/server/test/org/openqa/selenium/grid/router/EndToEndTest.java
@@ -94,11 +94,13 @@ public static Collection<Supplier<Deployment>> buildGrids() {
                     "driver-factories = [\n" +
                     String.format("\"%s\",", TestSessionFactoryFactory.class.getName()) + "\n" +
                     String.format("\"%s\"", rawCaps.toString().replace("\"", "\\\"")) + "\n" +
-                    "]"));
+                    "]\n" +
+                    "[sessionqueue]\n" +
+                    "session-request-timeout = 5"));
 
     return ImmutableSet.of(
-//      () -> DeploymentTypes.DISTRIBUTED.start(CAPS, additionalConfig),
-//      () -> DeploymentTypes.HUB_AND_NODE.start(CAPS, additionalConfig),
+      () -> DeploymentTypes.DISTRIBUTED.start(CAPS, additionalConfig),
+      () -> DeploymentTypes.HUB_AND_NODE.start(CAPS, additionalConfig),
       () -> DeploymentTypes.STANDALONE.start(CAPS, additionalConfig));
   }