diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2016-08-04 15:57:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-04 15:57:34 -0700 |
| commit | 320d40123ab0befe248373aab8ac2e2a3dec33cd (patch) | |
| tree | 5c5343b99cb0d08147f2d869ee1ffb04e112971c /activerecord/test | |
| parent | 01a69e27a4e55504af8fe776826d659550e6f89e (diff) | |
| parent | 7443a332a74d7e77f2a4fa2b1e9118da08351121 (diff) | |
| download | rails-320d40123ab0befe248373aab8ac2e2a3dec33cd.tar.gz rails-320d40123ab0befe248373aab8ac2e2a3dec33cd.tar.bz2 rails-320d40123ab0befe248373aab8ac2e2a3dec33cd.zip | |
Merge pull request #26059 from rails/rename-deadlock-detected-to-deadlocked
The problem isn't the detection but the deadlock itself
Diffstat (limited to 'activerecord/test')
| -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 |