From ecfbf1df33a1e90008baa131369c80cfa6282692 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Mon, 6 Sep 2021 19:33:56 +0900
Subject: [PATCH] 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 8ee0116412..ab5fab4ba3 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
diff --git a/tool/lib/test/unit/assertions.rb b/tool/lib/test/unit/assertions.rb
index b99fb19adf..2126756722 100644
--- a/tool/lib/test/unit/assertions.rb
+++ b/tool/lib/test/unit/assertions.rb
@@ -306,6 +306,7 @@ EOT
 
     # Compatibility hack for assert_raise
     AssertionFailedError = MiniTest::Assertion
+    PendedError = MiniTest::Skip
 
   end
 end