Skip to content

Commit c79cab5

Browse files
committed
[grid] Switching Selenium Manager flag to false by default
Related to #11697
1 parent 1563e8a commit c79cab5

File tree

6 files changed

+15
-8
lines changed

6 files changed

+15
-8
lines changed

java/src/org/openqa/selenium/grid/node/config/NodeOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public class NodeOptions {
7474
public static final boolean DEFAULT_ENABLE_BIDI = true;
7575
static final String NODE_SECTION = "node";
7676
static final boolean DEFAULT_DETECT_DRIVERS = true;
77-
static final boolean DEFAULT_USE_SELENIUM_MANAGER = true;
77+
static final boolean DEFAULT_USE_SELENIUM_MANAGER = false;
7878
static final boolean OVERRIDE_MAX_SESSIONS = false;
7979
static final String DEFAULT_VNC_ENV_VAR = "SE_START_XVFB";
8080
static final int DEFAULT_NO_VNC_PORT = 7900;

java/test/org/openqa/selenium/grid/gridui/OverallGridTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package org.openqa.selenium.grid.gridui;
1919

2020
import com.google.common.collect.ImmutableMap;
21+
2122
import org.junit.jupiter.api.AfterEach;
2223
import org.junit.jupiter.api.BeforeEach;
2324
import org.junit.jupiter.api.Test;
@@ -112,7 +113,8 @@ private Server<?> createStandalone() {
112113
Config config = new MemoizedConfig(
113114
new MapConfig(ImmutableMap.of(
114115
"server", Collections.singletonMap("port", port),
115-
"node", Collections.singletonMap("detect-drivers", true))));
116+
"node", ImmutableMap.of("detect-drivers", true, "selenium-manager", true)
117+
)));
116118

117119
Server<?> server = new Standalone().asServer(config).start();
118120

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717

1818
package org.openqa.selenium.grid.router;
1919

20-
import static org.assertj.core.api.Assertions.assertThat;
21-
import static org.assertj.core.api.Assumptions.assumeThat;
22-
2320
import com.google.common.collect.ImmutableMap;
2421

2522
import org.junit.jupiter.api.BeforeAll;
@@ -49,6 +46,9 @@
4946
import java.util.Map;
5047
import java.util.Objects;
5148

49+
import static org.assertj.core.api.Assertions.assertThat;
50+
import static org.assertj.core.api.Assumptions.assumeThat;
51+
5252
class DistributedCdpTest {
5353

5454
@BeforeAll
@@ -66,6 +66,7 @@ void ensureBasicFunctionality() {
6666
browser.getCapabilities(),
6767
new TomlConfig(new StringReader(
6868
"[node]\n" +
69+
"selenium-manager = true\n" +
6970
"driver-implementation = " + browser.displayName())));
7071

7172
Server<?> server = new NettyServer(

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
package org.openqa.selenium.grid.router;
1919

20-
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
21-
2220
import org.junit.jupiter.api.Test;
2321
import org.openqa.selenium.By;
2422
import org.openqa.selenium.WebDriver;
@@ -48,6 +46,8 @@
4846
import java.util.concurrent.TimeUnit;
4947
import java.util.concurrent.TimeoutException;
5048

49+
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
50+
5151
class RemoteWebDriverBiDiTest {
5252

5353
@Test
@@ -58,6 +58,7 @@ void ensureBiDiSessionCreation() {
5858
browser.getCapabilities(),
5959
new TomlConfig(new StringReader(
6060
"[node]\n" +
61+
"selenium-manager = true\n" +
6162
"driver-implementation = " + browser.displayName())));
6263

6364
FirefoxOptions options = new FirefoxOptions();
@@ -83,6 +84,7 @@ void canListenToLogs() throws ExecutionException, InterruptedException, TimeoutE
8384
browser.getCapabilities(),
8485
new TomlConfig(new StringReader(
8586
"[node]\n" +
87+
"selenium-manager = true\n" +
8688
"driver-implementation = " + browser.displayName())));
8789

8890
FirefoxOptions options = new FirefoxOptions();
@@ -123,6 +125,7 @@ void canNavigateToUrl() throws ExecutionException, InterruptedException, Timeout
123125
browser.getCapabilities(),
124126
new TomlConfig(new StringReader(
125127
"[node]\n" +
128+
"selenium-manager = true\n" +
126129
"driver-implementation = " + browser.displayName())));
127130

128131
FirefoxOptions options = new FirefoxOptions();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ public void setupServers() {
6666
browser.getCapabilities(),
6767
new TomlConfig(new StringReader(
6868
"[node]\n" +
69+
"selenium-manager = true\n" +
6970
"driver-implementation = " + browser.displayName())));
7071
tearDowns.add(deployment);
7172

java/test/org/openqa/selenium/testing/drivers/RemoteSupplier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private synchronized void startServer() {
6767
if (started) {
6868
return;
6969
}
70-
server.start("standalone");
70+
server.start("standalone", "--selenium-manager", "true");
7171
started = true;
7272
}
7373
}

0 commit comments

Comments
 (0)