[grid] Switching Selenium Manager flag to false by default

diemol · diemol · commit c79cab528bfa · 2023-02-22T23:49:32.000+01:00
Related to #11697
diff --git a/java/src/org/openqa/selenium/grid/node/config/NodeOptions.java b/java/src/org/openqa/selenium/grid/node/config/NodeOptions.java
@@ -74,7 +74,7 @@ public class NodeOptions {
   public static final boolean DEFAULT_ENABLE_BIDI = true;
   static final String NODE_SECTION = "node";
   static final boolean DEFAULT_DETECT_DRIVERS = true;
-  static final boolean DEFAULT_USE_SELENIUM_MANAGER = true;
+  static final boolean DEFAULT_USE_SELENIUM_MANAGER = false;
   static final boolean OVERRIDE_MAX_SESSIONS = false;
   static final String DEFAULT_VNC_ENV_VAR = "SE_START_XVFB";
   static final int DEFAULT_NO_VNC_PORT = 7900;
diff --git a/java/test/org/openqa/selenium/grid/gridui/OverallGridTest.java b/java/test/org/openqa/selenium/grid/gridui/OverallGridTest.java
@@ -18,6 +18,7 @@
 package org.openqa.selenium.grid.gridui;
 
 import com.google.common.collect.ImmutableMap;
+
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -112,7 +113,8 @@ private Server<?> createStandalone() {
     Config config = new MemoizedConfig(
       new MapConfig(ImmutableMap.of(
         "server", Collections.singletonMap("port", port),
-        "node", Collections.singletonMap("detect-drivers", true))));
+        "node", ImmutableMap.of("detect-drivers", true, "selenium-manager", true)
+      )));
 
     Server<?> server = new Standalone().asServer(config).start();
 
diff --git a/java/test/org/openqa/selenium/grid/router/DistributedCdpTest.java b/java/test/org/openqa/selenium/grid/router/DistributedCdpTest.java
@@ -17,9 +17,6 @@
 
 package org.openqa.selenium.grid.router;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assumptions.assumeThat;
-
 import com.google.common.collect.ImmutableMap;
 
 import org.junit.jupiter.api.BeforeAll;
@@ -49,6 +46,9 @@
 import java.util.Map;
 import java.util.Objects;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assumptions.assumeThat;
+
 class DistributedCdpTest {
 
   @BeforeAll
@@ -66,6 +66,7 @@ void ensureBasicFunctionality() {
       browser.getCapabilities(),
       new TomlConfig(new StringReader(
         "[node]\n" +
+        "selenium-manager = true\n" +
         "driver-implementation = " + browser.displayName())));
 
     Server<?> server = new NettyServer(
diff --git a/java/test/org/openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java b/java/test/org/openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java
@@ -17,8 +17,6 @@
 
 package org.openqa.selenium.grid.router;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
@@ -48,6 +46,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
 class RemoteWebDriverBiDiTest {
 
   @Test
@@ -58,6 +58,7 @@ void ensureBiDiSessionCreation() {
       browser.getCapabilities(),
       new TomlConfig(new StringReader(
         "[node]\n" +
+        "selenium-manager = true\n" +
         "driver-implementation = " + browser.displayName())));
 
     FirefoxOptions options = new FirefoxOptions();
@@ -83,6 +84,7 @@ void canListenToLogs() throws ExecutionException, InterruptedException, TimeoutE
       browser.getCapabilities(),
       new TomlConfig(new StringReader(
         "[node]\n" +
+        "selenium-manager = true\n" +
         "driver-implementation = " + browser.displayName())));
 
     FirefoxOptions options = new FirefoxOptions();
@@ -123,6 +125,7 @@ void canNavigateToUrl() throws ExecutionException, InterruptedException, Timeout
       browser.getCapabilities(),
       new TomlConfig(new StringReader(
         "[node]\n" +
+        "selenium-manager = true\n" +
         "driver-implementation = " + browser.displayName())));
 
     FirefoxOptions options = new FirefoxOptions();
diff --git a/java/test/org/openqa/selenium/grid/router/StressTest.java b/java/test/org/openqa/selenium/grid/router/StressTest.java
@@ -66,6 +66,7 @@ public void setupServers() {
       browser.getCapabilities(),
       new TomlConfig(new StringReader(
         "[node]\n" +
+        "selenium-manager = true\n" +
         "driver-implementation = " + browser.displayName())));
     tearDowns.add(deployment);
 
diff --git a/java/test/org/openqa/selenium/testing/drivers/RemoteSupplier.java b/java/test/org/openqa/selenium/testing/drivers/RemoteSupplier.java
@@ -67,7 +67,7 @@ private synchronized void startServer() {
     if (started) {
       return;
     }
-    server.start("standalone");
+    server.start("standalone", "--selenium-manager", "true");
     started = true;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ private synchronized void startServer() {`
`67`	`67`	`if (started) {`
`68`	`68`	`return;`
`69`	`69`	`}`
`70`		`- server.start("standalone");`
	`70`	`+ server.start("standalone", "--selenium-manager", "true");`
`71`	`71`	`started = true;`
`72`	`72`	`}`
`73`	`73`	`}`