Merge branch 'SeleniumHQ:trunk' into py-service-args-properties

Author: cgoldberg

common/repositories.bzl

@@ -50,8 +50,8 @@ js_library(
 
     http_archive(
         name = "linux_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/140.0b7/linux-x86_64/en-US/firefox-140.0b7.tar.xz",
-        sha256 = "a6e232e676e9b1490d673745da8221614e7cab68ed73003e41d6a07d91062af8",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/140.0b8/linux-x86_64/en-US/firefox-140.0b8.tar.xz",
+        sha256 = "1fa8bcb1e242ffbad091b3ee7067ece582d34508db394e656832ab07b058e96e",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
 
     dmg_archive(
         name = "mac_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/140.0b7/mac/en-US/Firefox%20140.0b7.dmg",
-        sha256 = "24a756a979ef4c23e223002e8cb748ad69236f023f0ba0168d98add4f5d0cb8e",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/140.0b8/mac/en-US/Firefox%20140.0b8.dmg",
+        sha256 = "7e648f5e0305a6abedb698ea5b29971cd1eb58225b998baa85a82d94bcf75342",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])

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)

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