diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-03-17 17:29:33 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-03-17 17:29:33 -0700 |
| commit | 4db4f909174420904d48a9712e337b697d372ac3 (patch) | |
| tree | 06ddb86696d868fc62362bb463623818323ac2f5 | |
| parent | 8f218266bb4fa4ef2a07904b106c72fda9e182a6 (diff) | |
| download | rails-4db4f909174420904d48a9712e337b697d372ac3.tar.gz rails-4db4f909174420904d48a9712e337b697d372ac3.tar.bz2 rails-4db4f909174420904d48a9712e337b697d372ac3.zip | |
use a latch to avoid busy loops
| -rw-r--r-- | activerecord/test/cases/connection_pool_test.rb | 7 |
1 files 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 |