diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-14 23:11:36 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-14 23:11:36 +0000 |
commit | 4bcfc171823f85111be7374e95318901b8298f9a (patch) | |
tree | b6492a0e8e3f6ddbc830bb975c8b51aa4833f5e2 /test/ruby/test_thread.rb | |
parent | 3074406bbeaefbc7f90fe5dfd705d0d5249befc5 (diff) |
* test/ruby/test_thread.rb (test_uninitialized, test_backtrace,
test_thread_timer_and_interrupt, test_thread_join_in_trap,
test_thread_join_current, test_thread_join_main_thread,
test_main_thread_status_at_exit, test_thread_status_in_trap,
test_thread_status_raise_after_kill, test_mutex_owned,
test_mutex_owned2): move these tests from TestThreadGroup class
to TestThread becuase they are not thread group tests.
* test/ruby/test_thread.rb (test_thread_status_raise_after_kill):
add t.join.
* test/ruby/test_threadgroup.rb: new file. moved ThreadGroup test
form test_thread.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38388 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/test_thread.rb')
-rw-r--r-- | test/ruby/test_thread.rb | 72 |
1 files changed, 12 insertions, 60 deletions
diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index 71b400d421..f8b2868c08 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -704,58 +704,6 @@ class TestThread < Test::Unit::TestCase t.join _eom end -end - -class TestThreadGroup < Test::Unit::TestCase - def test_thread_init - thgrp = ThreadGroup.new - Thread.new{ - thgrp.add(Thread.current) - assert_equal(thgrp, Thread.new{sleep 1}.group) - }.join - end - - def test_frozen_thgroup - thgrp = ThreadGroup.new - - t = Thread.new{1} - Thread.new{ - thgrp.add(Thread.current) - thgrp.freeze - assert_raise(ThreadError) do - Thread.new{1}.join - end - assert_raise(ThreadError) do - thgrp.add(t) - end - assert_raise(ThreadError) do - ThreadGroup.new.add Thread.current - end - }.join - t.join - end - - def test_enclosed_thgroup - thgrp = ThreadGroup.new - assert_equal(false, thgrp.enclosed?) - - t = Thread.new{1} - Thread.new{ - thgrp.add(Thread.current) - thgrp.enclose - assert_equal(true, thgrp.enclosed?) - assert_nothing_raised do - Thread.new{1}.join - end - assert_raise(ThreadError) do - thgrp.add t - end - assert_raise(ThreadError) do - ThreadGroup.new.add Thread.current - end - }.join - t.join - end def test_uninitialized c = Class.new(Thread) @@ -871,23 +819,27 @@ Thread.new(Thread.current) {|mth| t = Thread.new { begin ary << Thread.current.status - sleep + sleep #1 ensure begin ary << Thread.current.status - sleep + sleep #2 ensure ary << Thread.current.status end end } - sleep 0.01 - t.kill - sleep 0.01 - t.raise - sleep 0.01 - assert_equal(ary, ["run", "aborting", "aborting"]) + begin + sleep 0.01 + t.kill # wake up sleep #1 + sleep 0.01 + t.raise "wakeup" # wake up sleep #2 + sleep 0.01 + assert_equal(ary, ["run", "aborting", "aborting"]) + ensure + t.join rescue nil + end end def test_mutex_owned |