revert r65820 and retry assert_finish

From: MSP-Greg <greg.mpls@gmail.com>

5187ea768f

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

bootstraptest/pending.rb

@@ -37,11 +37,3 @@ assert_normal_exit %q{
   r.instance_eval { initialize r, r }
   r.inspect
 }
-
-# This test randomly fails on AppVeyor msys2 with:
-# test_thread.rb: A non-blocking socket operation could not be completed immediately. - read would block
-assert_finish 3, %{
-  th = Thread.new {sleep 0.2}
-  th.join(0.1)
-  th.join
-}

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

bootstraptest/test_thread.rb

@@ -248,6 +248,12 @@ assert_equal 'ok', %{
   $result
 }
 
+assert_finish 3, %{
+  th = Thread.new {sleep 0.2}
+  th.join(0.1)
+  th.join
+}
+
 assert_finish 3, %{
   require 'timeout'
   th = Thread.new {sleep 0.2}