diff options
| -rw-r--r-- | bootstraptest/test_io.rb | 6 | ||||
| -rw-r--r-- | test/ruby/test_exception.rb | 2 | ||||
| -rw-r--r-- | test/ruby/test_io.rb | 2 | ||||
| -rw-r--r-- | test/ruby/test_process.rb | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/bootstraptest/test_io.rb b/bootstraptest/test_io.rb index 89c00d0b88..731c3e4cc5 100644 --- a/bootstraptest/test_io.rb +++ b/bootstraptest/test_io.rb @@ -30,11 +30,11 @@ assert_finish 10, %q{ end }, '[ruby-dev:32566]' -assert_finish 1, %q{ +assert_finish 2, %q{ r, w = IO.pipe - Thread.new { + Thread.new(Thread.current) { |parent| w << "ab" - sleep 0.01 + Thread.pass until parent.stop? w << "ab" } r.gets("abab") diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index fddb0f3a0f..216d8a4477 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -1328,7 +1328,7 @@ $stderr = $stdout; raise "\x82\xa0"') do |outs, errs, status| end raise Bug14566 end; - assert_in_out_err([], code, [], /Bug14566/, success: false, timeout: 1) + assert_in_out_err([], code, [], /Bug14566/, success: false, timeout: 2) end def test_super_in_method_missing diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index 05f33a1cb4..9c9be185a9 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -2685,7 +2685,7 @@ __END__ end; 10.times.map do Thread.start do - assert_in_out_err([], src) {|stdout, stderr| + assert_in_out_err([], src, timeout: 20) {|stdout, stderr| assert_no_match(/hi.*hi/, stderr.join, bug3585) } end diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb index a9052b4706..ab44cf0265 100644 --- a/test/ruby/test_process.rb +++ b/test/ruby/test_process.rb @@ -2198,7 +2198,7 @@ EOS end def test_deadlock_by_signal_at_forking - assert_separately(["-", RUBY], <<-INPUT, timeout: 80) + assert_separately(%W(--disable=gems - #{RUBY}), <<-INPUT, timeout: 100) ruby = ARGV.shift GC.start # reduce garbage GC.disable # avoid triggering CoW after forks @@ -2206,7 +2206,7 @@ EOS parent = $$ 100.times do |i| pid = fork {Process.kill(:QUIT, parent)} - IO.popen(ruby, 'r+'){} + IO.popen([ruby, -'--disable=gems'], -'r+'){} Process.wait(pid) $stdout.puts $stdout.flush |