1 files changed, 28 insertions, 22 deletions

diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb
index cc9b2a45f4..82b3c36ed2 100644
--- a/activerecord/test/cases/connection_pool_test.rb
+++ b/activerecord/test/cases/connection_pool_test.rb
@@ -1,25 +1,31 @@
 require "cases/helper"
 
-class ConnectionManagementTest < ActiveRecord::TestCase
-  def setup
-    @env = {}
-    @app = stub('App')
-    @management = ActiveRecord::ConnectionAdapters::ConnectionManagement.new(@app)
-    
-    @connections_cleared = false
-    ActiveRecord::Base.stubs(:clear_active_connections!).with { @connections_cleared = true }
-  end
-  
-  test "clears active connections after each call" do
-    @app.expects(:call).with(@env)
-    @management.call(@env)
-    assert @connections_cleared
-  end
-  
-  test "doesn't clear active connections when running in a test case" do
-    @env['rack.test'] = true
-    @app.expects(:call).with(@env)
-    @management.call(@env)
-    assert !@connections_cleared
+module ActiveRecord
+  module ConnectionAdapters
+    class ConnectionPoolTest < ActiveRecord::TestCase
+      def test_clear_stale_cached_connections!
+        pool = ConnectionPool.new ActiveRecord::Base.connection_pool.spec
+
+        threads = [
+          Thread.new { pool.connection },
+          Thread.new { pool.connection }]
+
+        threads.map { |t| t.join }
+
+        pool.extend Module.new {
+          attr_accessor :checkins
+          def checkin conn
+            @checkins << conn
+            conn.object_id
+          end
+        }
+        pool.checkins = []
+
+        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
+      end
+    end
   end
-end
\ No newline at end of file
+end