Skip to content

Commit 5049e9e

Browse files
committed
[GR-39716] Reapply logic to deal with minitest vs test-unit gem differences
PullRequest: truffleruby/3428
2 parents ecdd0ab + 8e65c5d commit 5049e9e

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

test/mri/tests/openssl/utils.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,8 @@ def start_server(verify_mode: OpenSSL::SSL::VERIFY_NONE, start_immediately: true
280280
timeout = EnvUtil.apply_timeout_scale(30)
281281
th.join(timeout) or
282282
th.raise(RuntimeError, "[start_server] thread did not exit in #{timeout} secs")
283-
rescue Test::Unit::PendedError
283+
rescue (defined?(MiniTest::Skip) ? MiniTest::Skip : Test::Unit::PendedError)
284+
# MiniTest::Skip is for the Ruby tree
284285
pend = $!
285286
rescue Exception
286287
end

0 commit comments

Comments
 (0)