mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* test/openssl/test_ssl.rb (server_loop): rescue Errno::EINVAL and
Errno::ECONNABORTED. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18234 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
99c3a01dc7
commit
787cde7f9a
2 changed files with 7 additions and 3 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Sun Jul 27 23:32:42 2008 Yusuke Endoh <mame@tsg.ne.jp>
|
||||||
|
|
||||||
|
* test/openssl/test_ssl.rb (server_loop): rescue Errno::EINVAL and
|
||||||
|
Errno::ECONNABORTED.
|
||||||
|
|
||||||
Sun Jul 27 22:11:57 2008 NARUSE, Yui <naruse@ruby-lang.org>
|
Sun Jul 27 22:11:57 2008 NARUSE, Yui <naruse@ruby-lang.org>
|
||||||
|
|
||||||
* bootstraptests/method.rb: increase RLIMIT_STACK size to 4M+8Kbytes
|
* bootstraptests/method.rb: increase RLIMIT_STACK size to 4M+8Kbytes
|
||||||
|
|
|
@ -86,7 +86,7 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
|
||||||
server_proc.call(ctx, ssl)
|
server_proc.call(ctx, ssl)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
rescue Errno::EBADF, IOError
|
rescue Errno::EBADF, IOError, Errno::EINVAL, Errno::ECONNABORTED
|
||||||
end
|
end
|
||||||
|
|
||||||
def start_server(port0, verify_mode, start_immediately, args = {}, &block)
|
def start_server(port0, verify_mode, start_immediately, args = {}, &block)
|
||||||
|
@ -128,8 +128,8 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
|
||||||
|
|
||||||
block.call(server, port.to_i)
|
block.call(server, port.to_i)
|
||||||
ensure
|
ensure
|
||||||
tcps.shutdown if (tcps)
|
|
||||||
begin
|
begin
|
||||||
|
tcps.shutdown if (tcps)
|
||||||
if (server)
|
if (server)
|
||||||
server.join(5)
|
server.join(5)
|
||||||
if server.alive?
|
if server.alive?
|
||||||
|
@ -138,7 +138,6 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
|
||||||
flunk("TCPServer was closed and SSLServer is still alive") unless $!
|
flunk("TCPServer was closed and SSLServer is still alive") unless $!
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
rescue Errno::EINVAL, Errno::EBADF
|
|
||||||
ensure
|
ensure
|
||||||
tcps.close if (tcps)
|
tcps.close if (tcps)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue