diff --git a/rb/lib/selenium/webdriver/common/child_process.rb b/rb/lib/selenium/webdriver/common/child_process.rb index 41fd206616da6..e30f82b6b28e8 100644 --- a/rb/lib/selenium/webdriver/common/child_process.rb +++ b/rb/lib/selenium/webdriver/common/child_process.rb @@ -122,10 +122,14 @@ def terminate_and_wait_else_kill(timeout) def terminate(pid) Process.kill(SIGTERM, pid) + rescue Errno::ECHILD, Errno::ESRCH + # Process does not exist, nothing to terminate end def kill(pid) Process.kill(SIGKILL, pid) + rescue Errno::ECHILD, Errno::ESRCH + # Process does not exist, nothing to kill end def waitpid2(pid, flags = 0) diff --git a/rb/spec/unit/selenium/webdriver/common/child_process_spec.rb b/rb/spec/unit/selenium/webdriver/common/child_process_spec.rb new file mode 100644 index 0000000000000..fbec44b679ee1 --- /dev/null +++ b/rb/spec/unit/selenium/webdriver/common/child_process_spec.rb @@ -0,0 +1,54 @@ +# frozen_string_literal: true + +# Licensed to the Software Freedom Conservancy (SFC) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The SFC licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +require File.expand_path('../spec_helper', __dir__) + +module Selenium + module WebDriver + describe ChildProcess do + unless Selenium::WebDriver::Platform.windows? + it 'does not raise an error when terminating a non-existent process' do + process = described_class.new('sleep', '5') + process.start + + pid = process.instance_variable_get(:@pid) + Process.kill('KILL', pid) + Process.wait(pid) + + expect { + process.send(:terminate, pid) + }.not_to raise_error + end + + it 'does not raise an error when killing a non-existent process' do + process = described_class.new('sleep', '5') + process.start + + pid = process.instance_variable_get(:@pid) + Process.kill('KILL', pid) + Process.wait(pid) + + expect { + process.send(:kill, pid) + }.not_to raise_error + end + end + end + end +end