aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRobin Dupret <robin.dupret@gmail.com>2015-02-27 14:16:48 +0100
committerRobin Dupret <robin.dupret@gmail.com>2015-03-02 14:05:07 +0100
commit022c8be2cfee97b76c38e5134aa223f62938d6bf (patch)
tree868a5d52d5cf6afaa5bf232fb828066be138a4b8 /actionpack
parent9f4210cd80f452685b44c198d5a361ee2b54c05e (diff)
downloadrails-022c8be2cfee97b76c38e5134aa223f62938d6bf.tar.gz
rails-022c8be2cfee97b76c38e5134aa223f62938d6bf.tar.bz2
rails-022c8be2cfee97b76c38e5134aa223f62938d6bf.zip
Avoid parallelizing Action Pack's tests on Rubinius
Since the `ForkingExecutor` class seems to be pretty slow on Rubinius due to DRb (c.f. http://git.io/xIVg), let's avoid running tests with it on this platform. Also, the `parallelize_me!` call make the suite to output a bunch of errors due to rubinius/rubinius#2934 since there are thread-safety problems with autoloading.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/abstract_unit.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 918589f916..f5dd9d76af 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -95,7 +95,7 @@ end
module ActiveSupport
class TestCase
include ActionDispatch::DrawOnce
- if ActiveSupport::Testing::Isolation.forking_env? && PROCESS_COUNT > 0
+ if RUBY_ENGINE == "ruby" && PROCESS_COUNT > 0
parallelize_me!
end
end
@@ -479,7 +479,7 @@ class ForkingExecutor
end
end
-if ActiveSupport::Testing::Isolation.forking_env? && PROCESS_COUNT > 0
+if RUBY_ENGINE == "ruby" && PROCESS_COUNT > 0
# Use N processes (N defaults to 4)
Minitest.parallel_executor = ForkingExecutor.new(PROCESS_COUNT)
end