aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-12-30 11:37:21 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2011-12-30 11:37:21 -0800
commit6769293988c0d7733138a562aaa683375cbdcb78 (patch)
treeaa367428777c10e792384b79e81a712785393722 /activerecord/test/cases
parent7c55d6977c68041d34cb657f90f92773d3fd64e3 (diff)
downloadrails-6769293988c0d7733138a562aaa683375cbdcb78.tar.gz
rails-6769293988c0d7733138a562aaa683375cbdcb78.tar.bz2
rails-6769293988c0d7733138a562aaa683375cbdcb78.zip
connections must be checked in at the end of a thread
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/connection_pool_test.rb17
1 files changed, 3 insertions, 14 deletions
diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb
index d170a13b23..5b5bbc6500 100644
--- a/activerecord/test/cases/connection_pool_test.rb
+++ b/activerecord/test/cases/connection_pool_test.rb
@@ -35,27 +35,16 @@ module ActiveRecord
threads << Thread.new(i) do |pool_count|
connection = pool.connection
assert_not_nil connection
+ connection.close
end
end
- threads.each {|t| t.join}
+ threads.each(&:join)
Thread.new do
- threads.each do |t|
- thread_ids = pool.instance_variable_get(:@reserved_connections).keys
- assert thread_ids.include?(t.object_id)
- end
-
- assert_deprecated do
- pool.connection
- end
- threads.each do |t|
- thread_ids = pool.instance_variable_get(:@reserved_connections).keys
- assert !thread_ids.include?(t.object_id)
- end
+ assert pool.connection
pool.connection.close
end.join
-
end
def test_automatic_reconnect=