ruby-changes:17259
From: shyouhei <ko1@a...>
Date: Wed, 15 Sep 2010 17:04:59 +0900 (JST)
Subject: [ruby-changes:17259] Ruby:r29260 (trunk): reverting; http://rubyforge.org/tracker/?func=detail&atid=4099&aid=28566&group_id=1040
shyouhei 2010-09-15 16:56:04 +0900 (Wed, 15 Sep 2010) New Revision: 29260 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29260 Log: reverting; http://rubyforge.org/tracker/?func=detail&atid=4099&aid=28566&group_id=1040 Modified files: trunk/ChangeLog trunk/lib/minitest/unit.rb trunk/lib/test/unit/assertions.rb trunk/test/net/imap/test_imap.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 29259) +++ ChangeLog (revision 29260) @@ -1,14 +1,3 @@ -Wed Sep 15 14:59:49 2010 URABE Shyouhei <shyouhei@r...> - - * lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_nothing_raised): - should properly ignore MiniTest::Skip - - * lib/minitest/unit.rb (MiniTest::Assertions::assert_raises): - ditto. - - * test/net/imap/test_imap.rb: Properly skip SSL tests when - localhost is not 127.0.0.1. - Wed Sep 15 13:37:00 2010 URABE Shyouhei <shyouhei@r...> * test/net/imap/test_imap.rb: "localhost" not guaranteed to Index: lib/test/unit/assertions.rb =================================================================== --- lib/test/unit/assertions.rb (revision 29259) +++ lib/test/unit/assertions.rb (revision 29260) @@ -32,8 +32,6 @@ end begin line = __LINE__; yield - rescue MiniTest::Skip - raise rescue Exception => e bt = e.backtrace as = e.instance_of?(MiniTest::Assertion) Index: lib/minitest/unit.rb =================================================================== --- lib/minitest/unit.rb (revision 29259) +++ lib/minitest/unit.rb (revision 29260) @@ -222,8 +222,6 @@ begin yield should_raise = true - rescue MiniTest::Skip - raise rescue Exception => e details = "#{msg}#{mu_pp(exp)} exception expected, not" assert(exp.any? { |ex| Index: test/net/imap/test_imap.rb =================================================================== --- test/net/imap/test_imap.rb (revision 29259) +++ test/net/imap/test_imap.rb (revision 29260) @@ -49,13 +49,9 @@ if defined?(OpenSSL) assert_raise(OpenSSL::SSL::SSLError) do imaps_test do |port| - begin - Net::IMAP.new("localhost", - :port => port, - :ssl => true) - rescue SystemCallError - skip $! - end + Net::IMAP.new("localhost", + :port => port, + :ssl => true) end end end @@ -65,13 +61,9 @@ if defined?(OpenSSL) assert_nothing_raised do imaps_test do |port| - begin - Net::IMAP.new("localhost", - :port => port, - :ssl => { :ca_file => CA_FILE }) - rescue SystemCallError - skip $! - end + Net::IMAP.new("localhost", + :port => port, + :ssl => { :ca_file => CA_FILE }) end end end @@ -112,8 +104,6 @@ imap end end - rescue SystemCallError - skip $! ensure if imap && !imap.disconnected? imap.disconnect -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/