diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-09-15 07:56:04 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-09-15 07:56:04 +0000 |
commit | cc9b6ba611711aca1a124e6666b9a57c7dda9d2b (patch) | |
tree | 58d579bcb8364f8448c61500d69880db191fa2ce | |
parent | 6bab4ea9917dc05cd2c94aead2e96eb7df7d4be1 (diff) | |
download | ruby-cc9b6ba611711aca1a124e6666b9a57c7dda9d2b.tar.gz |
reverting; http://rubyforge.org/tracker/?func=detail&atid=4099&aid=28566&group_id=1040
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | lib/minitest/unit.rb | 2 | ||||
-rw-r--r-- | lib/test/unit/assertions.rb | 2 | ||||
-rw-r--r-- | test/net/imap/test_imap.rb | 22 |
4 files changed, 6 insertions, 31 deletions
@@ -1,14 +1,3 @@ -Wed Sep 15 14:59:49 2010 URABE Shyouhei <shyouhei@ruby-lang.org> - - * 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@ruby-lang.org> * test/net/imap/test_imap.rb: "localhost" not guaranteed to diff --git a/lib/minitest/unit.rb b/lib/minitest/unit.rb index 28e14498a4..c45dec3fc4 100644 --- a/lib/minitest/unit.rb +++ b/lib/minitest/unit.rb @@ -222,8 +222,6 @@ module MiniTest begin yield should_raise = true - rescue MiniTest::Skip - raise rescue Exception => e details = "#{msg}#{mu_pp(exp)} exception expected, not" assert(exp.any? { |ex| diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb index 6e4707fc25..f4e4e74e1e 100644 --- a/lib/test/unit/assertions.rb +++ b/lib/test/unit/assertions.rb @@ -32,8 +32,6 @@ module Test end begin line = __LINE__; yield - rescue MiniTest::Skip - raise rescue Exception => e bt = e.backtrace as = e.instance_of?(MiniTest::Assertion) diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb index 8ccec642c0..06ecca0f00 100644 --- a/test/net/imap/test_imap.rb +++ b/test/net/imap/test_imap.rb @@ -49,13 +49,9 @@ class IMAPTest < Test::Unit::TestCase 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 @@ class IMAPTest < Test::Unit::TestCase 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 @@ class IMAPTest < Test::Unit::TestCase imap end end - rescue SystemCallError - skip $! ensure if imap && !imap.disconnected? imap.disconnect |