diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-09-06 19:33:56 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2021-10-16 18:24:08 +0900 |
| commit | f6cb25d2f56d76dd8dd610af41522dbb598e1f73 (patch) | |
| tree | 01b53d8e72ac70190df7aaff4a6f6ce682d0d0a9 | |
| parent | 51d18715e491317aad005c77e0e408a614a4582c (diff) | |
| download | ruby-openssl-f6cb25d2f56d76dd8dd610af41522dbb598e1f73.tar.gz | |
Use Test::Unit::PendedError instead of MiniTest::Skip for test-unit migration
(cherry picked from commit ruby/ruby@ecfbf1df33a1e90008baa131369c80cfa6282692)
| -rw-r--r-- | test/openssl/utils.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb index 8ee01164..ab5fab4b 100644 --- a/test/openssl/utils.rb +++ b/test/openssl/utils.rb @@ -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 |