diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-16 04:23:32 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-16 04:23:32 +0000 |
commit | de7eb55f7fec837d43a6a1682a429d8108e657dc (patch) | |
tree | 7aaef70b6528c4498e6a2cdeeaa8712661193013 /lib | |
parent | 04a7aabfbfc273e6d8edb21bef613f20da730b90 (diff) | |
download | ruby-de7eb55f7fec837d43a6a1682a429d8108e657dc.tar.gz |
test: reduce unnecessary output
* lib/test/unit.rb (Test::Unit::Runner#del_status_line): update
@status_line_size and return true value.
* lib/test/unit.rb (Test::Unit::Runner#{put,add,jobs}_status): return
non-nil/false if status line is used.
* lib/test/unit.rb (Test::Unit::Runner#_run_parallel): clear status
line at last.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/test/unit.rb | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/lib/test/unit.rb b/lib/test/unit.rb index 213645a772..082fdbdedc 100644 --- a/lib/test/unit.rb +++ b/lib/test/unit.rb @@ -399,10 +399,14 @@ module Test return unless @options[:job_status] == :replace print "\r"+" "*@status_line_size+"\r" $stdout.flush + @status_line_size = 0 end def put_status(line) - return print(line) unless @options[:job_status] == :replace + unless @options[:job_status] == :replace + print(line) + return + end @status_line_size ||= 0 del_status_line $stdout.flush @@ -413,7 +417,10 @@ module Test end def add_status(line) - return print(line) unless @options[:job_status] == :replace + unless @options[:job_status] == :replace + print(line) + return + end @status_line_size ||= 0 line = line[0...(terminal_width-@status_line_size)] print line @@ -425,11 +432,7 @@ module Test return unless @options[:job_status] puts "" unless @options[:verbose] or @options[:job_status] == :replace status_line = @workers.map(&:to_s).join(" ") - if @options[:job_status] == :replace - put_status status_line - else - puts status_line - end + put_status status_line or (puts; nil) end def del_jobs_status @@ -607,7 +610,7 @@ module Test suites, rep = rep.partition {|r| r[:testcase] && r[:file] && !r[:report].empty?} suites.map {|r| r[:file]}.uniq.each {|file| require file} suites.map! {|r| eval("::"+r[:testcase])} - puts "" + del_status_line or puts puts "Retrying..." puts "" _run_suites(suites, type) |