usa	2011-07-07 17:56:12 +0900 (Thu, 07 Jul 2011)

  New Revision: 32436

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32436

  Log:
    * test/testunit/test_parallel.rb (TestParallelWorker#teardown): wait
      the child process even if the communition pipe is broken.

  Modified files:
    trunk/ChangeLog
    trunk/test/testunit/test_parallel.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32435)
+++ ChangeLog	(revision 32436)
@@ -1,3 +1,8 @@
+Thu Jul  7 17:55:05 2011  NAKAMURA Usaku  <usa@r...>
+
+	* test/testunit/test_parallel.rb (TestParallelWorker#teardown): wait
+	  the child process even if the communition pipe is broken.
+
 Thu Jul  7 15:44:42 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* encoding.c (rb_enc_set_index, rb_enc_associate_index): should
Index: test/testunit/test_parallel.rb
===================================================================
--- test/testunit/test_parallel.rb	(revision 32435)
+++ test/testunit/test_parallel.rb	(revision 32436)
@@ -18,11 +18,14 @@
     def teardown
       if @worker_pid && @worker_in
         begin
-          @worker_in.puts "quit"
+          begin
+            @worker_in.puts "quit"
+          rescue IOError, Errno::EPIPE
+          end
           timeout(2) do
             Process.waitpid(@worker_pid)
           end
-        rescue IOError, Errno::EPIPE, Timeout::Error
+        rescue Timeout::Error
           begin
             Process.kill(:KILL, @worker_pid)
           rescue Errno::ESRCH

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