aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/locking_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/test/locking_test.rb')
-rw-r--r--activerecord/test/locking_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/locking_test.rb b/activerecord/test/locking_test.rb
index 35c557e19d..8ddfb2289c 100644
--- a/activerecord/test/locking_test.rb
+++ b/activerecord/test/locking_test.rb
@@ -108,7 +108,7 @@ class PessimisticLockingTest < Test::Unit::TestCase
end
end
- if current_adapter?(:PostgreSQLAdapter)
+ if current_adapter?(:PostgreSQLAdapter, :OracleAdapter)
def test_no_locks_no_wait
first, second = duel { Person.find 1 }
assert first.end > second.end
@@ -120,7 +120,7 @@ class PessimisticLockingTest < Test::Unit::TestCase
end
protected
- def duel(zzz = 0.2)
+ def duel(zzz = 1.0)
t0, t1, t2, t3 = nil, nil, nil, nil
a = Thread.new do