A better fix for service availability checking that works for both Ch…

…rome and Marionette
SeleniumHQ · Oct 9, 2015 · 06a8a62 · 06a8a62
1 parent ffb124c
commit 06a8a62
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/java/client/src/org/openqa/selenium/firefox/GeckoDriverService.java b/java/client/src/org/openqa/selenium/firefox/GeckoDriverService.java
@@ -26,6 +26,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.MalformedURLException;
 
 /**
  * Manages the life and death of an GeckoDriver aka 'wires'.
@@ -63,6 +64,11 @@ public static GeckoDriverService createDefaultService() {
     return new Builder().usingAnyFreePort().build();
   }
 
+  @Override
+  protected void waitUntilAvailable() throws MalformedURLException {
+    return;
+  }
+
   /**
    * Builder used to configure new {@link GeckoDriverService} instances.
    */

diff --git a/java/client/src/org/openqa/selenium/remote/service/DriverService.java b/java/client/src/org/openqa/selenium/remote/service/DriverService.java
@@ -163,13 +163,19 @@ public void start() throws IOException {
       process.copyOutputTo(System.err);
       process.executeAsync();
 
+      waitUntilAvailable();
+    } finally {
+      lock.unlock();
+    }
+  }
+
+  protected void waitUntilAvailable() throws MalformedURLException {
+    try {
       URL status = new URL(url.toString() + "/status");
       new UrlChecker().waitUntilAvailable(20, SECONDS, status);
     } catch (UrlChecker.TimeoutException e) {
       process.checkForError();
       throw new WebDriverException("Timed out waiting for driver server to start.", e);
-    } finally {
-      lock.unlock();
     }
   }