From 4db4f909174420904d48a9712e337b697d372ac3 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 17 Mar 2014 17:29:33 -0700 Subject: use a latch to avoid busy loops --- activerecord/test/cases/connection_pool_test.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb index 6300011f4a..c0d5e3707c 100644 --- a/activerecord/test/cases/connection_pool_test.rb +++ b/activerecord/test/cases/connection_pool_test.rb @@ -1,4 +1,5 @@ require "cases/helper" +require 'active_support/concurrency/latch' module ActiveRecord module ConnectionAdapters @@ -133,15 +134,15 @@ module ActiveRecord end def test_reap_inactive - ready = false + ready = ActiveSupport::Concurrency::Latch.new @pool.checkout child = Thread.new do @pool.checkout @pool.checkout - ready = true + ready.release Thread.stop end - Thread.pass until ready + ready.await assert_equal 3, active_connections(@pool).size -- cgit v1.2.3