diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-11 21:20:51 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-11 21:20:51 +0000 |
commit | ea9b6997cc8bcb70ea82cb0535d1a4b5a5fd5508 (patch) | |
tree | 653d33c610a24bf88158e7cc899e3b366a8a46d1 /test/net/http | |
parent | 8c5c5a221f3bd3b0bdf6304b924630c35c7f8631 (diff) | |
download | ruby-ea9b6997cc8bcb70ea82cb0535d1a4b5a5fd5508.tar.gz |
* lib/net/protocol.rb (module Net): Added ReadTimeout to match
OpenTimeout. ReadTimeout is now raised by rbuf_fill instead of
Timeout::Error to help users distinguish what type of timeout
occurred. [ruby-trunk - Feature #6088]
* lib/net/pop.rb (module Net): Updated documentation for ReadTimeout
and OpenTimeout.
* lib/net/http.rb (module Net): ditto
* lib/net/smtp.rb (module Net): ditto
* lib/net/telnet.rb (module Net): Net::ReadTimeout is now raised in
waitfor to match Net::Protocol.
* test/net/http/test_http.rb: Updated Timeout::Error expectation to
Net::ReadTimeout.
* test/net/ftp/test_ftp.rb: ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/net/http')
-rw-r--r-- | test/net/http/test_http.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/net/http/test_http.rb b/test/net/http/test_http.rb index c4ca039237..8b3928bfd1 100644 --- a/test/net/http/test_http.rb +++ b/test/net/http/test_http.rb @@ -204,7 +204,7 @@ module TestNetHTTP_version_1_1_methods conn.open_timeout = 0.01 th = Thread.new do - assert_raise(Timeout::Error) { + assert_raise(Net::ReadTimeout) { conn.get('/') } end |