archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 18:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* lib/net/http.rb: Retry HTTP requests for additional network errors.

Browse source 
Introduce OpenTimeout subclass of Timeout::Error.  [Bug #6001]
	* test/net/http/test_http.rb:  Reduce timeout to 0.01s for faster test
	* test/net/http/test_https.rb:  ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34842 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2012-02-28 04:51:37 +00:00
parent 1c85a648fe
commit 8a7da58c0f
4 changed files with 35 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
test/net/http/test_http.rb
View file

@ -195,13 +195,13 @@ module TestNetHTTP_version_1_1_methods
def test_timeout_during_HTTP_session
bug4246 = "expected the HTTP session to have timed out but have not. c.f. [ruby-core:34203]"
# listen for connections... but deliberately do not complete SSL handshake
# listen for connections... but deliberately do not read
TCPServer.open('localhost', 0) {|server|
port = server.addr[1]
conn = Net::HTTP.new('localhost', port)
conn.read_timeout = 1
conn.open_timeout = 1
conn.read_timeout = 0.01
conn.open_timeout = 0.01
th = Thread.new do
assert_raise(Timeout::Error) {
@ -598,21 +598,19 @@ class TestNetHTTPKeepAlive < Test::Unit::TestCase
assert_kind_of Net::HTTPResponse, res
assert_kind_of String, res.body
sleep 1.5
assert_nothing_raised {
res = http.get('/')
}
res = http.get('/')
assert_kind_of Net::HTTPResponse, res
assert_kind_of String, res.body
}
end
def test_keep_alive_EOF
def test_keep_alive_server_close
def @server.run(sock)
sock.close
end
start {|http|
assert_raises(EOFError,Errno::ECONNRESET) {
assert_raises(EOFError, Errno::ECONNRESET, IOError) {
res = http.get('/')
}
}

6
test/net/http/test_https.rb
View file

@ -115,11 +115,11 @@ class TestNetHTTPS < Test::Unit::TestCase
conn = Net::HTTP.new('localhost', port)
conn.use_ssl = true
conn.read_timeout = 1
conn.open_timeout = 1
conn.read_timeout = 0.01
conn.open_timeout = 0.01
th = Thread.new do
assert_raise(Timeout::Error) {
assert_raise(Net::HTTP::OpenTimeout) {
conn.get('/')
}
end