diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/net/ftp/test_ftp.rb | 22 |
2 files changed, 15 insertions, 13 deletions
@@ -1,3 +1,9 @@ +Mon Nov 10 23:34:13 2014 Tanaka Akira <akr@fsij.org> + + * test/net/ftp/test_ftp.rb (create_ftp_server): Don't ignore + exceptions on server thread. + Delete read_timeout method call to fix NoMethodError. + Mon Nov 10 20:20:53 2014 NAKAMURA Usaku <usa@ruby-lang.org> * win32/win32.c (rb_w32_read): retry with reduced length if cannot to diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb index e3c01d32c0..f451c398f7 100644 --- a/test/net/ftp/test_ftp.rb +++ b/test/net/ftp/test_ftp.rb @@ -773,20 +773,16 @@ class FTPTest < Test::Unit::TestCase def create_ftp_server(sleep_time = nil) server = TCPServer.new(SERVER_ADDR, 0) @thread = Thread.start do + if sleep_time + sleep(sleep_time) + end + sock = server.accept begin - if sleep_time - sleep(sleep_time) - end - sock = server.accept - begin - yield(sock) - sock.shutdown(Socket::SHUT_WR) - sock.read_timeout = 1 - sock.read unless sock.eof? - ensure - sock.close - end - rescue + yield(sock) + sock.shutdown(Socket::SHUT_WR) + sock.read unless sock.eof? + ensure + sock.close end end def server.port |