diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/drb/drbtest.rb | 4 | ||||
| -rw-r--r-- | test/ruby/test_readpartial.rb | 4 | ||||
| -rw-r--r-- | test/thread/test_queue.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb index 4f12db5003..da44a96baa 100644 --- a/test/drb/drbtest.rb +++ b/test/drb/drbtest.rb @@ -190,10 +190,10 @@ module DRbCore def test_06_timeout ten = Onecky.new(10) - assert_raise(TimeoutError) do + assert_raise(Timeout::Error) do @there.do_timeout(ten) end - assert_raise(TimeoutError) do + assert_raise(Timeout::Error) do @there.do_timeout(ten) end end diff --git a/test/ruby/test_readpartial.rb b/test/ruby/test_readpartial.rb index b969c38692..7f2ec65ac7 100644 --- a/test/ruby/test_readpartial.rb +++ b/test/ruby/test_readpartial.rb @@ -50,7 +50,7 @@ class TestReadPartial < Test::Unit::TestCase w << 'abc' assert_equal('ab', r.readpartial(2)) assert_equal('c', r.readpartial(2)) - assert_raise(TimeoutError) { + assert_raise(Timeout::Error) { timeout(0.1) { r.readpartial(2) } } } @@ -64,7 +64,7 @@ class TestReadPartial < Test::Unit::TestCase assert_equal("de", r.readpartial(2)) assert_equal("f\n", r.readpartial(4096)) assert_equal("ghi\n", r.readpartial(4096)) - assert_raise(TimeoutError) { + assert_raise(Timeout::Error) { timeout(0.1) { r.readpartial(2) } } } diff --git a/test/thread/test_queue.rb b/test/thread/test_queue.rb index 6a3397734a..4f495ccb8c 100644 --- a/test/thread/test_queue.rb +++ b/test/thread/test_queue.rb @@ -239,7 +239,7 @@ class TestQueue < Test::Unit::TestCase th1.raise sleep 0.1 q << :s - assert_nothing_raised(TimeoutError) do + assert_nothing_raised(Timeout::Error) do timeout(1) { th2.join } end ensure |