1 files changed, 20 insertions, 13 deletions
diff --git a/activesupport/lib/active_support/testing/parallelization.rb b/activesupport/lib/active_support/testing/parallelization.rb
index 59c8486f41..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,37 +15,36 @@ 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
 
         def pop; @queue.pop; end
       end
 
-      @after_fork_hooks = []
+      @@after_fork_hooks = []
 
       def self.after_fork_hook(&blk)
-        @after_fork_hooks << blk
+        @@after_fork_hooks << blk
       end
 
-      def self.after_fork_hooks
-        @after_fork_hooks
-      end
+      cattr_reader :after_fork_hooks
 
-      @run_cleanup_hooks = []
+      @@run_cleanup_hooks = []
 
       def self.run_cleanup_hook(&blk)
-        @run_cleanup_hooks << blk
+        @@run_cleanup_hooks << blk
       end
 
-      def self.run_cleanup_hooks
-        @run_cleanup_hooks
-      end
+      cattr_reader :run_cleanup_hooks
 
       def initialize(queue_size)
         @queue_size = queue_size
@@ -81,9 +81,16 @@ 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)
           end
         end