mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Use Test::Unit::PendedError instead of MiniTest::Skip for test-unit migration
This commit is contained in:
parent
544e37f184
commit
ecfbf1df33
2 changed files with 2 additions and 2 deletions
|
@ -294,8 +294,7 @@ class OpenSSL::SSLTestCase < OpenSSL::TestCase
|
|||
timeout = EnvUtil.apply_timeout_scale(30)
|
||||
th.join(timeout) or
|
||||
th.raise(RuntimeError, "[start_server] thread did not exit in #{timeout} secs")
|
||||
rescue (defined?(MiniTest::Skip) ? MiniTest::Skip : Test::Unit::PendedError)
|
||||
# MiniTest::Skip is for the Ruby tree
|
||||
rescue Test::Unit::PendedError
|
||||
pend = $!
|
||||
rescue Exception
|
||||
end
|
||||
|
|
|
@ -306,6 +306,7 @@ EOT
|
|||
|
||||
# Compatibility hack for assert_raise
|
||||
AssertionFailedError = MiniTest::Assertion
|
||||
PendedError = MiniTest::Skip
|
||||
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue