diff options
Diffstat (limited to 'test/openssl')
-rw-r--r-- | test/openssl/test_ssl_session.rb | 11 | ||||
-rw-r--r-- | test/openssl/utils.rb | 33 |
2 files changed, 25 insertions, 19 deletions
diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb index 8e12105dc3..91b7455f56 100644 --- a/test/openssl/test_ssl_session.rb +++ b/test/openssl/test_ssl_session.rb @@ -32,11 +32,14 @@ tddwpBAEDjcwMzA5NTYzMTU1MzAwpQMCARM= ctx.session_id_context = self.object_id.to_s sock = TCPSocket.new '127.0.0.1', port - ssl = OpenSSL::SSL::SSLSocket.new sock, ctx - ssl.session = session + begin + ssl = OpenSSL::SSL::SSLSocket.new sock, ctx + ssl.session = session - assert_equal session, ssl.session - sock.close + assert_equal session, ssl.session + ensure + sock.close + end } end diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb index e3240a0d1e..f878845354 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 |