diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-07 05:04:02 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-07 05:04:02 +0000 |
| commit | 08f0db2c68a9e306f3a637e9d32d9e7b8b1f2e92 (patch) | |
| tree | f62afb5ed192f0bd674762fb6063c4a224649b9f /test/test_timeout.rb | |
| parent | 9dd64b6053685a4db7d4e60d16b0fc090384dae0 (diff) | |
| download | ruby-08f0db2c68a9e306f3a637e9d32d9e7b8b1f2e92.tar.gz | |
timeout.rb: replace deferred exception after async_interrupt_timing
* lib/timeout.rb (Timeout#timeout): since async_interrupt_timing
re-raises a deferred exception, replace the timeout exception with
Timeout::Error after it. [Bug #7503]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38255 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/test_timeout.rb')
| -rw-r--r-- | test/test_timeout.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/test_timeout.rb b/test/test_timeout.rb index dcd6206737..e9984946e5 100644 --- a/test/test_timeout.rb +++ b/test/test_timeout.rb @@ -62,7 +62,8 @@ class TestTimeout < Test::Unit::TestCase } sleep 0.5 t.raise RuntimeError - assert_raise(RuntimeError) { + assert_raise(Timeout::Error) { + # deferred interrupt should raise t.join } ensure |