From 501afa013498079ba8d2bd047e86430fe17d2325 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 26 May 2014 05:01:33 +0000
Subject: test/thread: fix leaked threads

* test/thread/test_{queue,sync}.rb: join work threads not to leak
  threads.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46130 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/thread/test_queue.rb | 9 +++++++++
 test/thread/test_sync.rb  | 6 ++++++
 2 files changed, 15 insertions(+)

diff --git a/test/thread/test_queue.rb b/test/thread/test_queue.rb
index cda76ce61c..e1ead47197 100644
--- a/test/thread/test_queue.rb
+++ b/test/thread/test_queue.rb
@@ -62,6 +62,8 @@ class TestQueue < Test::Unit::TestCase
     sleep 0.01 until t1.stop?
     q.max = q.max + 1
     assert_equal before + 1, q.max
+  ensure
+    t1.join if t1
   end
 
   def test_queue_pop_interrupt
@@ -206,6 +208,13 @@ class TestQueue < Test::Unit::TestCase
     assert_nothing_raised(TimeoutError) do
       timeout(1) { th2.join }
     end
+  ensure
+    [th1, th2].each do |th|
+      if th and th.alive?
+        th.wakeup
+        th.join
+      end
+    end
   end
 
   def test_dup
diff --git a/test/thread/test_sync.rb b/test/thread/test_sync.rb
index 870a8e2d39..9509cac6c7 100644
--- a/test/thread/test_sync.rb
+++ b/test/thread/test_sync.rb
@@ -19,6 +19,9 @@ class SyncTest < Test::Unit::TestCase
     sleep 0.1 until t.stop?
 
     assert_equal(tester.sync_waiting.uniq, tester.sync_waiting)
+  ensure
+    t.kill
+    t.join
   end
 
   def test_sync_upgrade_and_wakeup
@@ -39,6 +42,9 @@ class SyncTest < Test::Unit::TestCase
     }
     assert_equal(tester.sync_waiting.uniq, tester.sync_waiting)
     assert_equal(tester.sync_waiting, [])
+  ensure
+    t.kill
+    t.join
   end
 
   def test_sync_lock_and_raise
-- 
cgit v1.2.3