diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/net/ftp.rb | 2 | ||||
| -rw-r--r-- | test/net/ftp/test_ftp.rb | 68 |
3 files changed, 74 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sun Apr 1 23:03:18 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * lib/net/ftp.rb (Net::BufferedSocket): should delegate send() to @io + for Net::FTP#abort and Net::FTP#status.. + Sun Apr 1 00:41:56 2012 Shugo Maeda <shugo@ruby-lang.org> * lib/net/ftp.rb: fixed the domain name in examples. diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index ee4b75a146..62730a3f5b 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -1055,7 +1055,7 @@ module Net end class BufferedSocket < BufferedIO - [:addr, :peeraddr].each do |method| + [:addr, :peeraddr, :send].each do |method| define_method(method) { |*args| @io.__send__(method, *args) } diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb index 998f8e0376..f7cbf6352d 100644 --- a/test/net/ftp/test_ftp.rb +++ b/test/net/ftp/test_ftp.rb @@ -512,6 +512,74 @@ class FTPTest < Test::Unit::TestCase end end + def test_abort + commands = [] + server = create_ftp_server { |sock| + sock.print("220 (test_ftp).\r\n") + commands.push(sock.gets) + sock.print("331 Please specify the password.\r\n") + commands.push(sock.gets) + 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)) + sock.print("225 No transfer to ABOR.\r\n") + } + begin + begin + ftp = Net::FTP.new + #ftp.read_timeout = 0.2 + ftp.connect(SERVER_ADDR, server.port) + ftp.login + assert_match(/\AUSER /, commands.shift) + assert_match(/\APASS /, commands.shift) + assert_equal("TYPE I\r\n", commands.shift) + ftp.abort + assert_equal("\n", commands.shift) + assert_equal(nil, commands.shift) + ensure + ftp.close if ftp + end + ensure + server.close + end + end + + def test_status + commands = [] + server = create_ftp_server { |sock| + sock.print("220 (test_ftp).\r\n") + commands.push(sock.gets) + sock.print("331 Please specify the password.\r\n") + commands.push(sock.gets) + 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)) + sock.print("211-FTP server status:\r\n") + sock.print("\n211 End of status\r\n") + + } + begin + begin + ftp = Net::FTP.new + #ftp.read_timeout = 0.2 + ftp.connect(SERVER_ADDR, server.port) + ftp.login + assert_match(/\AUSER /, commands.shift) + assert_match(/\APASS /, commands.shift) + assert_equal("TYPE I\r\n", commands.shift) + ftp.status + assert_equal("\n", commands.shift) + assert_equal(nil, commands.shift) + ensure + ftp.close if ftp + end + ensure + server.close + end + end + private |