From c8c709ddfa6c8369346688193cb908d1e05c0902 Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 15 Dec 2007 15:00:52 +0000 Subject: * test/openssl/test_pair.rb (SSLPair#ssl_pair): join the thread, even on an error. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14246 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/openssl/test_pair.rb | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8b955e212e..16398dc209 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Dec 15 23:58:46 2007 Tanaka Akira + + * test/openssl/test_pair.rb (SSLPair#ssl_pair): join the thread, even + on an error. + Sat Dec 15 23:50:31 2007 Tanaka Akira * test/xmlrpc/webrick_testing.rb: join webrick server thread. diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb index 7273554362..17713c9988 100644 --- a/test/openssl/test_pair.rb +++ b/test/openssl/test_pair.rb @@ -54,6 +54,11 @@ module SSLPair else return c, s end + ensure + if th && th.alive? + th.kill + th.join + end end end -- cgit v1.2.3