diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-29 12:45:32 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-29 12:45:32 +0000 |
| commit | b729e9278fcf79628bb61107b2deebed6a7c834e (patch) | |
| tree | fb478533f3d3148bb6747ffa46c7100982513885 /test/openssl | |
| parent | 621bf532fc700b4abb97e9aa4c40fa9c5d3b800e (diff) | |
test_pair.rb: thread leak
* test/openssl/test_pair.rb (test_ecdh_callback): join client
thread before closing sockets.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51434 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/openssl')
| -rw-r--r-- | test/openssl/test_pair.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb index 5bf74e596d..588098c668 100644 --- a/test/openssl/test_pair.rb +++ b/test/openssl/test_pair.rb @@ -301,6 +301,7 @@ module OpenSSL::TestPairM assert_equal s1, t.value assert accept ensure + t.join s1.close if s1 s2.close if s2 sock1.close if sock1 @@ -324,6 +325,7 @@ module OpenSSL::TestPairM assert_equal s1, t.value assert accept ensure + t.join s1.close if s1 s2.close if s2 sock1.close if sock1 @@ -363,12 +365,12 @@ module OpenSSL::TestPairM assert called, 'ecdh callback should be called' ensure + th.join s1.close if s1 s2.close if s2 sock1.close if sock1 sock2.close if sock2 accepted.close if accepted.respond_to?(:close) - th.join rescue nil end def test_connect_accept_nonblock_no_exception @@ -411,6 +413,7 @@ module OpenSSL::TestPairM assert_includes([s1, :wait_readable, :wait_writable ], rv) end ensure + th.join s1.close if s1 s2.close if s2 sock1.close if sock1 |