summaryrefslogtreecommitdiff
path: root/test/openssl/utils.rb
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-01 14:12:11 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-01 14:12:11 +0000
commit3ec72f078c207f53348809d304ba37ba5f915629 (patch)
tree5ce4b0d283cf6b75ea34bad53738acedb600ac6f /test/openssl/utils.rb
parentf4b417eb43468630cf4591c1768bc0c3b1378bcd (diff)
* test/openssl/utils.rb (start_server): Don't close sockets before
threads finished. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48227 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/openssl/utils.rb')
-rw-r--r--test/openssl/utils.rb33
1 files changed, 18 insertions, 15 deletions
diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb
index e3240a0d1e7..f878845354c 100644
--- a/test/openssl/utils.rb
+++ b/test/openssl/utils.rb
@@ -299,28 +299,31 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx)
ssls.start_immediately = start_immediately
- server = Thread.new do
- server_loop(ctx, ssls, stop_pipe_r, ignore_ssl_accept_error, server_proc, threads)
- end
- threads.unshift server
+ begin
+ server = Thread.new do
+ server_loop(ctx, ssls, stop_pipe_r, ignore_ssl_accept_error, server_proc, threads)
+ end
+ threads.unshift server
- $stderr.printf("%s started: pid=%d port=%d\n", SSL_SERVER, $$, port) if $DEBUG
+ $stderr.printf("%s started: pid=%d port=%d\n", SSL_SERVER, $$, port) if $DEBUG
- th = Thread.new do
+ th = Thread.new do
+ begin
+ block.call(server, port.to_i)
+ ensure
+ stop_pipe_w.close
+ end
+ end
begin
- block.call(server, port.to_i)
- ensure
- stop_pipe_w.close
+ th.join
+ rescue Exception
+ threads.unshift th
end
- end
- begin
- th.join
- rescue Exception
- threads.unshift th
+ ensure
+ assert_join_threads(threads)
end
ensure
tcps.close if tcps
- assert_join_threads(threads)
end
}
end