From 3afe772e014cce820fc0bc300cc08715eb4c24f1 Mon Sep 17 00:00:00 2001 From: nagachika Date: Mon, 5 Oct 2015 14:23:54 +0000 Subject: * test/ruby/test_thread.rb (test_handle_interrupt_blocking): check if exception handling was postponed until sleep. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/ruby/test_thread.rb | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 89bc7e2480..597d5fcb47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 5 23:08:17 2015 CHIKANAGA Tomoyuki + + * test/ruby/test_thread.rb (test_handle_interrupt_blocking): check if + exception handling was postponed until sleep. + Mon Oct 5 22:25:49 2015 Tanaka Akira * lib/pp.rb: Use frozen_string_literal: true. diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index e60da4f120..ddbbaf2c63 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -637,15 +637,16 @@ class TestThread < Test::Unit::TestCase th = Thread.start{ Thread.handle_interrupt(Object => :on_blocking){ begin - sleep 0.0001 until r == :ok + sleep 0.0001 until r == :wait Thread.current.raise RuntimeError + r = :ok sleep ensure th_s.raise e, "raise from ensure", $@ end } } - assert_raise(e) {r = :ok; sleep 1} + assert_raise(e) {r = :wait; sleep 1} ensure assert_raise(RuntimeError) {th.join(0)} end -- cgit v1.2.3