From 94d36ce335fb7044d71c11737f570f0b223427ce Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 19 Dec 2015 01:17:41 +0000 Subject: test/unit.rb: fix outputs * test/lib/test/unit.rb (Test::Unit::StatusLine#update_status): do not print extra empty lines when running on non-tty. fix colorizing in verbose mode. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53196 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/lib/test/unit.rb | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'test/lib') diff --git a/test/lib/test/unit.rb b/test/lib/test/unit.rb index da0c50df76..9c1100b771 100644 --- a/test/lib/test/unit.rb +++ b/test/lib/test/unit.rb @@ -531,11 +531,7 @@ module Test @status_line_size = 0 end - def status_color(line) - print line if @options[:job_status] == :replace - end - - def add_status(line) + def add_status(line, flush: true) unless @options[:job_status] == :replace print(line) return @@ -543,7 +539,7 @@ module Test @status_line_size ||= 0 line = line[0...(terminal_width-@status_line_size)] print line - $stdout.flush + $stdout.flush if flush @status_line_size += line.size end @@ -613,10 +609,10 @@ module Test def update_status(s) count = @test_count.to_s(10).rjust(@total_tests.size) - del_status_line(false) - status_color(@passed_color) - add_status("[#{count}/#{@total_tests}]") - status_color(@reset_color) + del_status_line(false) if @options[:job_status] == :replace + print(@passed_color) + add_status("[#{count}/#{@total_tests}]", flush: false) + print(@reset_color) add_status(" #{s}") end -- cgit v1.2.3