diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | test/ruby/test_thread.rb | 22 |
2 files changed, 16 insertions, 11 deletions
@@ -1,3 +1,8 @@ +Wed Nov 28 22:20:55 2012 Masaya Tarui <tarui@ruby-lang.org> + + * test/ruby/test_thread.rb (test_thread_status_in_trap): change test for + thread status in trap. now can accept Thread#join and Thread#value in trap. + Wed Nov 28 21:58:47 2012 Koichi Sasada <ko1@atdot.net> * include/ruby/thread.h (rb_thread_call_without_gvl2): change diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index 45f389b0fa..dfad5f6b34 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -857,7 +857,7 @@ class TestThreadGroup < Test::Unit::TestCase end def test_thread_join_in_trap - assert_raise(ThreadError) { + assert_nothing_raised{ t = Thread.new{ sleep 0.2; Process.kill(:INT, $$) } Signal.trap :INT do @@ -867,16 +867,16 @@ class TestThreadGroup < Test::Unit::TestCase t.join } - assert_raise(ThreadError) { - t = Thread.new{ sleep 0.2; Process.kill(:INT, $$) } - - Signal.trap :INT do - t.value - end - - t.value - } - + assert_equal(:normal_end, + begin + t = Thread.new{ sleep 0.2; Process.kill(:INT, $$); :normal_end } + + Signal.trap :INT do + t.value + end + t.value + end + ) end def test_thread_join_current |