summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-06-27 18:27:58 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-06-27 18:27:58 +0000
commit6c74c73f954dbc81c049e32783c03f154a3427cf (patch)
tree852dc3a836daaf3e8857d35aebd95e581a74df02 /test
parentddb301b6a21e587653e2a85bf89da3c5f124b249 (diff)
tests: increase timeouts and speedup some slow tests
I'm still using the computer from 2005, so enabling MJIT makes some tests take longer. For test_deadlock_by_signal_at_forking I got it down to 135s to 89s by disabling RubyGems. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63774 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_exception.rb2
-rw-r--r--test/ruby/test_io.rb2
-rw-r--r--test/ruby/test_process.rb4
3 files changed, 4 insertions, 4 deletions
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