On behalf of johannes@brodwall.com: Fixing the list of extensions to …

…search for an executable on Windows, and logging process startup errors. Fixes issue 7514
SeleniumHQ · Jun 28, 2014 · 203090c · 203090c
1 parent 9bce67c
commit 203090c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 1 deletion.
diff --git a/java/client/src/org/openqa/selenium/os/CommandLine.java b/java/client/src/org/openqa/selenium/os/CommandLine.java
@@ -178,4 +178,8 @@ public String toString() {
   public void copyOutputTo(OutputStream out) {
     process.copyOutputTo(out);
   }
+
+  public void checkForError() {
+    process.checkForError();
+  }
 }
diff --git a/java/client/src/org/openqa/selenium/os/ExecutableFinder.java b/java/client/src/org/openqa/selenium/os/ExecutableFinder.java
@@ -34,7 +34,7 @@
 
 class ExecutableFinder {
   private static final ImmutableSet<String> ENDINGS = Platform.getCurrent().is(WINDOWS) ?
-      ImmutableSet.of("", ".exe", ".com", ".bat") : ImmutableSet.of("");
+      ImmutableSet.of("", ".cmd", ".exe", ".com", ".bat") : ImmutableSet.of("");
 
   private static final Method JDK6_CAN_EXECUTE = findJdk6CanExecuteMethod();
 

diff --git a/java/client/src/org/openqa/selenium/os/OsProcess.java b/java/client/src/org/openqa/selenium/os/OsProcess.java
@@ -45,4 +45,6 @@ interface OsProcess {
   String getStdOut();
 
   boolean isRunning();
+
+  void checkForError();
 }
diff --git a/java/client/src/org/openqa/selenium/os/UnixProcess.java b/java/client/src/org/openqa/selenium/os/UnixProcess.java
@@ -161,6 +161,12 @@ public int getExitCode() {
     return handler.getExitValue();
   }
 
+  public void checkForError() {
+    if (handler.getException() != null) {
+      log.severe(handler.getException().toString());
+    }
+  }
+
   public String getStdOut() {
     if (isRunning()) {
       throw new IllegalStateException(

diff --git a/java/client/src/org/openqa/selenium/os/WindowsProcessGroup.java b/java/client/src/org/openqa/selenium/os/WindowsProcessGroup.java
@@ -161,6 +161,10 @@ public void waitFor(long timeout) throws InterruptedException {
 	    // no-op
 	  }
 
+  public void checkForError() {
+    // no-op
+  }
+
   public int destroy() {
     if (!isRunning()) {
       return 0; // Hard code the return value

diff --git a/java/client/src/org/openqa/selenium/remote/service/DriverService.java b/java/client/src/org/openqa/selenium/remote/service/DriverService.java
@@ -162,6 +162,7 @@ public void start() throws IOException {
       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();