kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Bump up minitest dependency and remove our own reinvented version of ParallelEach

Browse source
This commit is contained in:
Akira Matsuda 2013-02-19 00:08:16 +09:00
parent 57b0ae8011
commit 18c57c79ef
2 changed files with 2 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activesupport/activesupport.gemspec
View file

@ -23,6 +23,6 @@ Gem::Specification.new do |s|
s.add_dependency 'i18n', '~> 0.6'
s.add_dependency 'multi_json', '~> 1.3'
s.add_dependency 'tzinfo', '~> 0.3.33'
s.add_dependency 'minitest', '~> 4.1'
s.add_dependency 'minitest', '~> 4.2'
s.add_dependency 'thread_safe','~> 0.1'
end

38
activesupport/lib/active_support/testing/isolation.rb
View file

@ -1,8 +1,5 @@
require 'rbconfig'
begin
require 'minitest/parallel_each'
rescue LoadError
end
require 'minitest/parallel_each'
module ActiveSupport
module Testing
@ -48,39 +45,6 @@ module ActiveSupport
module Isolation
require 'thread'
# 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 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
end
def self.included(klass) #:nodoc:
klass.extend(Module.new {
def test_methods