ruby-changes:25949
From: ryan <ko1@a...>
Date: Fri, 30 Nov 2012 07:02:56 +0900 (JST)
Subject: [ruby-changes:25949] ryan:r38006 (trunk): Imported minitest 4.3.2 (r8027)
ryan 2012-11-30 07:02:36 +0900 (Fri, 30 Nov 2012) New Revision: 38006 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38006 Log: Imported minitest 4.3.2 (r8027) Modified files: trunk/ChangeLog trunk/test/minitest/test_minitest_unit.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 38005) +++ ChangeLog (revision 38006) @@ -1,3 +1,7 @@ +Fri Nov 30 06:56:30 2012 Ryan Davis <ryand-ruby@z...> + + * test/minitest/*: Imported minitest 4.3.2 (r8027) + Fri Nov 30 04:16:29 2012 Eric Hodel <drbrain@s...> * lib/rake/*: Updated to rake 0.9.5 Index: test/minitest/test_minitest_unit.rb =================================================================== --- test/minitest/test_minitest_unit.rb (revision 38005) +++ test/minitest/test_minitest_unit.rb (revision 38006) @@ -684,6 +684,15 @@ "expected #{@assertion_count} assertions to be fired during the test, not #{@tc._assertions}") if @tc._assertions end + def non_verbose + orig_verbose = $VERBOSE + $VERBOSE = false + + yield + ensure + $VERBOSE = orig_verbose + end + def test_assert @assertion_count = 2 @@ -1314,36 +1323,30 @@ def test_capture_io @assertion_count = 0 - orig_verbose = $VERBOSE - $VERBOSE = false + non_verbose do + out, err = capture_io do + puts 'hi' + warn 'bye!' + end - out, err = capture_io do - puts 'hi' - warn 'bye!' + assert_equal "hi\n", out + assert_equal "bye!\n", err end - - assert_equal "hi\n", out - assert_equal "bye!\n", err - ensure - $VERBOSE = orig_verbose end def test_capture_subprocess_io @assertion_count = 0 skip "Dunno why but the parallel run of this fails" - orig_verbose = $VERBOSE - $VERBOSE = false + non_verbose do + out, err = capture_subprocess_io do + system("echo 'hi'") + system("echo 'bye!' 1>&2") + end - out, err = capture_subprocess_io do - system("echo 'hi'") - system("echo 'bye!' 1>&2") + assert_equal "hi\n", out + assert_equal "bye!\n", err end - - assert_equal "hi\n", out - assert_equal "bye!\n", err - ensure - $VERBOSE = orig_verbose unless orig_verbose.nil? end def test_class_asserts_match_refutes -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/