kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Try using longer read_timeout for --jit-wait

Browse source 
failure on TestFTP.

When we skip a test, the place to hang (long wait for compilation)
just moves to another test and it doesn't seem to finish.
http://ci.rvm.jp/results/trunk-mjit-wait@silicon-docker/3003055
This commit is contained in:
Takashi Kokubun 2020-06-14 15:00:54 -07:00
parent c8111c7eb5
commit 80bd3aa32b
No known key found for this signature in database
GPG key ID: 6FFC433B12EE23DD
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
test/net/ftp/test_ftp.rb
View file

@ -735,8 +735,6 @@ class FTPTest < Test::Unit::TestCase
end
def test_getbinaryfile
# http://ci.rvm.jp/logfiles/brlog.trunk-mjit-wait.20200326-025942
skip 'This has been too unstable with --jit-wait' if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
commands = []
binary_data = (0..0xff).map {|i| i.chr}.join * 4 * 3
server = create_ftp_server { |sock|
@ -764,6 +762,7 @@ class FTPTest < Test::Unit::TestCase
begin
begin
ftp = Net::FTP.new
ftp.read_timeout *= 5 if RubyVM::MJIT.enabled? # for --jit-wait
ftp.connect(SERVER_ADDR, server.port)
ftp.login
assert_match(/\AUSER /, commands.shift)
@ -808,6 +807,7 @@ class FTPTest < Test::Unit::TestCase
begin
begin
ftp = Net::FTP.new
ftp.read_timeout *= 5 if RubyVM::MJIT.enabled? # for --jit-wait
ftp.connect(SERVER_ADDR, server.port)
ftp.login
assert_match(/\AUSER /, commands.shift)
@ -2185,8 +2185,6 @@ EOF
def test_abort_tls
return unless defined?(OpenSSL)
# http://ci.rvm.jp/results/trunk-mjit-wait@silicon-docker/2789353
skip 'This is unstable with --jit-wait. TODO: debug it' if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
commands = []
server = create_ftp_server { |sock|
@ -2222,6 +2220,7 @@ EOF
ftp = Net::FTP.new(SERVER_NAME,
port: server.port,
ssl: { ca_file: CA_FILE })
ftp.read_timeout *= 5 if RubyVM::MJIT.enabled? # for --jit-wait
assert_equal("AUTH TLS\r\n", commands.shift)
assert_equal("PBSZ 0\r\n", commands.shift)
assert_equal("PROT P\r\n", commands.shift)
@ -2243,8 +2242,6 @@ EOF
end
def test_getbinaryfile_command_injection
# http://ci.rvm.jp/results/trunk-mjit-wait@silicon-docker/3001181
skip 'This has been too unstable with --jit-wait' if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
skip "| is not allowed in filename on Windows" if windows?
[false, true].each do |resume|
commands = []
@ -2276,7 +2273,7 @@ EOF
begin
ftp = Net::FTP.new
ftp.resume = resume
ftp.read_timeout = (defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?) ? 5 : 0.2 # use large timeout for --jit-wait
ftp.read_timeout = (defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?) ? 300 : 0.2 # use large timeout for --jit-wait
ftp.connect(SERVER_ADDR, server.port)
ftp.login
assert_match(/\AUSER /, commands.shift)