From 9f5537c5b39b230360af793977d9ddb5b539f4de Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 7 Jan 2014 03:42:37 +0000 Subject: timeout.rb: defer creating custom exception * lib/timeout.rb (Timeout#timeout): when a custom exception is given, no instance is needed to be caught, so defer creating new instance until it is raised. [ruby-core:59511] [Bug #9354] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44517 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/test_timeout.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'test/test_timeout.rb') diff --git a/test/test_timeout.rb b/test/test_timeout.rb index 71edc65c51..08885cd54f 100644 --- a/test/test_timeout.rb +++ b/test/test_timeout.rb @@ -57,4 +57,14 @@ class TestTimeout < Test::Unit::TestCase end assert_raise_with_message(exc, /execution expired/) {raise e if e} end + + def test_custom_exception + bug9354 = '[ruby-core:59511] [Bug #9354]' + err = Class.new(StandardError) do + def initialize(msg) super end + end + assert_nothing_raised(ArgumentError, bug9354) do + assert_equal(:ok, timeout(100, err) {:ok}) + end + end end -- cgit v1.2.3