ruby-changes:18651
From: yugui <ko1@a...>
Date: Thu, 27 Jan 2011 23:24:18 +0900 (JST)
Subject: [ruby-changes:18651] Ruby:r30675 (ruby_1_9_2): merges a half of revision 5875 in MiniTest's repository into ruby_1_9_2. It corresponds to
yugui 2011-01-27 23:24:11 +0900 (Thu, 27 Jan 2011) New Revision: 30675 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30675 Log: merges a half of revision 5875 in MiniTest's repository into ruby_1_9_2. It corresponds to r29259 on Ruby's trunk. -- assert_raises now lets MiniTest::Skip through. (shyouhei) Modified files: branches/ruby_1_9_2/lib/minitest/unit.rb branches/ruby_1_9_2/test/minitest/test_mini_test.rb branches/ruby_1_9_2/version.h Index: ruby_1_9_2/lib/minitest/unit.rb =================================================================== --- ruby_1_9_2/lib/minitest/unit.rb (revision 30674) +++ ruby_1_9_2/lib/minitest/unit.rb (revision 30675) @@ -204,6 +204,14 @@ begin yield should_raise = true + rescue MiniTest::Skip => e + details = "#{msg}#{mu_pp(exp)} exception expected, not" + + if exp.include? MiniTest::Skip then + return e + else + raise e + end rescue Exception => e details = "#{msg}#{mu_pp(exp)} exception expected, not" assert(exp.any? { |ex| @@ -243,6 +251,7 @@ # +send_ary+ is a receiver, message and arguments. # # Fails unless the call returns a true value + # TODO: I should prolly remove this from specs def assert_send send_ary, m = nil recv, msg, *args = send_ary Index: ruby_1_9_2/version.h =================================================================== --- ruby_1_9_2/version.h (revision 30674) +++ ruby_1_9_2/version.h (revision 30675) @@ -1,13 +1,13 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 160 +#define RUBY_PATCHLEVEL 161 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2011 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 16 -#define RUBY_RELEASE_DATE "2011-01-16" +#define RUBY_RELEASE_DAY 27 +#define RUBY_RELEASE_DATE "2011-01-27" #include "ruby/version.h" Index: ruby_1_9_2/test/minitest/test_mini_test.rb =================================================================== --- ruby_1_9_2/test/minitest/test_mini_test.rb (revision 30674) +++ ruby_1_9_2/test/minitest/test_mini_test.rb (revision 30675) @@ -609,6 +609,26 @@ end end + ## + # *sigh* This is quite an odd scenario, but it is from real (albeit + # ugly) test code in ruby-core: + # + # http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29259 + + def test_assert_raises_skip + @assertion_count = 0 + + util_assert_triggered "skipped", MiniTest::Skip do + @tc.assert_raises ArgumentError do + begin + raise "blah" + rescue + skip "skipped" + end + end + end + end + def test_assert_raises_module @tc.assert_raises M do raise E -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/