Implementing ability to not send shutdown command to the driver serve…

…rs that don't support it.
SeleniumHQ · Nov 6, 2017 · d5d3cb4 · d5d3cb4
1 parent d17e0ac
commit d5d3cb4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/java/client/src/org/openqa/selenium/firefox/GeckoDriverService.java b/java/client/src/org/openqa/selenium/firefox/GeckoDriverService.java
@@ -97,6 +97,11 @@ protected void waitUntilAvailable() throws MalformedURLException {
     PortProber.waitForPortUp(getUrl().getPort(), 20, SECONDS);
   }
 
+  @Override
+  protected boolean hasShutdownEndpoint() {
+    return false;
+  }
+
   /**
    * 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
@@ -194,7 +194,7 @@ protected void waitUntilAvailable() throws MalformedURLException {
   }
 
   /**
-   * Stops this service is it is currently running. This method will attempt to block until the
+   * Stops this service if it is currently running. This method will attempt to block until the
    * server has been fully shutdown.
    *
    * @see #start()
@@ -208,13 +208,15 @@ public void stop() {
         return;
       }
 
-      try {
-        URL killUrl = new URL(url.toString() + "/shutdown");
-        new UrlChecker().waitUntilUnavailable(3, SECONDS, killUrl);
-      } catch (MalformedURLException e) {
-        toThrow = new WebDriverException(e);
-      } catch (UrlChecker.TimeoutException e) {
-        toThrow = new WebDriverException("Timed out waiting for driver server to shutdown.", e);
+      if (hasShutdownEndpoint()) {
+        try {
+          URL killUrl = new URL(url.toString() + "/shutdown");
+          new UrlChecker().waitUntilUnavailable(3, SECONDS, killUrl);
+        } catch (MalformedURLException e) {
+          toThrow = new WebDriverException(e);
+        } catch (UrlChecker.TimeoutException e) {
+          toThrow = new WebDriverException("Timed out waiting for driver server to shutdown.", e);
+        }
       }
 
       process.destroy();
@@ -228,6 +230,10 @@ public void stop() {
     }
   }
 
+  protected boolean hasShutdownEndpoint() {
+    return true;
+  }
+
   public void sendOutputTo(OutputStream outputStream) {
     this.outputStream = Preconditions.checkNotNull(outputStream);
   }