2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c81c2695c0..82c631c425 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 26 13:06:52 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb: Avoid zombie processes on "--separate" option
+	  added at r34121.
+
 Mon Dec 26 04:01:23 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
 
 	* ext/openssl/ossl_cipher.c: Update and complete documentation.
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index 6068e295fb..9a85951b83 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -293,7 +293,9 @@ module Test
         end
 
         def close
-          @io.close
+          begin
+            @io.close if @io.closed?
+          rescue IOError; end
           self
         end
 
@@ -301,6 +303,7 @@ module Test
           return if @io.closed?
           @quit_called = true
           @io.puts "quit"
+          @io.close
         end
 
         def died(*additional)