aboutsummaryrefslogtreecommitdiffstats
path: root/bootstraptest/runner.rb
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-20 02:16:30 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-20 02:16:30 +0000
commit59676f6d030ff06d6e577860150ed1aa3aa1046a (patch)
treef04c6cd892b9d21fde9db58f4d43e983cc2aa932 /bootstraptest/runner.rb
parent5187ea768f57315e61486122d688f1992d4cb21f (diff)
downloadruby-59676f6d030ff06d6e577860150ed1aa3aa1046a.tar.gz
revert r65820 and retry assert_finish
From: MSP-Greg <greg.mpls@gmail.com> https://github.com/ruby/ruby/commit/5187ea768f57315e61486122d688f1992d4cb21f git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bootstraptest/runner.rb')
-rwxr-xr-xbootstraptest/runner.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index a5d5d219cf..c2a3790236 100755
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -383,8 +383,14 @@ def assert_finish(timeout_seconds, testsrc, message = '')
end
if io.respond_to?(:read_nonblock)
if IO.select([io], nil, nil, diff)
+ tries = 0
begin
io.read_nonblock(1024)
+ rescue IO::WaitReadable
+ IO.select([io])
+ tries += 1
+ break if tries > 3
+ retry
rescue Errno::EAGAIN, EOFError
break
end while true