summaryrefslogtreecommitdiff
path: root/test/openssl/utils.rb
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-29 10:32:19 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-29 10:32:19 +0000
commit68ac33a511929268ff5b0e05601b855a3a031b31 (patch)
tree561b4ea925c0554b2b428804a5a9f56e0f94cd8f /test/openssl/utils.rb
parentc65ef1539bf765a2a8185b51e0ca4ee98a42c517 (diff)
* ext/openssl/lib/openssl/ssl.rb (SSLServer#accept): Close a socket
if any exception occur. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/openssl/utils.rb')
-rw-r--r--test/openssl/utils.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb
index f4509f2980a..4df14056e4a 100644
--- a/test/openssl/utils.rb
+++ b/test/openssl/utils.rb
@@ -311,7 +311,6 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
if (server)
server.join(5)
if server.alive?
- server.kill
server.join
flunk("TCPServer was closed and SSLServer is still alive") unless $!
end
@@ -322,7 +321,6 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
end
ensure
threads.each {|th|
- th.kill
th.join
}
end