diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-07 10:48:43 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-07 10:48:43 +0000 |
| commit | c4782f7393029eeacc599a7921939744d1fe22cd (patch) | |
| tree | 54218c45c6b055f2deafa6372fdc2fe87de5515a /activerecord/test/locking_test.rb | |
| parent | 044f960fd35a93159d1e0278124109dd74107670 (diff) | |
| download | rails-c4782f7393029eeacc599a7921939744d1fe22cd.tar.gz rails-c4782f7393029eeacc599a7921939744d1fe22cd.tar.bz2 rails-c4782f7393029eeacc599a7921939744d1fe22cd.zip | |
More succinct current_adapter? Enable locking duel for Oracle.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4576 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/locking_test.rb')
| -rw-r--r-- | activerecord/test/locking_test.rb | 4 |
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 |