1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* test/ruby/test_io.rb (TestIO#pipe): should close write end of pipe

Browse Source 
before closing read end, to get rid of timing problem.

* test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2010-10-27 09:28:08 +00:00
parent 1503e320d9
commit 7a5d45fc3c
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> Wed Oct 27 18:14:27 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (rb_w32_getppid): support Win64. * win32/win32.c (rb_w32_getppid): support Win64.

8
test/ruby/test_io.rb
View File

@ -41,14 +41,14 @@ class TestIO < Test::Unit::TestCase
we = $! we = $!
end end
end end
flunk("timeout") unless rt.join(10) && wt.join(10) flunk("timeout") unless wt.join(10) && rt.join(10)
ensure ensure
r.close unless !r || r.closed?
w.close unless !w || w.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 (wt.kill; wt.join) if wt
raise re if re (rt.kill; rt.join) if rt
raise we if we raise we if we
raise re if re
end end
def with_pipe def with_pipe

8
test/ruby/test_io_m17n.rb
View File

@ -38,14 +38,14 @@ class TestIO_M17N < Test::Unit::TestCase
we = $! we = $!
end end
end end
flunk("timeout") unless rt.join(10) && wt.join(10) flunk("timeout") unless wt.join(10) && rt.join(10)
ensure ensure
r.close unless !r || r.closed?
w.close unless !w || w.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 (wt.kill; wt.join) if wt
raise re if re (rt.kill; rt.join) if rt
raise we if we raise we if we
raise re if re
end end
def with_pipe(*args) def with_pipe(*args)