aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/adapters/mysql2
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-11-11 19:53:40 +0900
committerRyuta Kamizono <kamipo@gmail.com>2017-11-11 19:53:40 +0900
commit4a65dfcb9adae8fb12a86521c1a34b392e6084c2 (patch)
treeb5c97722ffc168327b5fc594a1c8620b5437edcd /activerecord/test/cases/adapters/mysql2
parentee5cf14ab06c366b37a6339f2af7c41457b3557b (diff)
downloadrails-4a65dfcb9adae8fb12a86521c1a34b392e6084c2.tar.gz
rails-4a65dfcb9adae8fb12a86521c1a34b392e6084c2.tar.bz2
rails-4a65dfcb9adae8fb12a86521c1a34b392e6084c2.zip
Raise `TransactionTimeout` when lock wait timeout exceeded for PG adapter
Follow up of #30360.
Diffstat (limited to 'activerecord/test/cases/adapters/mysql2')
-rw-r--r--activerecord/test/cases/adapters/mysql2/transaction_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/transaction_test.rb b/activerecord/test/cases/adapters/mysql2/transaction_test.rb
index 7b032fed6d..ac9a8d9dfb 100644
--- a/activerecord/test/cases/adapters/mysql2/transaction_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/transaction_test.rb
@@ -60,7 +60,7 @@ module ActiveRecord
end
end
- test "raises TransactionTimeout when mysql raises ER_LOCK_WAIT_TIMEOUT" do
+ test "raises TransactionTimeout when lock wait timeout exceeded" do
assert_raises(ActiveRecord::TransactionTimeout) do
s = Sample.create!(value: 1)
latch1 = Concurrent::CountDownLatch.new