MiniTest already defines a ParallelEach class

This may or may not fix the intermittent railties failures we've been
seeing on the CI with Ruby 2.0. We'll see.

1 files changed, 27 insertions, 23 deletions

diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb
index aa87598926..f7a92ce03b 100644
--- a/activesupport/lib/active_support/testing/isolation.rb
+++ b/activesupport/lib/active_support/testing/isolation.rb
@@ -43,32 +43,36 @@ module ActiveSupport
     module Isolation
       require 'thread'
 
-      class ParallelEach
-        include Enumerable
-
-        # default to 2 cores
-        CORES = (ENV['TEST_CORES'] || 2).to_i
-
-        def initialize list
-          @list  = list
-          @queue = SizedQueue.new CORES
-        end
+      # Recent versions of MiniTest (such as the one shipped with Ruby 2.0) already define
+      # a ParallelEach class.
+      unless defined? ParallelEach
+        class ParallelEach
+          include Enumerable
+
+          # default to 2 cores
+          CORES = (ENV['TEST_CORES'] || 2).to_i
+
+          def initialize list
+            @list  = list
+            @queue = SizedQueue.new CORES
+          end
 
-        def grep pattern
-          self.class.new super
-        end
+          def grep pattern
+            self.class.new super
+          end
 
-        def each
-          threads = CORES.times.map {
-            Thread.new {
-              while job = @queue.pop
-                yield job
-              end
+          def each
+            threads = CORES.times.map {
+              Thread.new {
+                while job = @queue.pop
+                  yield job
+                end
+              }
             }
-          }
-          @list.each { |i| @queue << i }
-          CORES.times { @queue << nil }
-          threads.each(&:join)
+            @list.each { |i| @queue << i }
+            CORES.times { @queue << nil }
+            threads.each(&:join)
+          end
         end
       end