aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-11-15 10:28:48 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-11-15 10:28:58 -0800
commit7601d482bd187bdd06d3aa7ac1e8c7bb805f40a3 (patch)
tree41f7e04c43e5f104f981ed89a101163ca13783f1
parentcc011bc2bef98bf8b1dc78351f243af7ad641269 (diff)
downloadrails-7601d482bd187bdd06d3aa7ac1e8c7bb805f40a3.tar.gz
rails-7601d482bd187bdd06d3aa7ac1e8c7bb805f40a3.tar.bz2
rails-7601d482bd187bdd06d3aa7ac1e8c7bb805f40a3.zip
Ruby 1.9: skip pg locking test for 1.9.1 also
-rw-r--r--activerecord/test/cases/locking_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb
index 7e51526370..f946e8699e 100644
--- a/activerecord/test/cases/locking_test.rb
+++ b/activerecord/test/cases/locking_test.rb
@@ -283,7 +283,7 @@ unless current_adapter?(:SybaseAdapter, :OpenBaseAdapter)
end
# Hit by ruby deadlock detection since connection checkout is mutexed.
- if RUBY_VERSION < '1.9.2'
+ if RUBY_VERSION < '1.9.0'
def test_second_lock_waits
assert [0.2, 1, 5].any? { |zzz|
first, second = duel(zzz) { Person.find 1, :lock => true }