aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/connection_pool_test.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-01-03 11:06:27 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-01-03 11:06:27 -0800
commit41be0fc3df4cc080df912ae87bd1c8503f2b348d (patch)
tree2b7b53bec848eb018648e5904c3be8f70f6e322e /activerecord/test/cases/connection_pool_test.rb
parent29f0f254d22af6a30bdde938d3087cdef1fd3527 (diff)
downloadrails-41be0fc3df4cc080df912ae87bd1c8503f2b348d.tar.gz
rails-41be0fc3df4cc080df912ae87bd1c8503f2b348d.tar.bz2
rails-41be0fc3df4cc080df912ae87bd1c8503f2b348d.zip
actually disconnect from the database at the end of each test
Diffstat (limited to 'activerecord/test/cases/connection_pool_test.rb')
-rw-r--r--activerecord/test/cases/connection_pool_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb
index 26842d3998..2c69bfde5b 100644
--- a/activerecord/test/cases/connection_pool_test.rb
+++ b/activerecord/test/cases/connection_pool_test.rb
@@ -22,7 +22,7 @@ module ActiveRecord
def teardown
super
- @pool.connections.each(&:close)
+ @pool.disconnect!
end
def test_full_pool_exception
@@ -81,7 +81,7 @@ module ActiveRecord
@pool.remove conn
assert_not_equal(conn, @pool.connection)
ensure
- conn.close
+ conn.close if conn
end
def test_active_connection?