aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-12-30 14:09:39 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2011-12-30 14:09:39 -0800
commit17ff88c4d425d7b55ff1a1225cb56f293e7dd7eb (patch)
treef0fbe92f3839351ef0b6e617bf43c0d198bd601c /activerecord/test/cases
parentbf9e6c7c9b231207deaf75e5b71290df77614dc8 (diff)
downloadrails-17ff88c4d425d7b55ff1a1225cb56f293e7dd7eb.tar.gz
rails-17ff88c4d425d7b55ff1a1225cb56f293e7dd7eb.tar.bz2
rails-17ff88c4d425d7b55ff1a1225cb56f293e7dd7eb.zip
connections can be removed from the pool
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/connection_pool_test.rb19
1 files changed, 19 insertions, 0 deletions
diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb
index 5b5bbc6500..d4d0f6258d 100644
--- a/activerecord/test/cases/connection_pool_test.rb
+++ b/activerecord/test/cases/connection_pool_test.rb
@@ -4,6 +4,8 @@ module ActiveRecord
module ConnectionAdapters
class ConnectionPoolTest < ActiveRecord::TestCase
def setup
+ super
+
# Keep a duplicate pool so we do not bother others
@pool = ConnectionPool.new ActiveRecord::Base.connection_pool.spec
@@ -18,6 +20,23 @@ module ActiveRecord
end
end
+ def teardown
+ super
+ @pool.connections.each(&:close)
+ end
+
+ def test_remove_connection
+ conn = @pool.checkout
+ assert conn.in_use?
+
+ length = @pool.connections.length
+ @pool.remove conn
+ assert conn.in_use?
+ assert_equal(length - 1, @pool.connections.length)
+ ensure
+ conn.close
+ end
+
def test_active_connection?
assert !@pool.active_connection?
assert @pool.connection