From 0d942bcd55a897101aa921f45a9b1feeb3f761dc Mon Sep 17 00:00:00 2001
From: Ben Sedat <bsedat@tinfoilsecurity.com>
Date: Mon, 22 Feb 2016 15:59:10 -0800
Subject: [PATCH] Ensure that the browser process is stopped in the exit
 handler.

Signed-off-by: Titus Fortner <titusfortner@gmail.com>
---
 rb/lib/selenium/webdriver/chrome/service.rb    | 2 +-
 rb/lib/selenium/webdriver/edge/service.rb      | 2 +-
 rb/lib/selenium/webdriver/firefox/service.rb   | 2 +-
 rb/lib/selenium/webdriver/phantomjs/service.rb | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rb/lib/selenium/webdriver/chrome/service.rb b/rb/lib/selenium/webdriver/chrome/service.rb
index 77974bda5da99..8a689c95ae8bf 100644
--- a/rb/lib/selenium/webdriver/chrome/service.rb
+++ b/rb/lib/selenium/webdriver/chrome/service.rb
@@ -83,7 +83,7 @@ def stop
 
           @process.poll_for_exit STOP_TIMEOUT
         rescue ChildProcess::TimeoutError
-          # ok, force quit
+        ensure
           @process.stop STOP_TIMEOUT
         end
 
diff --git a/rb/lib/selenium/webdriver/edge/service.rb b/rb/lib/selenium/webdriver/edge/service.rb
index 21cf8b2038bcc..f30eb4d1eadd0 100644
--- a/rb/lib/selenium/webdriver/edge/service.rb
+++ b/rb/lib/selenium/webdriver/edge/service.rb
@@ -83,7 +83,7 @@ def stop
 
           @process.poll_for_exit STOP_TIMEOUT
         rescue ChildProcess::TimeoutError
-          # ok, force quit
+        ensure
           @process.stop STOP_TIMEOUT
         end
 
diff --git a/rb/lib/selenium/webdriver/firefox/service.rb b/rb/lib/selenium/webdriver/firefox/service.rb
index 0ec734ef91ea0..fca16979ae9b6 100644
--- a/rb/lib/selenium/webdriver/firefox/service.rb
+++ b/rb/lib/selenium/webdriver/firefox/service.rb
@@ -82,7 +82,7 @@ def stop
 
           @process.poll_for_exit STOP_TIMEOUT
         rescue ChildProcess::TimeoutError
-          # ok, force quit
+        ensure
           @process.stop STOP_TIMEOUT
         end
 
diff --git a/rb/lib/selenium/webdriver/phantomjs/service.rb b/rb/lib/selenium/webdriver/phantomjs/service.rb
index b6e3e8ea4bbb6..c753aa2d3186a 100644
--- a/rb/lib/selenium/webdriver/phantomjs/service.rb
+++ b/rb/lib/selenium/webdriver/phantomjs/service.rb
@@ -78,7 +78,7 @@ def stop
 
           @process.poll_for_exit STOP_TIMEOUT
         rescue ChildProcess::TimeoutError
-          # ok, force quit
+        ensure
           @process.stop STOP_TIMEOUT
 
           if Platform.jruby? && !$DEBUG