1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* test/openssl/test_ssl.rb (start_server): shutdown TCPServer before

close.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17747 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2008-06-30 14:15:48 +00:00
parent 895c7cb3c4
commit 3ac2c3472a
2 changed files with 17 additions and 7 deletions

View file

@ -1,3 +1,8 @@
Mon Jun 30 23:15:07 2008 Yusuke Endoh <mame@tsg.ne.jp>
* test/openssl/test_ssl.rb (start_server): shutdown TCPServer before
close.
Mon Jun 30 23:01:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (RUBY_H_INCLUDES): common headers which are included with

View file

@ -128,14 +128,19 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
block.call(server, port.to_i)
ensure
tcps.close if (tcps)
if (server)
server.join(5)
if server.alive?
server.kill
server.join
flunk("TCPServer was closed and SSLServer is still alive") unless $!
tcps.shutdown if (tcps)
begin
if (server)
server.join(5)
if server.alive?
server.kill
server.join
flunk("TCPServer was closed and SSLServer is still alive") unless $!
end
end
rescue Errno::EINVAL, Errno::EBADF
ensure
tcps.close if (tcps)
end
end
end