diff options
author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2018-02-16 08:09:02 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-16 08:09:02 -0500 |
commit | 7286d81312be3be925e6ba35823daa9910c6ab46 (patch) | |
tree | 4c489fef54f52b79daf28dbe94ee8b8215665c77 /activerecord/lib/active_record/fixtures.rb | |
parent | 23c5558f37c2c55807e7603415214f2b4b7b22c1 (diff) | |
parent | 26821d9b572815a39c8ecb2e19375b2abff68730 (diff) | |
download | rails-7286d81312be3be925e6ba35823daa9910c6ab46.tar.gz rails-7286d81312be3be925e6ba35823daa9910c6ab46.tar.bz2 rails-7286d81312be3be925e6ba35823daa9910c6ab46.zip |
Merge pull request #31900 from eileencodes/parallel-testing
Parallel testing
Diffstat (limited to 'activerecord/lib/active_record/fixtures.rb')
-rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index d9a75d9ad6..8f022ff7a7 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -874,6 +874,7 @@ module ActiveRecord class_attribute :use_instantiated_fixtures, default: false # true, false, or :no_instances class_attribute :pre_loaded_fixtures, default: false class_attribute :config, default: ActiveRecord::Base + class_attribute :lock_threads, default: true end module ClassMethods @@ -973,7 +974,7 @@ module ActiveRecord @fixture_connections = enlist_fixture_connections @fixture_connections.each do |connection| connection.begin_transaction joinable: false - connection.pool.lock_thread = true + connection.pool.lock_thread = true if lock_threads end # When connections are established in the future, begin a transaction too @@ -989,7 +990,7 @@ module ActiveRecord if connection && !@fixture_connections.include?(connection) connection.begin_transaction joinable: false - connection.pool.lock_thread = true + connection.pool.lock_thread = true if lock_threads @fixture_connections << connection end end |