Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/ruby/ruby-21/patches/07-test_ftp_rb.patch
author April Chin <april.chin@oracle.com>
Mon, 04 May 2015 10:54:49 -0700
branchs11-update
changeset 4241 9c60eb0ab04b
permissions -rw-r--r--
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9 19884752 Integrate Ruby 2.1.6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4241
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     1
 
# Fix to test bug from upstream:
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     2
 
# https://github.com/ruby/ruby/commit/ba536e41549f694d5c7434edb967ee571b2161c2
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     3
 
#
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     4
 
--- ruby-2.1.5-orig/test/net/ftp/test_ftp.rb	2012-05-22 05:35:18.000000000 -0700
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     5
 
+++ ruby-2.1.5/test/net/ftp/test_ftp.rb	2015-04-07 15:04:11.376937000 -0700
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     6
 
@@ -727,7 +727,7 @@
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     7
 
       sock.print("230 Login successful.\r\n")
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     8
 
       commands.push(sock.gets)
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     9
 
       sock.print("200 Switching to Binary mode.\r\n")
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    10
 
-      commands.push(sock.recv(1024))
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    11
 
+      commands.push(sock.gets)
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    12
 
       sock.print("225 No transfer to ABOR.\r\n")
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    13
 
     }
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    14
 
     begin
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    15
 
@@ -740,7 +740,7 @@
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    16
 
         assert_match(/\APASS /, commands.shift)
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    17
 
         assert_equal("TYPE I\r\n", commands.shift)
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    18
 
         ftp.abort
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    19
 
-        assert_equal("ABOR\r", commands.shift)
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    20
 
+        assert_equal("ABOR\r\n", commands.shift)
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    21
 
         assert_equal(nil, commands.shift)
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    22
 
       ensure
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    23
 
         ftp.close if ftp
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    24
 
@@ -760,7 +760,7 @@
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    25
 
       sock.print("230 Login successful.\r\n")
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    26
 
       commands.push(sock.gets)
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    27
 
       sock.print("200 Switching to Binary mode.\r\n")
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    28
 
-      commands.push(sock.recv(1024))
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    29
 
+      commands.push(sock.gets)
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    30
 
       sock.print("211 End of status\r\n")
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    31
 
     }
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    32
 
     begin
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    33
 
@@ -773,7 +773,7 @@
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    34
 
         assert_match(/\APASS /, commands.shift)
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    35
 
         assert_equal("TYPE I\r\n", commands.shift)
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    36
 
         ftp.status
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    37
 
-        assert_equal("STAT\r", commands.shift)
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    38
 
+        assert_equal("STAT\r\n", commands.shift)
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    39
 
         assert_equal(nil, commands.shift)
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    40
 
       ensure
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    41
 
         ftp.close if ftp
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    42
 
@@ -795,6 +795,7 @@
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    43
 
         end
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    44
 
         sock = server.accept
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    45
 
         begin
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    46
 
+          sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, 1)
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    47
 
           yield(sock)
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    48
 
           sock.shutdown(Socket::SHUT_WR)
9c60eb0ab04b PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    49
 
           sock.read_timeout = 1
upstream/oracle/userland-gate