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

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