diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-15 15:00:52 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-15 15:00:52 +0000 |
| commit | c8c709ddfa6c8369346688193cb908d1e05c0902 (patch) | |
| tree | 89bf9af7de4eb29b658d02598b75ac2f87538d5c | |
| parent | ba3bb2895f6f8bc95cf2c12d157fcac0779c7f05 (diff) | |
| download | ruby-c8c709ddfa6c8369346688193cb908d1e05c0902.tar.gz | |
* 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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/openssl/test_pair.rb | 5 |
2 files changed, 10 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Sat Dec 15 23:58:46 2007 Tanaka Akira <akr@fsij.org> + + * test/openssl/test_pair.rb (SSLPair#ssl_pair): join the thread, even + on an error. + Sat Dec 15 23:50:31 2007 Tanaka Akira <akr@fsij.org> * 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 |