From 68ed323fc3771a4d7ed772ecafc7b6da8ef1b2e6 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 27 Feb 2016 04:16:44 +0000
Subject: test/unit: fix for the test

* test/lib/test/unit.rb (_run_parallel): make sure retrying
  message is a separate line.

* test/lib/test/unit.rb (_prepare_run): do not add Output if
  testing.

* test/lib/test/unit.rb (Skipping#failed): defer showing reports
  when showing skips, to be sorted.

* test/testunit/test_hideskip.rb (test_hideskip): fix assertion
  for output misordered by mixing output destinations.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53955 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/lib/test/unit.rb          | 9 +++++++--
 test/testunit/test_hideskip.rb | 6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'test')

diff --git a/test/lib/test/unit.rb b/test/lib/test/unit.rb
index 312cacb8d0..419081a58f 100644
--- a/test/lib/test/unit.rb
+++ b/test/lib/test/unit.rb
@@ -426,7 +426,7 @@ module Test
             suites.map! {|r| eval("::"+r[:testcase])}
             del_status_line or puts
             unless suites.empty?
-              puts "Retrying..."
+              puts "\n""Retrying..."
               _run_suites(suites, type)
             end
           end
@@ -478,6 +478,10 @@ module Test
     end
 
     module Skipping # :nodoc: all
+      def failed(s)
+        super if !s or @options[:hide_skip]
+      end
+
       private
       def setup_options(opts, options)
         super
@@ -501,6 +505,7 @@ module Test
         report.reject!{|r| r.start_with? "Skipped:" } if @options[:hide_skip]
         report.sort_by!{|r| r.start_with?("Skipped:") ? 0 : \
                            (r.start_with?("Failure:") ? 1 : 2) }
+        failed(nil)
         result
       end
     end
@@ -585,7 +590,7 @@ module Test
         if color or @options[:job_status] == :replace
           @verbose = !options[:parallel]
         end
-        @output = Output.new(self)
+        @output = Output.new(self) unless @options[:testing]
         if /\A\/(.*)\/\z/ =~ (filter = options[:filter])
           filter = Regexp.new($1)
         end
diff --git a/test/testunit/test_hideskip.rb b/test/testunit/test_hideskip.rb
index a8d7b5500c..ed91200740 100644
--- a/test/testunit/test_hideskip.rb
+++ b/test/testunit/test_hideskip.rb
@@ -3,9 +3,9 @@ require 'test/unit'
 
 class TestHideSkip < Test::Unit::TestCase
   def test_hideskip
-    assert_not_match(/assertions\/s.\n\n  1\) Skipped/, hideskip)
-    assert_match(/assertions\/s.\n\n  1\) Skipped/, hideskip("--show-skip"))
-    assert_match(/assertions\/s.\n\n1 tests, 0 assertions, 0 failures, 0 errors, 1 skips/, hideskip("--hide-skip"))
+    assert_not_match(/^ *1\) Skipped/, hideskip)
+    assert_match(/^ *1\) Skipped/, hideskip("--show-skip"))
+    assert_match(/assertions\/s.\n+1 tests, 0 assertions, 0 failures, 0 errors, 1 skips/, hideskip("--hide-skip"))
   end
 
   def hideskip(*args)
-- 
cgit v1.2.3