diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | lib/test/unit.rb | 13 |
2 files changed, 17 insertions, 4 deletions
@@ -1,3 +1,11 @@ +Fri Nov 2 17:55:39 2012 Shota Fukumori <sorah@tubusu.net> + + * lib/test/unit.rb (_run_parallel): Delete status line before showing + results. Patch by Hiroshi Shirosaki. [Bug #6897] [ruby-core:47250] + + * lib/test/unit.rb (_run_parallel): Fix strange result when disabled retrying. + Patch by Hiroshi Shirosaki. [Bug #6897] [ruby-core:47250] + Fri Nov 2 17:52:12 2012 Shugo Maeda <shugo@ruby-lang.org> * object.c (rb_mod_to_s): Module#{to_s,inspect}, when invoked on diff --git a/lib/test/unit.rb b/lib/test/unit.rb index c29facca71..d1d40524a8 100644 --- a/lib/test/unit.rb +++ b/lib/test/unit.rb @@ -616,15 +616,20 @@ module Test _run_suites(suites, type) end end + unless @options[:retry] + del_status_line or puts + end unless rep.empty? rep.each do |r| r[:report].each do |f| - report.push(puke(*f)) if f + puke(*f) if f end end - @errors += rep.map{|x| x[:result][0] }.inject(:+) - @failures += rep.map{|x| x[:result][1] }.inject(:+) - @skips += rep.map{|x| x[:result][2] }.inject(:+) + if @options[:retry] + @errors += rep.map{|x| x[:result][0] }.inject(:+) + @failures += rep.map{|x| x[:result][1] }.inject(:+) + @skips += rep.map{|x| x[:result][2] }.inject(:+) + end end unless @warnings.empty? warn "" |