diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-20 05:18:28 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-20 05:18:28 +0000 |
commit | 34f3f916e6c99fe5d21b1e82339a35c45fb937ff (patch) | |
tree | 2a749a599df5423f13a05b98d9acff4351d1a432 /bootstraptest | |
parent | 0deee5c0aaf7a1b6a78bf4513fdd3a59475bfcf8 (diff) |
Simply treat IO::WaitReadable just like Errno::EAGAIN
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65829 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bootstraptest')
-rwxr-xr-x | bootstraptest/runner.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb index c2a3790236..feb8ada5c1 100755 --- a/bootstraptest/runner.rb +++ b/bootstraptest/runner.rb @@ -383,15 +383,9 @@ 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 + rescue Errno::EAGAIN, IO::WaitReadable, EOFError break end while true end |