nobu	2012-06-15 19:11:32 +0900 (Fri, 15 Jun 2012)

  New Revision: 36098

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

  Log:
    Revert r35576 "lib/test/unit.rb: refactoring puke"
    
    * lib/test/unit.rb (Test::Unit::Runner#puke): always add skipped
      results to the report for parallel test.  [Bug #6595]

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36097)
+++ ChangeLog	(revision 36098)
@@ -1,3 +1,8 @@
+Fri Jun 15 19:11:23 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/test/unit.rb (Test::Unit::Runner#puke): always add skipped
+	  results to the report for parallel test.  [Bug #6595]
+
 Fri Jun 15 09:01:35 2012  Yuki Yugui Sonoda  <yugui@g...>
 
 	* nacl/pepper_main.c: Removed an unnecessary and errorneous inclusion.
Index: lib/test/unit.rb
===================================================================
--- lib/test/unit.rb	(revision 36097)
+++ lib/test/unit.rb	(revision 36098)
@@ -735,13 +735,21 @@
         # TODO:
         #   this overriding is for minitest feature that skip messages are
         #   hidden when not verbose (-v), note this is temporally.
-        n = report.size
-        rep = super
-        if MiniTest::Skip === e and /no message given\z/ =~ e.message
-          report.slice!(n..-1)
-          rep = "."
-        end
-        rep
+        e = case e
+            when MiniTest::Skip then
+              @skips += 1
+              return "." if /no message given\z/ =~ e.message
+              "Skipped:\n#{meth}(#{klass}) [#{location e}]:\n#{e.message}\n"
+            when MiniTest::Assertion then
+              @failures += 1
+              "Failure:\n#{meth}(#{klass}) [#{location e}]:\n#{e.message}\n"
+            else
+              @errors += 1
+              bt = MiniTest::filter_backtrace(e.backtrace).join "\n    "
+              "Error:\n#{meth}(#{klass}):\n#{e.class}: #{e.message}\n    #{bt}\n"
+            end
+        @report << e
+        e[0, 1]
       end
 
       def initialize # :nodoc:

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