SeleniumHQ
diff --git a/‎java/client/test/org/openqa/selenium/build/InProject.java‎
Lines changed: 0 additions & 1 deletion b/‎java/client/test/org/openqa/selenium/build/InProject.java‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎java/client/test/org/openqa/selenium/testing/drivers/OutOfProcessSeleniumServer.java‎
Lines changed: 18 additions & 1 deletion b/‎java/client/test/org/openqa/selenium/testing/drivers/OutOfProcessSeleniumServer.java‎
Lines changed: 18 additions & 1 deletion
@@ -67,7 +67,6 @@ public static Path findProjectRoot() {
       }
     }
 
-    // Find the rakefile first
     dir = Paths.get(".").toAbsolutePath();
     Path pwd = dir;
     while (dir != null && !dir.equals(dir.getParent())) {
 
@@ -18,6 +18,9 @@
 package org.openqa.selenium.testing.drivers;
 
 import org.openqa.selenium.Platform;
+import org.openqa.selenium.build.BazelBuild;
+import org.openqa.selenium.build.DevMode;
+import org.openqa.selenium.build.InProject;
 import org.openqa.selenium.net.NetworkUtils;
 import org.openqa.selenium.net.PortProber;
 import org.openqa.selenium.net.UrlChecker;
@@ -26,6 +29,7 @@
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.file.Path;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
@@ -77,7 +81,7 @@ public OutOfProcessSeleniumServer start(String mode, String... extraFlags) {
     try {
       URL url = new URL(baseUrl + "/status");
       log.info("Waiting for server status on URL " + url);
-      new UrlChecker().waitUntilAvailable(5, SECONDS, url);
+      new UrlChecker().waitUntilAvailable(10, SECONDS, url);
       log.info("Server is ready");
     } catch (UrlChecker.TimeoutException e) {
       log.severe("Server failed to start: " + e.getMessage());
@@ -113,6 +117,19 @@ public void stop() {
   }
 
   private String buildServerAndClasspath() {
+    if (DevMode.isInDevMode()) {
+      Path serverJar = InProject.locate(
+        "bazel-bin/java/server/src/org/openqa/selenium/grid/selenium_server_deploy.jar");
+      if (serverJar == null) {
+        new BazelBuild().build("grid");
+        serverJar = InProject.locate(
+          "bazel-bin/java/server/src/org/openqa/selenium/grid/selenium_server_deploy.jar");
+      }
+      if (serverJar != null) {
+        return serverJar.toAbsolutePath().toString();
+      }
+    }
+
     if (System.getProperty("selenium.browser.remote.path") != null) {
       return System.getProperty("selenium.browser.remote.path");
     }
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@ public static Path findProjectRoot() {`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`		`- // Find the rakefile first`
`71`	`70`	`dir = Paths.get(".").toAbsolutePath();`
`72`	`71`	`Path pwd = dir;`
`73`	`72`	`while (dir != null && !dir.equals(dir.getParent())) {`