diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-12-04 06:52:01 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-12-04 06:52:01 +0000 |
| commit | dcc0a529b77f4b0b2a85a7719f3495af5f8ab734 (patch) | |
| tree | 0caf0f219b0626064cf675d4a63bba22c17382e8 | |
| parent | a4933de6549de70f04c2e54848fc271cf07a5ec5 (diff) | |
| download | ruby-dcc0a529b77f4b0b2a85a7719f3495af5f8ab734.tar.gz | |
merge revision(s) 2a477e0e444de6344048101466fb9189b9defddc: [Backport #16353]
test_ftp.rb: loosen timeout for Travis osx
https://travis-ci.org/ruby/ruby/jobs/454798071
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65723 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@67829 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | test/net/ftp/test_ftp.rb | 8 | ||||
| -rw-r--r-- | version.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb index 8177bfe36e..8e0a688135 100644 --- a/test/net/ftp/test_ftp.rb +++ b/test/net/ftp/test_ftp.rb @@ -377,7 +377,7 @@ class FTPTest < Test::Unit::TestCase begin begin ftp = Net::FTP.new - ftp.read_timeout = 0.2 + ftp.read_timeout = 1.0 ftp.connect(SERVER_ADDR, server.port) ftp.login assert_match(/\AUSER /, commands.shift) @@ -386,7 +386,7 @@ class FTPTest < Test::Unit::TestCase assert_equal(nil, commands.shift) ensure ftp.close - assert_equal(0.2, ftp.read_timeout) + assert_equal(1.0, ftp.read_timeout) end ensure server.close @@ -662,7 +662,7 @@ class FTPTest < Test::Unit::TestCase sock.print("150 Opening BINARY mode data connection for foo (#{binary_data.size} bytes)\r\n") conn = TCPSocket.new(host, port) binary_data.scan(/.{1,1024}/nm) do |s| - sleep(0.1) + sleep(0.2) conn.print(s) end conn.shutdown(Socket::SHUT_WR) @@ -673,7 +673,7 @@ class FTPTest < Test::Unit::TestCase begin begin ftp = Net::FTP.new - ftp.read_timeout = 0.2 + ftp.read_timeout = 1.0 ftp.connect(SERVER_ADDR, server.port) ftp.login assert_match(/\AUSER /, commands.shift) @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.5.8" -#define RUBY_RELEASE_DATE "2019-11-08" -#define RUBY_PATCHLEVEL 208 +#define RUBY_RELEASE_DATE "2019-12-04" +#define RUBY_PATCHLEVEL 209 #define RUBY_RELEASE_YEAR 2019 -#define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 8 +#define RUBY_RELEASE_MONTH 12 +#define RUBY_RELEASE_DAY 4 #include "ruby/version.h" |