summaryrefslogtreecommitdiff
path: root/test/net/ftp
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-01 20:59:02 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-01 20:59:02 +0000
commit9d8ca7e15ee825067cae53abff2a65baba897696 (patch)
treed27e76c71a202bf768d2db6b81fadef92d5bb340 /test/net/ftp
parent8520505e44fce5910ed795cbbb5df3e9f898568e (diff)
Refix the test for r35205.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/net/ftp')
-rw-r--r--test/net/ftp/test_ftp.rb9
1 files changed, 4 insertions, 5 deletions
diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb
index 9298910..2d10431 100644
--- a/test/net/ftp/test_ftp.rb
+++ b/test/net/ftp/test_ftp.rb
@@ -522,7 +522,7 @@ class FTPTest < Test::Unit::TestCase
sock.print("230 Login successful.\r\n")
commands.push(sock.gets)
sock.print("200 Switching to Binary mode.\r\n")
- commands.push(sock.recv(1024, Socket::MSG_OOB))
+ commands.push(sock.recv(1024))
sock.print("225 No transfer to ABOR.\r\n")
}
begin
@@ -535,7 +535,7 @@ class FTPTest < Test::Unit::TestCase
assert_match(/\APASS /, commands.shift)
assert_equal("TYPE I\r\n", commands.shift)
ftp.abort
- assert_equal("\n", commands.shift) # ???
+ assert_equal("ABOR\r", commands.shift)
assert_equal(nil, commands.shift)
ensure
ftp.close if ftp
@@ -555,10 +555,9 @@ class FTPTest < Test::Unit::TestCase
sock.print("230 Login successful.\r\n")
commands.push(sock.gets)
sock.print("200 Switching to Binary mode.\r\n")
- commands.push(sock.recv(1024, Socket::MSG_OOB))
+ commands.push(sock.recv(1024))
sock.print("211-FTP server status:\r\n")
sock.print("211 End of status\r\n")
-
}
begin
begin
@@ -570,7 +569,7 @@ class FTPTest < Test::Unit::TestCase
assert_match(/\APASS /, commands.shift)
assert_equal("TYPE I\r\n", commands.shift)
ftp.status
- assert_equal("\n", commands.shift) # ???
+ assert_equal("STAT\r", commands.shift)
assert_equal(nil, commands.shift)
ensure
ftp.close if ftp