Make sure Ruby properly kills Firefox process if silent startup times…

… out. Thanks to birtic for the patch. Fixes issue 7392.
SeleniumHQ · May 28, 2014 · 1fcb06c · 1fcb06c
1 parent 6a7bb83
commit 1fcb06c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git 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
@@ -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