[java] Fixing remote tests on Windows, bazel does not make symlinks i…

…nside runfiles directory so we should find server in another place
SeleniumHQ · Nov 23, 2020 · 35e4776 · 35e4776
1 parent 4975741
commit 35e4776
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/java/client/test/org/openqa/selenium/testing/drivers/OutOfProcessSeleniumServer.java b/java/client/test/org/openqa/selenium/testing/drivers/OutOfProcessSeleniumServer.java
@@ -17,11 +17,13 @@
 
 package org.openqa.selenium.testing.drivers;
 
+import org.openqa.selenium.Platform;
 import org.openqa.selenium.net.NetworkUtils;
 import org.openqa.selenium.net.PortProber;
 import org.openqa.selenium.net.UrlChecker;
 import org.openqa.selenium.os.CommandLine;
 
+import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.logging.Logger;
@@ -61,8 +63,12 @@ public OutOfProcessSeleniumServer start(String mode, String... extraFlags) {
     baseUrl = String.format("http://%s:%d", localAddress, port);
 
     command = new CommandLine("java", Stream.concat(
-        Stream.of("-jar", serverJar, mode, "--port", String.valueOf(port)),
-        Stream.of(extraFlags)).toArray(String[]::new));
+      Stream.of("-jar", serverJar, mode, "--port", String.valueOf(port)),
+      Stream.of(extraFlags)).toArray(String[]::new));
+    if (Platform.getCurrent().is(Platform.WINDOWS)) {
+      File workingDir = findBinRoot(new File(".").getAbsoluteFile());
+      command.setWorkingDirectory(workingDir.getAbsolutePath());
+    }
 
     command.copyOutputTo(System.err);
     log.info("Starting selenium server: " + command.toString());
@@ -88,6 +94,14 @@ public OutOfProcessSeleniumServer start(String mode, String... extraFlags) {
     return this;
   }
 
+  private File findBinRoot(File dir) {
+    if ("bin".equals(dir.getName())) {
+      return dir;
+    } else {
+      return findBinRoot(dir.getParentFile());
+    }
+  }
+
   public void stop() {
     if (command == null) {
       return;

diff --git a/java/client/test/org/openqa/selenium/testing/drivers/RemoteSupplier.java b/java/client/test/org/openqa/selenium/testing/drivers/RemoteSupplier.java
@@ -62,7 +62,7 @@ public WebDriver get() {
     return driver;
   }
 
-  private synchronized  void startServer() {
+  private synchronized void startServer() {
     if (started) {
       return;
     }