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