diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-28 18:58:34 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-28 18:58:34 +0000 |
commit | 1b289bdd97e71f0a4584ed0d5f0bc50e95d1cc48 (patch) | |
tree | b366d206c591d6fb6235349e4d992bb3280f6fa8 | |
parent | 661587f2664ec81c5bac98f9a3624b2114e983be (diff) | |
download | ruby-1b289bdd97e71f0a4584ed0d5f0bc50e95d1cc48.tar.gz |
thread may leak if assert fails before join is finished
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52330 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/ruby/test_thread.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index ddbbaf2c63..48a6bd2e38 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -637,7 +637,7 @@ class TestThread < Test::Unit::TestCase th = Thread.start{ Thread.handle_interrupt(Object => :on_blocking){ begin - sleep 0.0001 until r == :wait + Thread.pass until r == :wait Thread.current.raise RuntimeError r = :ok sleep @@ -647,8 +647,9 @@ class TestThread < Test::Unit::TestCase } } assert_raise(e) {r = :wait; sleep 1} - ensure assert_raise(RuntimeError) {th.join(0)} + ensure + th.kill end assert_equal(:ok,r) end |