summaryrefslogtreecommitdiff
path: root/test/openssl
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-15 15:00:52 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-15 15:00:52 +0000
commitc8c709ddfa6c8369346688193cb908d1e05c0902 (patch)
tree89bf9af7de4eb29b658d02598b75ac2f87538d5c /test/openssl
parentba3bb2895f6f8bc95cf2c12d157fcac0779c7f05 (diff)
* 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
Diffstat (limited to 'test/openssl')
-rw-r--r--test/openssl/test_pair.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb
index 7273554..17713c9 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