aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/adapters/mysql/connection_test.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-11-15 11:29:12 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2013-11-15 11:29:12 -0800
commit314e2cc05b6cad93b6e8a3414b2c0106174239be (patch)
treeddcfbe280bfad2407cd3dfc5e9774fc30031e5fb /activerecord/test/cases/adapters/mysql/connection_test.rb
parent8c66623627277df9dcc3c6215d369d2c50775cc1 (diff)
parent2b0406cedb61c4c2f74ecca61fc07771e911fd35 (diff)
downloadrails-314e2cc05b6cad93b6e8a3414b2c0106174239be.tar.gz
rails-314e2cc05b6cad93b6e8a3414b2c0106174239be.tar.bz2
rails-314e2cc05b6cad93b6e8a3414b2c0106174239be.zip
Merge pull request #12779 from dougbarth/dont_swallow_exceptions_during_transactional_statements_in_mysql
Don't swallow exceptions in transctional statements
Diffstat (limited to 'activerecord/test/cases/adapters/mysql/connection_test.rb')
-rw-r--r--activerecord/test/cases/adapters/mysql/connection_test.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/test/cases/adapters/mysql/connection_test.rb b/activerecord/test/cases/adapters/mysql/connection_test.rb
index a61d61eef7..a1b41b6991 100644
--- a/activerecord/test/cases/adapters/mysql/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql/connection_test.rb
@@ -40,6 +40,11 @@ class MysqlConnectionTest < ActiveRecord::TestCase
@connection.update('set @@wait_timeout=1')
sleep 2
assert !@connection.active?
+
+ # Repair all fixture connections so other tests won't break.
+ @fixture_connections.each do |c|
+ c.verify!
+ end
end
def test_successful_reconnection_after_timeout_with_manual_reconnect