diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2016-08-04 14:39:09 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2016-08-04 14:39:09 -0700 |
| commit | ac76d551ce1dbb829d521a57a4000b8ce49418f2 (patch) | |
| tree | 78b3269ea652c8dcb7132140cdf6bce237e0ada5 /activerecord/test/cases/adapters | |
| parent | 4f5a9890b70a426909a40ade94a013f5253b0421 (diff) | |
| download | rails-ac76d551ce1dbb829d521a57a4000b8ce49418f2.tar.gz rails-ac76d551ce1dbb829d521a57a4000b8ce49418f2.tar.bz2 rails-ac76d551ce1dbb829d521a57a4000b8ce49418f2.zip | |
The problem isn't the detection but the deadlock itself
Diffstat (limited to 'activerecord/test/cases/adapters')
| -rw-r--r-- | activerecord/test/cases/adapters/mysql2/transaction_test.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/adapters/postgresql/transaction_test.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/transaction_test.rb b/activerecord/test/cases/adapters/mysql2/transaction_test.rb index 1a88b9cbca..5d8765d63a 100644 --- a/activerecord/test/cases/adapters/mysql2/transaction_test.rb +++ b/activerecord/test/cases/adapters/mysql2/transaction_test.rb @@ -27,8 +27,8 @@ module ActiveRecord @connection.drop_table 'samples', if_exists: true end - test "raises DeadlockDetected when a deadlock is encountered" do - assert_raises(ActiveRecord::DeadlockDetected) do + test "raises Deadlocked when a deadlock is encountered" do + assert_raises(ActiveRecord::Deadlocked) do s1 = Sample.create value: 1 s2 = Sample.create value: 2 diff --git a/activerecord/test/cases/adapters/postgresql/transaction_test.rb b/activerecord/test/cases/adapters/postgresql/transaction_test.rb index 87d1fffe19..8dea92c785 100644 --- a/activerecord/test/cases/adapters/postgresql/transaction_test.rb +++ b/activerecord/test/cases/adapters/postgresql/transaction_test.rb @@ -58,9 +58,9 @@ module ActiveRecord end end - test "raises DeadlockDetected when a deadlock is encountered" do + test "raises Deadlocked when a deadlock is encountered" do with_warning_suppression do - assert_raises(ActiveRecord::DeadlockDetected) do + assert_raises(ActiveRecord::Deadlocked) do s1 = Sample.create value: 1 s2 = Sample.create value: 2 |