Skip to content

Commit f6cb25d

Browse files
hsbtrhenium
authored andcommitted
Use Test::Unit::PendedError instead of MiniTest::Skip for test-unit migration
(cherry picked from commit ruby/ruby@ecfbf1d)
1 parent 51d1871 commit f6cb25d

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

test/openssl/utils.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,7 @@ def start_server(verify_mode: OpenSSL::SSL::VERIFY_NONE, start_immediately: true
294294
timeout = EnvUtil.apply_timeout_scale(30)
295295
th.join(timeout) or
296296
th.raise(RuntimeError, "[start_server] thread did not exit in #{timeout} secs")
297-
rescue (defined?(MiniTest::Skip) ? MiniTest::Skip : Test::Unit::PendedError)
298-
# MiniTest::Skip is for the Ruby tree
297+
rescue Test::Unit::PendedError
299298
pend = $!
300299
rescue Exception
301300
end

0 commit comments

Comments
 (0)