1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the test for r35205.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35209 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-04-01 18:42:22 +00:00
parent 1c6d6cad21
commit 8520505e44
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/net/ftp/test_ftp.rb
View File

@ -535,7 +535,7 @@ class FTPTest < Test::Unit::TestCase
assert_match(/\APASS /, commands.shift) assert_match(/\APASS /, commands.shift)
assert_equal("TYPE I\r\n", commands.shift) assert_equal("TYPE I\r\n", commands.shift)
ftp.abort ftp.abort
assert_equal("\n", commands.shift) assert_equal("\n", commands.shift) # ???
assert_equal(nil, commands.shift) assert_equal(nil, commands.shift)
ensure ensure
ftp.close if ftp ftp.close if ftp
@ -557,20 +557,20 @@ class FTPTest < Test::Unit::TestCase
sock.print("200 Switching to Binary mode.\r\n") sock.print("200 Switching to Binary mode.\r\n")
commands.push(sock.recv(1024, Socket::MSG_OOB)) commands.push(sock.recv(1024, Socket::MSG_OOB))
sock.print("211-FTP server status:\r\n") sock.print("211-FTP server status:\r\n")
sock.print("\n211 End of status\r\n") sock.print("211 End of status\r\n")
} }
begin begin
begin begin
ftp = Net::FTP.new ftp = Net::FTP.new
#ftp.read_timeout = 0.2 ftp.read_timeout = 0.2
ftp.connect(SERVER_ADDR, server.port) ftp.connect(SERVER_ADDR, server.port)
ftp.login ftp.login
assert_match(/\AUSER /, commands.shift) assert_match(/\AUSER /, commands.shift)
assert_match(/\APASS /, commands.shift) assert_match(/\APASS /, commands.shift)
assert_equal("TYPE I\r\n", commands.shift) assert_equal("TYPE I\r\n", commands.shift)
ftp.status ftp.status
assert_equal("\n", commands.shift) assert_equal("\n", commands.shift) # ???
assert_equal(nil, commands.shift) assert_equal(nil, commands.shift)
ensure ensure
ftp.close if ftp ftp.close if ftp