diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-14 01:22:36 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-14 01:22:36 -0800 |
| commit | f0f4dffd3b469c0f4ba743c960110e8663955436 (patch) | |
| tree | bd81b37ab6f4ac96c8c11b27626f570ce43e49cc /activerecord/test/cases | |
| parent | 7eb4f2ecc53831d850682d88634ccf41676e40a2 (diff) | |
| download | rails-f0f4dffd3b469c0f4ba743c960110e8663955436.tar.gz rails-f0f4dffd3b469c0f4ba743c960110e8663955436.tar.bz2 rails-f0f4dffd3b469c0f4ba743c960110e8663955436.zip | |
Skip pg locking test due to connection checkout deadlock detection
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/locking_test.rb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb index e177235591..7e51526370 100644 --- a/activerecord/test/cases/locking_test.rb +++ b/activerecord/test/cases/locking_test.rb @@ -282,11 +282,14 @@ unless current_adapter?(:SybaseAdapter, :OpenBaseAdapter) assert first.end > second.end end - def test_second_lock_waits - assert [0.2, 1, 5].any? { |zzz| - first, second = duel(zzz) { Person.find 1, :lock => true } - second.end > first.end - } + # Hit by ruby deadlock detection since connection checkout is mutexed. + if RUBY_VERSION < '1.9.2' + def test_second_lock_waits + assert [0.2, 1, 5].any? { |zzz| + first, second = duel(zzz) { Person.find 1, :lock => true } + second.end > first.end + } + end end protected |