[前][次][番号順一覧][スレッド一覧]

ruby-changes:53885

From: normal <ko1@a...>
Date: Fri, 30 Nov 2018 20:44:27 +0900 (JST)
Subject: [ruby-changes:53885] normal:r66104 (trunk): test/ruby/test_io.rb (test_recycled_fd_close): remove hacks

normal	2018-11-30 20:44:21 +0900 (Fri, 30 Nov 2018)

  New Revision: 66104

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66104

  Log:
    test/ruby/test_io.rb (test_recycled_fd_close): remove hacks
    
    I think I finally fixed the underlying bug in r65937
    ("io.c (fptr_finalize_flush): close race leading to EBADF")
    
    I've run this test over 100000 times on a multicore system, now.

  Modified files:
    trunk/test/ruby/test_io.rb
Index: test/ruby/test_io.rb
===================================================================
--- test/ruby/test_io.rb	(revision 66103)
+++ test/ruby/test_io.rb	(revision 66104)
@@ -3774,14 +3774,6 @@ __END__ https://github.com/ruby/ruby/blob/trunk/test/ruby/test_io.rb#L3774
             th = Thread.new { r.read(1) }
             w.write(dot)
 
-            # XXX not sure why this is needed on Linux, otherwise
-            # the "good" reader thread doesn't always join properly
-            # because the reader never sees the first write
-            if RUBY_PLATFORM =~ /linux/
-              # assert_equal can fail if this is another char...
-              w.write(dot)
-            end
-
             assert_same th, th.join(15), '"good" reader timeout'
             assert_equal(dot, th.value)
           end
@@ -3800,9 +3792,6 @@ __END__ https://github.com/ruby/ruby/blob/trunk/test/ruby/test_io.rb#L3792
           end
           Thread.pass until th.stop?
 
-          # XXX not sure why, this reduces Linux CI failures
-          assert_nil th.join(0.001)
-
           r.close
           assert_same th, th.join(30), '"bad" reader timeout'
           assert_match(/stream closed/, th.value.message)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]