aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbootstraptest/runner.rb8
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