diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-08-22 19:25:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-22 19:25:20 -0400 |
| commit | 80ccfec0740a32fa3a8c0d52549e5b7c59db1a02 (patch) | |
| tree | 0d5907ff0da6d3d0cd30a876e974ba840cb437e8 /activerecord/test/cases/adapters | |
| parent | 03556079efb01836ef5a18ff60e9920550e0fdcf (diff) | |
| parent | c5edd97721aeaa4ceaa11e66327842a0aba1fdf7 (diff) | |
| download | rails-80ccfec0740a32fa3a8c0d52549e5b7c59db1a02.tar.gz rails-80ccfec0740a32fa3a8c0d52549e5b7c59db1a02.tar.bz2 rails-80ccfec0740a32fa3a8c0d52549e5b7c59db1a02.zip | |
Merge pull request #30360 from gcourtemanche/transaction_timedout
Add TransactionTimeout for MySQL error code 1205
Diffstat (limited to 'activerecord/test/cases/adapters')
| -rw-r--r-- | activerecord/test/cases/adapters/mysql2/transaction_test.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/transaction_test.rb b/activerecord/test/cases/adapters/mysql2/transaction_test.rb index e603baab69..25d9f69a89 100644 --- a/activerecord/test/cases/adapters/mysql2/transaction_test.rb +++ b/activerecord/test/cases/adapters/mysql2/transaction_test.rb @@ -59,5 +59,11 @@ module ActiveRecord end end end + + test "raises TransactionTimeout when mysql raises ER_LOCK_WAIT_TIMEOUT" do + assert_raises(ActiveRecord::TransactionTimeout) do + ActiveRecord::Base.connection.execute("SIGNAL SQLSTATE 'HY000' SET MESSAGE_TEXT = 'Testing error', MYSQL_ERRNO = 1205;") + end + end end end |