Permalink
Browse files

Skip pg locking test due to connection checkout deadlock detection

  • Loading branch information...
jeremy committed Nov 14, 2009
1 parent 7eb4f2e commit f0f4dffd3b469c0f4ba743c960110e8663955436
Showing with 8 additions and 5 deletions.
  1. +8 −5 activerecord/test/cases/locking_test.rb
@@ -282,11 +282,14 @@ def test_no_locks_no_wait
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

0 comments on commit f0f4dff

Please sign in to comment.