mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #34131 from lsylvester/defend-against-unmarshable-exceptions
Fix DRb::DRbServerNotFound errors in parallel tests
This commit is contained in:
commit
a8c06c2d7d
1 changed files with 8 additions and 1 deletions
|
@ -79,7 +79,14 @@ module ActiveSupport
|
|||
reporter = job[2]
|
||||
result = Minitest.run_one_method(klass, method)
|
||||
|
||||
queue.record(reporter, result)
|
||||
begin
|
||||
queue.record(reporter, result)
|
||||
rescue DRb::DRbConnError
|
||||
result.failures.each do |failure|
|
||||
failure.exception = DRb::DRbRemoteError.new(failure.exception)
|
||||
end
|
||||
queue.record(reporter, result)
|
||||
end
|
||||
end
|
||||
ensure
|
||||
run_cleanup(worker)
|
||||
|
|
Loading…
Reference in a new issue