diff options
| author | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-02-27 22:40:53 +0000 |
|---|---|---|
| committer | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-02-27 22:40:53 +0000 |
| commit | 04ccb2fee266d65c0a4fdf427d76fd0a18e7e69c (patch) | |
| tree | 83c7b005289cbbca7de0fabba5a54901620fc4e7 /lib | |
| parent | f0f7079d48c2b154341e8bd8464b845ef992739d (diff) | |
* 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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/test/unit.rb | 11 |
1 files changed, 5 insertions, 6 deletions
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 |