ruby-changes:67640
From: Hiroshi <ko1@a...>
Date: Mon, 6 Sep 2021 21:20:03 +0900 (JST)
Subject: [ruby-changes:67640] ecfbf1df33 (master): Use Test::Unit::PendedError instead of MiniTest::Skip for test-unit migration
https://git.ruby-lang.org/ruby.git/commit/?id=ecfbf1df33 From ecfbf1df33a1e90008baa131369c80cfa6282692 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA <hsbt@r...> Date: Mon, 6 Sep 2021 19:33:56 +0900 Subject: Use Test::Unit::PendedError instead of MiniTest::Skip for test-unit migration --- test/openssl/utils.rb | 3 +-- tool/lib/test/unit/assertions.rb | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb index 8ee0116..ab5fab4 100644 --- a/test/openssl/utils.rb +++ b/test/openssl/utils.rb @@ -294,8 +294,7 @@ class OpenSSL::SSLTestCase < OpenSSL::TestCase https://github.com/ruby/ruby/blob/trunk/test/openssl/utils.rb#L294 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 diff --git a/tool/lib/test/unit/assertions.rb b/tool/lib/test/unit/assertions.rb index b99fb19..2126756 100644 --- a/tool/lib/test/unit/assertions.rb +++ b/tool/lib/test/unit/assertions.rb @@ -306,6 +306,7 @@ EOT https://github.com/ruby/ruby/blob/trunk/tool/lib/test/unit/assertions.rb#L306 # Compatibility hack for assert_raise AssertionFailedError = MiniTest::Assertion + PendedError = MiniTest::Skip end end -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/