diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-09-15 06:01:00 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-09-15 06:01:00 +0000 |
| commit | 6bab4ea9917dc05cd2c94aead2e96eb7df7d4be1 (patch) | |
| tree | 1900f937852fe05173883f1a8cd32d0d49b5f747 /lib | |
| parent | 64beb15dbc16ad251a55545bb89775bf23a6a845 (diff) | |
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/minitest/unit.rb | 2 | ||||
| -rw-r--r-- | lib/test/unit/assertions.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/minitest/unit.rb b/lib/minitest/unit.rb index c45dec3fc4..28e14498a4 100644 --- a/lib/minitest/unit.rb +++ b/lib/minitest/unit.rb @@ -222,6 +222,8 @@ 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 f4e4e74e1e..6e4707fc25 100644 --- a/lib/test/unit/assertions.rb +++ b/lib/test/unit/assertions.rb @@ -32,6 +32,8 @@ module Test end begin line = __LINE__; yield + rescue MiniTest::Skip + raise rescue Exception => e bt = e.backtrace as = e.instance_of?(MiniTest::Assertion) |