1 files changed, 60 insertions, 63 deletions

diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb
index 8a0f453127..2c69bfde5b 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,73 +20,76 @@ module ActiveRecord
         end
       end
 
-      def test_active_connection?
-        assert !@pool.active_connection?
-        assert @pool.connection
-        assert @pool.active_connection?
-        @pool.release_connection
-        assert !@pool.active_connection?
+      def teardown
+        super
+        @pool.disconnect!
       end
 
-      def test_pool_caches_columns
-        columns = @pool.columns['posts']
-        assert_equal columns, @pool.columns['posts']
+      def test_full_pool_exception
+        assert_raises(PoolFullError) do
+          (@pool.size + 1).times do
+            @pool.checkout
+          end
+        end
       end
 
-      def test_pool_caches_columns_hash
-        columns_hash = @pool.columns_hash['posts']
-        assert_equal columns_hash, @pool.columns_hash['posts']
-      end
+      def test_reap_and_active
+        @pool.checkout
+        @pool.checkout
+        @pool.checkout
+        @pool.timeout = 0
 
-      def test_clearing_column_cache
-        @pool.columns['posts']
-        @pool.columns_hash['posts']
+        connections = @pool.connections.dup
 
-        @pool.clear_cache!
+        @pool.reap
 
-        assert_equal 0, @pool.columns.size
-        assert_equal 0, @pool.columns_hash.size
+        assert_equal connections.length, @pool.connections.length
       end
 
-      def test_primary_key
-        assert_equal 'id', @pool.primary_keys['posts']
-      end
+      def test_reap_inactive
+        @pool.checkout
+        @pool.checkout
+        @pool.checkout
+        @pool.timeout = 0
 
-      def test_primary_key_for_non_existent_table
-        assert_equal 'id', @pool.primary_keys['omgponies']
-      end
+        connections = @pool.connections.dup
+        connections.each do |conn|
+          conn.extend(Module.new { def active?; false; end; })
+        end
 
-      def test_primary_key_is_set_on_columns
-        posts_columns = @pool.columns_hash['posts']
-        assert posts_columns['id'].primary
+        @pool.reap
 
-        (posts_columns.keys - ['id']).each do |key|
-          assert !posts_columns[key].primary
-        end
+        assert_equal 0, @pool.connections.length
+      ensure
+        connections.each(&:close)
       end
 
-      def test_clear_stale_cached_connections!
-        pool = ConnectionPool.new ActiveRecord::Base.connection_pool.spec
-
-        threads = [
-          Thread.new { pool.connection },
-          Thread.new { pool.connection }]
+      def test_remove_connection
+        conn = @pool.checkout
+        assert conn.in_use?
 
-        threads.map { |t| t.join }
+        length = @pool.connections.length
+        @pool.remove conn
+        assert conn.in_use?
+        assert_equal(length - 1, @pool.connections.length)
+      ensure
+        conn.close
+      end
 
-        pool.extend Module.new {
-          attr_accessor :checkins
-          def checkin conn
-            @checkins << conn
-            conn.object_id
-          end
-        }
-        pool.checkins = []
+      def test_remove_connection_for_thread
+        conn = @pool.connection
+        @pool.remove conn
+        assert_not_equal(conn, @pool.connection)
+      ensure
+        conn.close if conn
+      end
 
-        cleared_threads = pool.clear_stale_cached_connections!
-        assert((cleared_threads - threads.map { |x| x.object_id }).empty?,
-               "threads should have been removed")
-        assert_equal pool.checkins.length, threads.length
+      def test_active_connection?
+        assert !@pool.active_connection?
+        assert @pool.connection
+        assert @pool.active_connection?
+        @pool.release_connection
+        assert !@pool.active_connection?
       end
 
       def test_checkout_behaviour
@@ -96,24 +101,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
-
-          pool.connection
-          threads.each do |t|
-            thread_ids = pool.instance_variable_get(:@reserved_connections).keys
-            assert !thread_ids.include?(t.object_id)
-          end
-        end.join()
-
+          assert pool.connection
+          pool.connection.close
+        end.join
       end
 
       def test_automatic_reconnect=