1 files changed, 15 insertions, 1 deletions
diff --git a/test/test_timeout.rb b/test/test_timeout.rb
index 4c6065c232..9d51ca5be3 100644
--- a/test/test_timeout.rb
+++ b/test/test_timeout.rb
@@ -33,7 +33,7 @@ class TestTimeout < Test::Unit::TestCase
   def test_skip_rescue
     bug8730 = '[Bug #8730]'
     e = nil
-    assert_raise(Timeout::Error, bug8730) do
+    assert_raise_with_message(Timeout::Error, /execution expired/, bug8730) do
       timeout 0.1 do
         begin
           sleep 3
@@ -43,4 +43,18 @@ class TestTimeout < Test::Unit::TestCase
     end
     assert_nil(e, bug8730)
   end
+
+  def test_rescue_exit
+    exc = Class.new(RuntimeError)
+    e = nil
+    assert_nothing_raised(exc) do
+      timeout 0.1, exc do
+        begin
+          sleep 3
+        rescue exc => e
+        end
+      end
+    end
+    assert_raise_with_message(exc, /execution expired/) {raise e if e}
+  end
 end