From 4bbb49b8482003a131b4f3bcce8d17b63ce35943 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 14 Jul 2012 07:16:33 +0000
Subject: [PATCH] test/unit.rb: extract delete_worker

* lib/test/unit.rb (Test::Unit::Runner#delete_worker): delete dead
  worker from working set.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36386 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog        |  5 ++++-
 lib/test/unit.rb | 10 +++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e9df902c9e..ac9da1ef1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Sat Jul 14 16:16:27 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jul 14 16:16:32 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Runner#delete_worker): delete dead
+	  worker from working set.
 
 	* lib/test/unit.rb (Test::Unit::Runner#launch_worker): add new worker
 	  to working set.
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index 8a8e5c2083..0545579b23 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -468,6 +468,12 @@ module Test
         worker
       end
 
+      def delete_worker(worker)
+        @workers_hash.delete worker.io
+        @workers.delete worker
+        @ios.delete worker.io
+      end
+
       def start_watchdog
         Thread.new do
           while stat = Process.wait2
@@ -527,9 +533,7 @@ module Test
                   end
                 else
                   if @options[:separate] && bang.empty?
-                    @workers_hash.delete worker.io
-                    @workers.delete worker
-                    @ios.delete worker.io
+                    delete_worker(workers)
                     worker.quit
                     worker = launch_worker
                   end