aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-05-21 10:29:01 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-05-21 10:29:01 -0700
commitd2901f0fc4270a765717ad572d559dc49a56b3a8 (patch)
tree94a6b5bee486e702b7380f70f0003f53f7438fe5 /activerecord/test/cases/connection_adapters/abstract_adapter_test.rb
parent525839fdd8cc34d6d524f204528d5b6f36fe410c (diff)
parentd06674d5dfcecb6355890020ee2245b6e87b07e4 (diff)
downloadrails-d2901f0fc4270a765717ad572d559dc49a56b3a8.tar.gz
rails-d2901f0fc4270a765717ad572d559dc49a56b3a8.tar.bz2
rails-d2901f0fc4270a765717ad572d559dc49a56b3a8.zip
Merge pull request #6416 from pmahoney/threadsafe-connection-pool
Make connection pool fair with respect to waiting threads.
Diffstat (limited to 'activerecord/test/cases/connection_adapters/abstract_adapter_test.rb')
-rw-r--r--activerecord/test/cases/connection_adapters/abstract_adapter_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb b/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb
index 7dc6e8afcb..3e3d6e2769 100644
--- a/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb
+++ b/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb
@@ -36,7 +36,7 @@ module ActiveRecord
def test_close
pool = ConnectionPool.new(ConnectionSpecification.new({}, nil))
- pool.connections << adapter
+ pool.insert_connection_for_test! adapter
adapter.pool = pool
# Make sure the pool marks the connection in use