aboutsummaryrefslogtreecommitdiffstats
path: root/test/openssl/test_ssl_session.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/test_ssl_session.rb
parentf4b417eb43468630cf4591c1768bc0c3b1378bcd (diff)
downloadruby-3ec72f078c207f53348809d304ba37ba5f915629.tar.gz
* 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/test_ssl_session.rb')
-rw-r--r--test/openssl/test_ssl_session.rb11
1 files changed, 7 insertions, 4 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