From fca2ac964df30d102ff516ac5f58f42d3ee241fb Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 7 May 2012 18:54:09 +0000 Subject: [PATCH] test/testunit: fix for recent minitest * test/testunit/test_hideskip.rb (TestHideSkip#test_hideskip): MiniTest#puke now reports Skipped messages only if verbose mode. * test/testunit/test_sorting.rb (TestTestUnitSorting#test_sorting): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35577 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 +++++++- test/testunit/test_hideskip.rb | 6 +++--- test/testunit/test_sorting.rb | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 20238d13ac..0d7ec2c283 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ -Tue May 8 03:53:54 2012 Nobuyoshi Nakada +Tue May 8 03:54:06 2012 Nobuyoshi Nakada + + * test/testunit/test_hideskip.rb (TestHideSkip#test_hideskip): + MiniTest#puke now reports Skipped messages only if verbose mode. + + * test/testunit/test_sorting.rb (TestTestUnitSorting#test_sorting): + ditto. * lib/test/unit.rb (Test::Unit::Runner#puke): modify only result and drop useless reports, not override entirely. diff --git a/test/testunit/test_hideskip.rb b/test/testunit/test_hideskip.rb index 7fc04ae7eb..6104fb63ea 100644 --- a/test/testunit/test_hideskip.rb +++ b/test/testunit/test_hideskip.rb @@ -4,21 +4,21 @@ class TestHideSkip < Test::Unit::TestCase def test_hideskip test_out, o = IO.pipe spawn(*@options[:ruby], "#{File.dirname(__FILE__)}/test4test_hideskip.rb", - out: o, err: o) + "--verbose", out: o, err: o) o.close assert_match(/assertions\/s.\n\n 1\) Skipped/,test_out.read) test_out.close test_out, o = IO.pipe spawn(*@options[:ruby], "#{File.dirname(__FILE__)}/test4test_hideskip.rb", - "--show-skip", out: o, err: o) + "--verbose", "--show-skip", out: o, err: o) o.close assert_match(/assertions\/s.\n\n 1\) Skipped/,test_out.read) test_out.close test_out, o = IO.pipe spawn(*@options[:ruby], "#{File.dirname(__FILE__)}/test4test_hideskip.rb", - "--hide-skip", out: o, err: o) + "--verbose", "--hide-skip", out: o, err: o) o.close assert_match(/assertions\/s.\n\n1 tests, 0 assertions, 0 failures, 0 errors, 1 skips/, test_out.read) diff --git a/test/testunit/test_sorting.rb b/test/testunit/test_sorting.rb index ca85db57ea..77374f6843 100644 --- a/test/testunit/test_sorting.rb +++ b/test/testunit/test_sorting.rb @@ -4,7 +4,7 @@ class TestTestUnitSorting < Test::Unit::TestCase def test_sorting test_out, o = IO.pipe spawn(*@options[:ruby], "#{File.dirname(__FILE__)}/test4test_sorting.rb", - out: o, err: o) + "--verbose", out: o, err: o) o.close result = test_out.read