summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/net/ftp/test_ftp.rb6
-rw-r--r--test/net/http/test_http.rb2
2 files changed, 4 insertions, 4 deletions
diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb
index 8ea0234762..91250a9d28 100644
--- a/test/net/ftp/test_ftp.rb
+++ b/test/net/ftp/test_ftp.rb
@@ -190,7 +190,7 @@ class FTPTest < Test::Unit::TestCase
ftp = Net::FTP.new
ftp.read_timeout = 0.2
ftp.connect(SERVER_ADDR, server.port)
- assert_raise(Timeout::Error) do
+ assert_raise(Net::ReadTimeout) do
ftp.login
end
assert_match(/\AUSER /, commands.shift)
@@ -283,7 +283,7 @@ class FTPTest < Test::Unit::TestCase
assert_match(/\AUSER /, commands.shift)
assert_match(/\APASS /, commands.shift)
assert_equal("TYPE I\r\n", commands.shift)
- assert_raise(Timeout::Error) do
+ assert_raise(Net::ReadTimeout) do
ftp.list
end
assert_equal("TYPE A\r\n", commands.shift)
@@ -393,7 +393,7 @@ class FTPTest < Test::Unit::TestCase
assert_match(/\APASS /, commands.shift)
assert_equal("TYPE I\r\n", commands.shift)
buf = ""
- assert_raise(Timeout::Error) do
+ assert_raise(Net::ReadTimeout) do
ftp.retrbinary("RETR foo", 1024) do |s|
buf << s
end
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