diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-08 20:35:56 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-08 20:35:56 +0000 |
| commit | 2a12b56841bd6fd3998050e7677a1b2c08257479 (patch) | |
| tree | 4fcd51578ac322228b2f6a44ce2344ab309992aa /activerecord/test/locking_test.rb | |
| parent | 71234daef1517cf190adfc5978e56882d2a57ea6 (diff) | |
| download | rails-2a12b56841bd6fd3998050e7677a1b2c08257479.tar.gz rails-2a12b56841bd6fd3998050e7677a1b2c08257479.tar.bz2 rails-2a12b56841bd6fd3998050e7677a1b2c08257479.zip | |
r4704@asus: jeremy | 2006-06-27 12:00:19 -0700
decimal
r4705@asus: jeremy | 2006-06-27 12:20:47 -0700
current_adapter? checks whether any of its arguments is the name of the current adapter class
r4834@asus: jeremy | 2006-07-08 13:08:24 -0700
Room to float.
r4835@asus: jeremy | 2006-07-08 13:09:18 -0700
Give lock test a few chances.
r4836@asus: jeremy | 2006-07-08 13:12:05 -0700
Numeric and decimal columns map to BigDecimal instead of Float. Those with scale 0 map to Integer. Closes #5454.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4596 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/locking_test.rb')
| -rw-r--r-- | activerecord/test/locking_test.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/activerecord/test/locking_test.rb b/activerecord/test/locking_test.rb index 8ddfb2289c..58c34a69e3 100644 --- a/activerecord/test/locking_test.rb +++ b/activerecord/test/locking_test.rb @@ -115,12 +115,14 @@ class PessimisticLockingTest < Test::Unit::TestCase end def test_second_lock_waits - first, second = duel { Person.find 1, :lock => true } - assert second.end > first.end + assert [0.2, 1, 5].any? { |zzz| + first, second = duel(zzz) { Person.find 1, :lock => true } + second.end > first.end + } end protected - def duel(zzz = 1.0) + def duel(zzz = 5) t0, t1, t2, t3 = nil, nil, nil, nil a = Thread.new do |