* test/ruby/test_io.rb (TestIO#test_copy_stream_socket): fix

  test hanging up issue. Patch by CHIKANAGA Tomoyuki.




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

2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index ce435604d9..db5b697323 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 16 17:55:07 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/ruby/test_io.rb (TestIO#test_copy_stream_socket): fix
+	  test hanging up issue. Patch by CHIKANAGA Tomoyuki.
+
 Thu Jun 16 15:17:39 2011  Eric Hodel  <drbrain@segment7.net>
 
 	* variable.c (const_missing):  Add simple example of const_missing.
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index fba0800499..3df7771d6c 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -609,7 +609,7 @@ class TestIO < Test::Unit::TestCase
             skip "nonblocking IO for pipe is not implemented"
           end
           trapping_usr1 do
-            nr = 10
+            nr = 30
             begin
               pid = fork do
                 s1.close
@@ -622,8 +622,8 @@ class TestIO < Test::Unit::TestCase
                 assert_equal megacontent.bytesize, IO.copy_stream("megasrc", s1)
               end
               assert_equal(1, @usr1_rcvd)
-              s1.close
             ensure
+              s1.close
               _, status = Process.waitpid2(pid) if pid
             end
             assert status.success?, status.inspect