From 1fcb06ca26cddf35160693576541c6d786d52665 Mon Sep 17 00:00:00 2001 From: Jari Bakken Date: Wed, 28 May 2014 14:16:42 +0200 Subject: [PATCH] Make sure Ruby properly kills Firefox process if silent startup times out. Thanks to birtic for the patch. Fixes issue 7392. --- rb/CHANGES | 6 ++++++ rb/lib/selenium/webdriver/firefox/binary.rb | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/rb/CHANGES b/rb/CHANGES index 34f4a838cb763..b7f941a088903 100644 --- a/rb/CHANGES +++ b/rb/CHANGES @@ -1,3 +1,9 @@ +2.43.0 (???) +============ + +* Firefox + - Make sure browser process is properly killed if silent startup hangs (#7392) + 2.42.0 (2014-05-23) =================== diff --git a/rb/lib/selenium/webdriver/firefox/binary.rb b/rb/lib/selenium/webdriver/firefox/binary.rb index 932a371f22830..1894ab0029c28 100644 --- a/rb/lib/selenium/webdriver/firefox/binary.rb +++ b/rb/lib/selenium/webdriver/firefox/binary.rb @@ -44,7 +44,14 @@ def quit end def wait - @process.poll_for_exit(WAIT_TIMEOUT) if @process + return unless @process + + begin + @process.poll_for_exit(WAIT_TIMEOUT) + rescue ChildProcess::TimeoutError => e + @process.stop + raise e + end end private