Fix tests

Signed-off-by: Viet Nguyen Duc <[email protected]>

Author: VietND96

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

@@ -453,13 +453,12 @@ private Map<WebDriverInfo, Integer> calculateOptimizedCpuDistribution(List<WebDr
 
     // First, allocate sessions for constrained drivers (like Safari)
     int remainingCores = DEFAULT_MAX_SESSIONS;
-    List<WebDriverInfo> constrainedDrivers = new ArrayList<>();
     List<WebDriverInfo> flexibleDrivers = new ArrayList<>();
 
     for (WebDriverInfo info : infos) {
       if (info.getMaximumSimultaneousSessions() == 1
           && SINGLE_SESSION_DRIVERS.contains(info.getDisplayName().toLowerCase(Locale.ENGLISH))) {
-        constrainedDrivers.add(info);
+        // Constrained drivers get exactly 1 session
         sessionsPerDriver.put(info, 1);
         remainingCores--;
       } else {

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

@@ -56,7 +56,7 @@
 class StressTest {
 
   private final ExecutorService executor =
-      Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 2);
+      Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 4);
   private final List<TearDownFixture> tearDowns = new LinkedList<>();
   private Server<?> server;
   private Browser browser;
@@ -80,7 +80,7 @@ public void setupServers() {
                         + "override-max-sessions = true"
                         + "\n"
                         + "max-sessions = "
-                        + Runtime.getRuntime().availableProcessors() * 2
+                        + Runtime.getRuntime().availableProcessors() * 4
                         + "\n"
                         + "enable-managed-downloads = true")));
     tearDowns.add(deployment);

rb/spec/unit/selenium/server_spec.rb

@@ -23,7 +23,16 @@
 
 module Selenium
   describe Server do
-    let(:mock_process) { instance_double(WebDriver::ChildProcess).as_null_object }
+    let(:mock_process) do
+      instance_double(WebDriver::ChildProcess).tap do |mock|
+        allow(mock).to receive(:start)
+        allow(mock).to receive(:wait)
+        allow(mock).to receive(:stop)
+        allow(mock).to receive(:detach=)
+        allow(mock).to receive(:io)
+        allow(mock).to receive(:io=)
+      end
+    end
     let(:mock_poller) { instance_double(WebDriver::SocketPoller, connected?: true, closed?: true) }
     let(:repo) { 'https://api.github.com/repos/seleniumhq/selenium/releases' }
     let(:port) { WebDriver::PortProber.above(4444) }
@@ -49,7 +58,8 @@ module Selenium
     it 'uses the given jar file and port' do
       allow(File).to receive(:exist?).with('selenium_server_deploy.jar').and_return(true)
       allow(WebDriver::ChildProcess).to receive(:build)
-        .with('java', '-jar', 'selenium_server_deploy.jar', 'standalone', '--port', '1234')
+        .with('java', '-jar', 'selenium_server_deploy.jar', 'standalone', '--port', '1234',
+              '--override-max-sessions', 'true', '--max-sessions', Etc.nprocessors.to_s)
         .and_return(mock_process)
 
       server = described_class.new('selenium_server_deploy.jar', port: 1234, background: true)
@@ -58,13 +68,15 @@ module Selenium
       server.start
       expect(File).to have_received(:exist?).with('selenium_server_deploy.jar')
       expect(WebDriver::ChildProcess).to have_received(:build)
-        .with('java', '-jar', 'selenium_server_deploy.jar', 'standalone', '--port', '1234')
+        .with('java', '-jar', 'selenium_server_deploy.jar', 'standalone', '--port', '1234',
+              '--override-max-sessions', 'true', '--max-sessions', Etc.nprocessors.to_s)
     end
 
     it 'waits for the server process by default' do
       allow(File).to receive(:exist?).with('selenium_server_deploy.jar').and_return(true)
       allow(WebDriver::ChildProcess).to receive(:build)
-        .with('java', '-jar', 'selenium_server_deploy.jar', 'standalone', '--port', port.to_s)
+        .with('java', '-jar', 'selenium_server_deploy.jar', 'standalone', '--port', port.to_s,
+              '--override-max-sessions', 'true', '--max-sessions', Etc.nprocessors.to_s)
         .and_return(mock_process)
 
       server = described_class.new('selenium_server_deploy.jar', port: port)
@@ -75,14 +87,16 @@ module Selenium
 
       expect(File).to have_received(:exist?).with('selenium_server_deploy.jar')
       expect(WebDriver::ChildProcess).to have_received(:build)
-        .with('java', '-jar', 'selenium_server_deploy.jar', 'standalone', '--port', port.to_s)
+        .with('java', '-jar', 'selenium_server_deploy.jar', 'standalone', '--port', port.to_s,
+              '--override-max-sessions', 'true', '--max-sessions', Etc.nprocessors.to_s)
       expect(mock_process).to have_received(:wait)
     end
 
     it 'adds additional args' do
       allow(File).to receive(:exist?).with('selenium_server_deploy.jar').and_return(true)
       allow(WebDriver::ChildProcess).to receive(:build)
-        .with('java', '-jar', 'selenium_server_deploy.jar', 'standalone', '--port', port.to_s, 'foo', 'bar')
+        .with('java', '-jar', 'selenium_server_deploy.jar', 'standalone', '--port', port.to_s,
+              '--override-max-sessions', 'true', '--max-sessions', Etc.nprocessors.to_s, 'foo', 'bar')
         .and_return(mock_process)
 
       server = described_class.new('selenium_server_deploy.jar', port: port, background: true)
@@ -94,7 +108,8 @@ module Selenium
       expect(File).to have_received(:exist?).with('selenium_server_deploy.jar')
       expect(WebDriver::ChildProcess).to have_received(:build)
         .with('java', '-jar', 'selenium_server_deploy.jar', 'standalone',
-              '--port', port.to_s, 'foo', 'bar')
+              '--port', port.to_s, '--override-max-sessions', 'true', '--max-sessions', Etc.nprocessors.to_s,
+              'foo', 'bar')
     end
 
     it 'adds additional JAVA options args' do
@@ -105,6 +120,8 @@ module Selenium
               '-jar', 'selenium_server_deploy.jar',
               'standalone',
               '--port', port.to_s,
+              '--override-max-sessions', 'true',
+              '--max-sessions', Etc.nprocessors.to_s,
               'foo',
               'bar')
         .and_return(mock_process)
@@ -197,7 +214,8 @@ module Selenium
     it 'raises Selenium::Server::Error if the server is not launched within the timeout' do
       allow(File).to receive(:exist?).with('selenium_server_deploy.jar').and_return(true)
       allow(WebDriver::ChildProcess).to receive(:build)
-        .with('java', '-jar', 'selenium_server_deploy.jar', 'standalone', '--port', port.to_s)
+        .with('java', '-jar', 'selenium_server_deploy.jar', 'standalone', '--port', port.to_s,
+              '--override-max-sessions', 'true', '--max-sessions', Etc.nprocessors.to_s)
         .and_return(mock_process)
 
       poller = instance_double(WebDriver::SocketPoller)