1
0
Fork 0
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:
Eileen M. Uchitelle 2018-11-05 11:27:25 -05:00 committed by GitHub
commit a8c06c2d7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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)