Skip to content

Commit e6f52ce

Browse files
aguspetitusfortner
andauthored
[rb] Fix child process terminate method when a process is already terminated (#15789)
* [build] allow tests tagged exclusive-if-local to run on rbe * Add rescue and test for child_process terminate method * Add rescue for kill method * guard against windows * guard against windows * move child process test * remove guard * Update test * add windows guard * add windows guard --------- Co-authored-by: titusfortner <[email protected]>
1 parent c65425f commit e6f52ce

File tree

2 files changed

+58
-0
lines changed

2 files changed

+58
-0
lines changed

rb/lib/selenium/webdriver/common/child_process.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,14 @@ def terminate_and_wait_else_kill(timeout)
122122

123123
def terminate(pid)
124124
Process.kill(SIGTERM, pid)
125+
rescue Errno::ECHILD, Errno::ESRCH
126+
# Process does not exist, nothing to terminate
125127
end
126128

127129
def kill(pid)
128130
Process.kill(SIGKILL, pid)
131+
rescue Errno::ECHILD, Errno::ESRCH
132+
# Process does not exist, nothing to kill
129133
end
130134

131135
def waitpid2(pid, flags = 0)
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# frozen_string_literal: true
2+
3+
# Licensed to the Software Freedom Conservancy (SFC) under one
4+
# or more contributor license agreements. See the NOTICE file
5+
# distributed with this work for additional information
6+
# regarding copyright ownership. The SFC licenses this file
7+
# to you under the Apache License, Version 2.0 (the
8+
# "License"); you may not use this file except in compliance
9+
# with the License. You may obtain a copy of the License at
10+
#
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing,
14+
# software distributed under the License is distributed on an
15+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
# KIND, either express or implied. See the License for the
17+
# specific language governing permissions and limitations
18+
# under the License.
19+
20+
require File.expand_path('../spec_helper', __dir__)
21+
22+
module Selenium
23+
module WebDriver
24+
describe ChildProcess do
25+
unless Selenium::WebDriver::Platform.windows?
26+
it 'does not raise an error when terminating a non-existent process' do
27+
process = described_class.new('sleep', '5')
28+
process.start
29+
30+
pid = process.instance_variable_get(:@pid)
31+
Process.kill('KILL', pid)
32+
Process.wait(pid)
33+
34+
expect {
35+
process.send(:terminate, pid)
36+
}.not_to raise_error
37+
end
38+
39+
it 'does not raise an error when killing a non-existent process' do
40+
process = described_class.new('sleep', '5')
41+
process.start
42+
43+
pid = process.instance_variable_get(:@pid)
44+
Process.kill('KILL', pid)
45+
Process.wait(pid)
46+
47+
expect {
48+
process.send(:kill, pid)
49+
}.not_to raise_error
50+
end
51+
end
52+
end
53+
end
54+
end

0 commit comments

Comments
 (0)