WindowsUtils.kill() fix #10
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
|
Tried on Windows 7 too, the same issue seem to exist there. The unit test I added fails there without the fix and passes with it. |
|
Forgot to mention, I have signed the CLA. |
In some cases the process list will not have a binary prefixed with the full path, thus the regexp fails as it alwasy expect a \. This makes the \ optional.
| @@ -73,6 +74,19 @@ public void testTaskKill() { | |||
| assertFalse("taskkill should be found", "taskkill".equals(WindowsUtils.findTaskKill())); | |||
| } | |||
|
|
|||
| private void tryKill(String[] cmd) throws Exception { | |||
|
Rebased and fixed up the patch, signed off, and commited: b0c2b26 |
| pattern.append("\"?"); | ||
| for (String arg : cmdarray) { | ||
| for (int i = 1; i < cmdarray.length; i++) { |
There was a problem hiding this comment.
Why change this from a foreach? I can't see it gaining anything here and code styles shouldn't change just for the sake of it.
There was a problem hiding this comment.
The reason was to iterate from 1 instead of 0, see the commit comment.
There was a problem hiding this comment.
Ahh, I completely missed that. Thanks. I assumed I was missing something, but I couldn't figure out what.
IlyaNaumovich
added a commit
to IlyaNaumovich/selenium
that referenced
this pull request
Feb 11, 2018
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
On Windows 8 the kill() function did not correctly locate
the process in the list. There were two issues:
the iteration over the arguments to not include the executable again.
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.
Note, I only tried this on Windows 8 so far so it's quite possible it breaks other versions - and I don't know if this is the right approach at all. Creating this for request for comments.