1 files changed, 21 insertions, 12 deletions
diff --git a/activesupport/lib/active_support/testing/parallelization.rb b/activesupport/lib/active_support/testing/parallelization.rb
index beeb470659..63440069b1 100644
--- a/activesupport/lib/active_support/testing/parallelization.rb
+++ b/activesupport/lib/active_support/testing/parallelization.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require "drb"
-require "drb/unix"
+require "drb/unix" unless Gem.win_platform?
+require "active_support/core_ext/module/attribute_accessors"
 
 module ActiveSupport
   module Testing
@@ -14,12 +15,15 @@ module ActiveSupport
         end
 
         def record(reporter, result)
+          raise DRb::DRbConnError if result.is_a?(DRb::DRbUnknown)
+
           reporter.synchronize do
             reporter.record(result)
           end
         end
 
         def <<(o)
+          o[2] = DRbObject.new(o[2]) if o
           @queue << o
         end
 
@@ -65,24 +69,29 @@ module ActiveSupport
       def start
         @pool = @queue_size.times.map do |worker|
           fork do
-            begin
-              DRb.stop_service
+            DRb.stop_service
 
-              after_fork(worker)
+            after_fork(worker)
 
-              queue = DRbObject.new_with_uri(@url)
+            queue = DRbObject.new_with_uri(@url)
 
-              while job = queue.pop
-                klass    = job[0]
-                method   = job[1]
-                reporter = job[2]
-                result   = Minitest.run_one_method(klass, method)
+            while job = queue.pop
+              klass    = job[0]
+              method   = job[1]
+              reporter = job[2]
+              result   = Minitest.run_one_method(klass, method)
 
+              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
-            ensure
-              run_cleanup(worker)
             end
+          ensure
+            run_cleanup(worker)
           end
         end
       end