From d481e34e3c1a69b4c2142d2e7ac64ff2f962efe4 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 31 Mar 2012 00:48:56 +0000
Subject: misplaced rescue

* test/ruby/test_thread.rb (test_condvar_wait_deadlock_2): fix cleanup
  code which is never executed because of misplaced rescue.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35187 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_thread.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb
index d5386c0cbe..8a3286871c 100644
--- a/test/ruby/test_thread.rb
+++ b/test/ruby/test_thread.rb
@@ -158,8 +158,9 @@ class TestThread < Test::Unit::TestCase
     assert_raise(Timeout::Error) do
       Timeout.timeout(0.1) { condvar.wait mutex }
     end
-    mutex.unlock rescue
-    threads[i].each.join
+    mutex.unlock
+    threads.each(&:kill)
+    threads.each(&:join)
   end
 
   def test_condvar_timed_wait
-- 
cgit v1.2.3