|
1 # Fix to test bug from upstream: |
|
2 # https://github.com/ruby/ruby/commit/ba536e41549f694d5c7434edb967ee571b2161c2 |
|
3 # |
|
4 --- ruby-2.1.5-orig/test/net/ftp/test_ftp.rb 2012-05-22 05:35:18.000000000 -0700 |
|
5 +++ ruby-2.1.5/test/net/ftp/test_ftp.rb 2015-04-07 15:04:11.376937000 -0700 |
|
6 @@ -727,7 +727,7 @@ |
|
7 sock.print("230 Login successful.\r\n") |
|
8 commands.push(sock.gets) |
|
9 sock.print("200 Switching to Binary mode.\r\n") |
|
10 - commands.push(sock.recv(1024)) |
|
11 + commands.push(sock.gets) |
|
12 sock.print("225 No transfer to ABOR.\r\n") |
|
13 } |
|
14 begin |
|
15 @@ -740,7 +740,7 @@ |
|
16 assert_match(/\APASS /, commands.shift) |
|
17 assert_equal("TYPE I\r\n", commands.shift) |
|
18 ftp.abort |
|
19 - assert_equal("ABOR\r", commands.shift) |
|
20 + assert_equal("ABOR\r\n", commands.shift) |
|
21 assert_equal(nil, commands.shift) |
|
22 ensure |
|
23 ftp.close if ftp |
|
24 @@ -760,7 +760,7 @@ |
|
25 sock.print("230 Login successful.\r\n") |
|
26 commands.push(sock.gets) |
|
27 sock.print("200 Switching to Binary mode.\r\n") |
|
28 - commands.push(sock.recv(1024)) |
|
29 + commands.push(sock.gets) |
|
30 sock.print("211 End of status\r\n") |
|
31 } |
|
32 begin |
|
33 @@ -773,7 +773,7 @@ |
|
34 assert_match(/\APASS /, commands.shift) |
|
35 assert_equal("TYPE I\r\n", commands.shift) |
|
36 ftp.status |
|
37 - assert_equal("STAT\r", commands.shift) |
|
38 + assert_equal("STAT\r\n", commands.shift) |
|
39 assert_equal(nil, commands.shift) |
|
40 ensure |
|
41 ftp.close if ftp |
|
42 @@ -795,6 +795,7 @@ |
|
43 end |
|
44 sock = server.accept |
|
45 begin |
|
46 + sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_OOBINLINE, 1) |
|
47 yield(sock) |
|
48 sock.shutdown(Socket::SHUT_WR) |
|
49 sock.read_timeout = 1 |