WindowsUtils.kill() fix

On Windows 8 the kill() function did not correctly locate
the process in the list. There were two issues:

* The executable name in the regexp was duplicated. This patch changed
  the iteration over the arguments to not include the executable again.

* If the process was started without using .exe in the name kill()
  could not find it as the regexp did not have the .exe there. This patch
  adds .exe if not already present as an optional match.

Signed-off-by: Andreas Tolf Tolfsen <[email protected]>

Author: Zitrax

java/client/src/org/openqa/selenium/os/WindowsUtils.java

@@ -109,18 +109,22 @@ public static void kill(String[] cmdarray) throws Exception {
      * quote (\"?)
      */
     // TODO We should be careful, in case Windows has ~1-ified the executable name as well
-    pattern.append("\"?.*?\\\\");
-    pattern.append(executable.getName());
+    pattern.append("(\"?.*?\\\\)?");
+    String execName = executable.getName();
+    pattern.append(execName);
+    if (!execName.endsWith(".exe")) {
+      pattern.append("(\\.exe)?");
+    }
     pattern.append("\"?");
-    for (String arg : cmdarray) {
+    for (int i = 1; i < cmdarray.length; i++) {
       /*
        * There may be a space, but maybe not (\\s?), may be a quote or maybe not (\"?), but then
        * turn on block quotation (as if *everything* had a regex backslash in front of it) with \Q.
        * Then look for the next argument (which may have ?s, \s, "s, who knows), turning off block
        * quotation. Now ignore a final quote if any (\"?)
        */
       pattern.append("\\s?\"?\\Q");
-      pattern.append(arg);
+      pattern.append(cmdarray[i]);
       pattern.append("\\E\"?");
     }
     pattern.append("\\s*");

java/client/test/org/openqa/selenium/os/WindowsUtilsUnitTest.java

@@ -25,6 +25,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.Arrays;
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -73,6 +74,20 @@ public void testTaskKill() {
     assertFalse("taskkill should be found", "taskkill".equals(WindowsUtils.findTaskKill()));
   }
 
+  private void tryKill(String... cmd) throws Exception {
+    CommandLine cl = new CommandLine(cmd);
+    cl.executeAsync();
+    WindowsUtils.kill(cmd);
+    assertFalse("Should be able to kill " + Arrays.toString(cmd), cl.isRunning());
+  }
+
+  @Test
+  public void testKill() throws Exception {
+    if (!WindowsUtils.thisIsWindows()) return;
+    tryKill(new String[]{"sleep.exe", "10"});
+    tryKill(new String[]{"sleep", "10"});
+  }
+
   @Test
   public void testRegistry() {
     if (!WindowsUtils.thisIsWindows()) return;