1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
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> Mon Jun 30 23:01:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (RUBY_H_INCLUDES): common headers which are included with * common.mk (RUBY_H_INCLUDES): common headers which are included with

19
test/openssl/test_ssl.rb
View File

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