diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-08 00:24:36 -0500 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-08 00:27:18 -0500 |
commit | dd77733f2fdb6dde2be7115fc31ad1dcbfccb5a1 (patch) | |
tree | 811d5568e5c4d2de4eb5f166987d8634723eacca /activerecord/test | |
parent | 7c73518ef7cc49a4bee317e89c850b87ea1dea93 (diff) | |
download | rails-dd77733f2fdb6dde2be7115fc31ad1dcbfccb5a1.tar.gz rails-dd77733f2fdb6dde2be7115fc31ad1dcbfccb5a1.tar.bz2 rails-dd77733f2fdb6dde2be7115fc31ad1dcbfccb5a1.zip |
Timeout the connection pool monitor on ruby 1.8 only
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/cases/pooled_connections_test.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/activerecord/test/cases/pooled_connections_test.rb b/activerecord/test/cases/pooled_connections_test.rb index 36b45868b9..2a5e9509b3 100644 --- a/activerecord/test/cases/pooled_connections_test.rb +++ b/activerecord/test/cases/pooled_connections_test.rb @@ -28,10 +28,13 @@ class PooledConnectionsTest < ActiveRecord::TestCase end end - def test_pooled_connection_checkout - checkout_connections - assert_equal @connections.length, 2 - assert_equal @timed_out, 2 + # Will deadlock due to lack of Monitor timeouts in 1.9 + if RUBY_VERSION < '1.9' + def test_pooled_connection_checkout + checkout_connections + assert_equal @connections.length, 2 + assert_equal @timed_out, 2 + end end def checkout_checkin_connections(pool_size, threads) |