naruse	2012-04-02 05:59:02 +0900 (Mon, 02 Apr 2012)

  New Revision: 35210

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35210

  Log:
    Refix the test for r35205.

  Modified files:
    trunk/test/net/ftp/test_ftp.rb

Index: test/net/ftp/test_ftp.rb
===================================================================
--- test/net/ftp/test_ftp.rb	(revision 35209)
+++ test/net/ftp/test_ftp.rb	(revision 35210)
@@ -522,7 +522,7 @@
       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 @@
         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 @@
       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 @@
         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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/