1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test/unit.rb: use full columns

Browse Source 
* test/lib/test/unit.rb (Test::Unit::StatusLine#update_status):
  exclude colorizing escape sequences from @status_line_size to
  use full columns.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-12-18 15:06:00 +00:00
parent 0967c1e3ad
commit 2a2010c5c1
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/lib/test/unit.rb
View File

@ -520,29 +520,19 @@ module Test
@terminal_width @terminal_width
end end
def del_status_line def del_status_line(flush = true)
@status_line_size ||= 0 @status_line_size ||= 0
unless @options[:job_status] == :replace unless @options[:job_status] == :replace
$stdout.puts $stdout.puts
return return
end end
print "\r"+" "*@status_line_size+"\r" print "\r"+" "*@status_line_size+"\r"
$stdout.flush $stdout.flush if flush
@status_line_size = 0 @status_line_size = 0
end end
def put_status(line) def status_color(line)
unless @options[:job_status] == :replace print line if @options[:job_status] == :replace
print(line)
return
end
@status_line_size ||= 0
del_status_line
$stdout.flush
line = line[0...terminal_width]
print line
$stdout.flush
@status_line_size = line.size
end end
def add_status(line) def add_status(line)
@ -623,7 +613,11 @@ module Test
def update_status(s) def update_status(s)
count = @test_count.to_s(10).rjust(@total_tests.size) count = @test_count.to_s(10).rjust(@total_tests.size)
put_status("#{@passed_color}[#{count}/#{@total_tests}]#{@reset_color} #{s}") del_status_line(false)
status_color(@passed_color)
add_status("[#{count}/#{@total_tests}]")
status_color(@reset_color)
add_status(" #{s}")
end end
def _print(s); $stdout.print(s); end def _print(s); $stdout.print(s); end