kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Use Test::Unit::PendedError instead of MiniTest::Skip for test-unit migration

Browse source
This commit is contained in:
Hiroshi SHIBATA 2021-09-06 19:33:56 +09:00
parent 544e37f184
commit ecfbf1df33
No known key found for this signature in database
GPG key ID: F9CF13417264FAC2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/openssl/utils.rb
View file

@ -294,8 +294,7 @@ class OpenSSL::SSLTestCase < OpenSSL::TestCase
timeout = EnvUtil.apply_timeout_scale(30) timeout = EnvUtil.apply_timeout_scale(30)
th.join(timeout) or th.join(timeout) or
th.raise(RuntimeError, "[start_server] thread did not exit in #{timeout} secs") th.raise(RuntimeError, "[start_server] thread did not exit in #{timeout} secs")
rescue (defined?(MiniTest::Skip) ? MiniTest::Skip : Test::Unit::PendedError) rescue Test::Unit::PendedError
# MiniTest::Skip is for the Ruby tree
pend = $! pend = $!
rescue Exception rescue Exception
end end

1
tool/lib/test/unit/assertions.rb
View file

@ -306,6 +306,7 @@ EOT
# Compatibility hack for assert_raise # Compatibility hack for assert_raise
AssertionFailedError = MiniTest::Assertion AssertionFailedError = MiniTest::Assertion
PendedError = MiniTest::Skip
end end
end end