summaryrefslogtreecommitdiff
path: root/test/ruby/test_io.rb
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-04 20:34:19 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-04 20:34:19 +0000
commit3dbd8d1f66537f968f0461ed8547460b3b1241b3 (patch)
treec7817d9bb45771318c8ec30cae59d691f355cdaa /test/ruby/test_io.rb
parent32d6becbbb8c8eba232a609ce17529729b989670 (diff)
downloadruby-3dbd8d1f66537f968f0461ed8547460b3b1241b3.tar.gz
test/ruby/test_io.rb (test_race_gets_and_close): timeout each thread
Still looking into CI failures on P895 (and seemingly no other boxes): http://ci.rvm.jp/results/trunk@P895/1190369 :< git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64184 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/test_io.rb')
-rw-r--r--test/ruby/test_io.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 44f8391271..d6bdc7f811 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -3556,7 +3556,8 @@ __END__
end if File::BINARY != 0
def test_race_gets_and_close
- assert_separately([], "#{<<-"begin;"}\n#{<<-"end;"}", signal: :ABRT)
+ opt = { signal: :ABRT, timeout: 200 }
+ assert_separately([], "#{<<-"begin;"}\n#{<<-"end;"}", opt)
bug13076 = '[ruby-core:78845] [Bug #13076]'
begin;
10.times do |i|
@@ -3578,9 +3579,9 @@ __END__
w.close
r.close
end
- assert_nothing_raised(IOError, bug13076) {
- t.each(&:join)
- }
+ t.each do |th|
+ assert_same(th, th.join(2), bug13076)
+ end
end
end;
end