Merge pull request #34131 from lsylvester/defend-against-unmarshable-exceptions

Fix DRb::DRbServerNotFound errors in parallel tests
2018-11-05 11:27:25 -05:00 · 2018-11-05 11:27:25 -05:00 · a8c06c2d7d
parent c823f9252b bb03948945
commit a8c06c2d7d
1 changed files with 8 additions and 1 deletions
--- a/activesupport/lib/active_support/testing/parallelization.rb
+++ b/activesupport/lib/active_support/testing/parallelization.rb
@ -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)