run railties tests in parallel, default to 2 cores

2 files changed, 39 insertions, 2 deletions

diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb
index 1a0681e850..43cb16aefa 100644
--- a/activesupport/lib/active_support/testing/isolation.rb
+++ b/activesupport/lib/active_support/testing/isolation.rb
@@ -33,6 +33,45 @@ module ActiveSupport
     end
 
     module Isolation
+      require 'thread'
+
+      class ParallelEach
+        include Enumerable
+
+        # default to 2 cores
+        CORES = ENV['TEST_CORES'] || 2
+
+        def initialize list
+          @list  = list
+          @queue = SizedQueue.new CORES
+        end
+
+        def grep pattern
+          self.class.new super
+        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)
+        end
+      end
+
+      def self.included klass
+        klass.extend(Module.new {
+          def test_methods
+            ParallelEach.new super
+          end
+        })
+      end
+
       def self.forking_env?
         !ENV["NO_FORK"] && ((RbConfig::CONFIG['host_os'] !~ /mswin|mingw/) && (RUBY_PLATFORM !~ /java/))
       end
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 32deb143b0..800b1c90f0 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -23,8 +23,6 @@ require 'tmpdir'
 
 module TestHelpers
   module Paths
-    module_function
-
     def app_template_path
       File.join Dir.tmpdir, 'app_template'
     end