diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/ruby/test_io.rb | 8 | ||||
| -rw-r--r-- | test/ruby/test_io_m17n.rb | 8 |
3 files changed, 15 insertions, 8 deletions
@@ -1,3 +1,10 @@ +Wed Oct 27 18:27:17 2010 NAKAMURA Usaku <usa@ruby-lang.org> + + * test/ruby/test_io.rb (TestIO#pipe): should close write end of pipe + before closing read end, to get rid of timing problem. + + * test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto. + Wed Oct 27 18:14:27 2010 NAKAMURA Usaku <usa@ruby-lang.org> * win32/win32.c (rb_w32_getppid): support Win64. diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index b692c91c7b..af7f428ec4 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -41,14 +41,14 @@ class TestIO < Test::Unit::TestCase we = $! end end - flunk("timeout") unless rt.join(10) && wt.join(10) + flunk("timeout") unless wt.join(10) && rt.join(10) ensure - r.close unless !r || r.closed? w.close unless !w || w.closed? - (rt.kill; rt.join) if rt + r.close unless !r || r.closed? (wt.kill; wt.join) if wt - raise re if re + (rt.kill; rt.join) if rt raise we if we + raise re if re end def with_pipe diff --git a/test/ruby/test_io_m17n.rb b/test/ruby/test_io_m17n.rb index 8f2bd6feea..0ae8c793b0 100644 --- a/test/ruby/test_io_m17n.rb +++ b/test/ruby/test_io_m17n.rb @@ -38,14 +38,14 @@ class TestIO_M17N < Test::Unit::TestCase we = $! end end - flunk("timeout") unless rt.join(10) && wt.join(10) + flunk("timeout") unless wt.join(10) && rt.join(10) ensure - r.close unless !r || r.closed? w.close unless !w || w.closed? - (rt.kill; rt.join) if rt + r.close unless !r || r.closed? (wt.kill; wt.join) if wt - raise re if re + (rt.kill; rt.join) if rt raise we if we + raise re if re end def with_pipe(*args) |