diff options
| -rw-r--r-- | test/lib/test/unit.rb | 9 | ||||
| -rw-r--r-- | test/testunit/test_hideskip.rb | 6 |
2 files changed, 10 insertions, 5 deletions
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) |