From 04ccb2fee266d65c0a4fdf427d76fd0a18e7e69c Mon Sep 17 00:00:00 2001
From: sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 27 Feb 2011 22:40:53 +0000
Subject: * lib/test/unit.rb(Test::Unit::Runner#after_worker_quit):   method
 name more be natural English. *
 lib/test/unit.rb(Test::Unit::Runner::Worker.launch):   IO.sync doesn't need.
 Should use "b" for mode.

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

diff --git a/ChangeLog b/ChangeLog
index 70b25b0290..e96f92ad40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Feb 28 07:28:35 2011  Shota Fukumori  <sorah@tubusu.net>
+
+	* lib/test/unit.rb(Test::Unit::Runner#after_worker_quit):
+	  method name more be natural English.
+
+	* lib/test/unit.rb(Test::Unit::Runner::Worker.launch):
+	  IO.sync doesn't need. Should use "b" for mode.
+
 Sun Feb 27 21:59:37 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* test/ruby/test_system.rb (TestSystem#test_system_redirect_win):
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index baa828204f..5114e401d9 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -233,8 +233,7 @@ module Test
         def self.launch(ruby,args=[])
           io = IO.popen([*ruby,
                         "#{File.dirname(__FILE__)}/unit/parallel.rb",
-                        *args], "r+")
-          io.sync = true
+                        *args], "rb+")
           new(io: io, pid: io.pid, status: :waiting)
         end
 
@@ -353,7 +352,7 @@ module Test
         puts "" unless @opts[:verbose]
         status_line = @workers.map(&:to_s).join(" ")
         if @opts[:job_status] == :replace
-          @terminal_width ||= $stdout.winsize[1] || ENV["COLUMNS"] || 80
+          @terminal_width ||= $stdout.winsize[1] || ENV["COLUMNS"].to_i || 80
           @jstr_size ||= 0
           del_jobs_status
           $stdout.flush
@@ -371,7 +370,7 @@ module Test
         print "\r"+" "*@jstr_size+"\r"
       end
 
-      def after_worker_dead(worker)
+      def after_worker_quit(worker)
         return unless @opts[:parallel]
         return if @interrupt
         @workers.delete(worker)
@@ -395,7 +394,7 @@ module Test
           @workers = @opts[:parallel].times.map {
             worker = Worker.launch(@opts[:ruby],@args)
             worker.hook(:dead) do |w,info|
-              after_worker_dead w
+              after_worker_quit w
               after_worker_down w, *info unless info.empty?
             end
             worker
@@ -450,7 +449,7 @@ module Test
                 after_worker_down worker, Marshal.load($1.unpack("m")[0])
               when /^bye$/
                 if shutting_down
-                  after_worker_dead worker
+                  after_worker_quit worker
                 else
                   after_worker_down worker
                 end
-- 
cgit v1.2.3