sorah	2012-11-02 17:56:10 +0900 (Fri, 02 Nov 2012)

  New Revision: 37425

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37425

  Log:
    * 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]

  Modified files:
    trunk/ChangeLog
    trunk/lib/test/unit.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37424)
+++ ChangeLog	(revision 37425)
@@ -1,3 +1,11 @@
+Fri Nov  2 17:55:39 2012  Shota Fukumori  <sorah@t...>
+
+	* 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@r...>
 
 	* object.c (rb_mod_to_s): Module#{to_s,inspect}, when invoked on
Index: lib/test/unit.rb
===================================================================
--- lib/test/unit.rb	(revision 37424)
+++ lib/test/unit.rb	(revision 37425)
@@ -616,15 +616,20 @@
               _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 ""

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/