aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-07-17 13:10:08 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-07-17 14:04:55 -0700
commitd548a36c8f9ebebe16446022c1efea471aa3296b (patch)
tree57b275c9a26ea95962ef353f4bdeba5d7442271e /actionpack/test
parent15fd96a06735e13b625ad396d86d9053d7d98a2c (diff)
downloadrails-d548a36c8f9ebebe16446022c1efea471aa3296b.tar.gz
rails-d548a36c8f9ebebe16446022c1efea471aa3296b.tar.bz2
rails-d548a36c8f9ebebe16446022c1efea471aa3296b.zip
only parallelize on forking systems
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/abstract_unit.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 472ac60a13..afc14b9be9 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -109,7 +109,7 @@ end
module ActiveSupport
class TestCase
include ActionDispatch::DrawOnce
- parallelize_me!
+ parallelize_me! if ActiveSupport::Testing::Isolation.forking_env?
end
end