From 8e2c0803f5e114f74ce0e8acc44ae43da97175e3 Mon Sep 17 00:00:00 2001 From: schneems Date: Tue, 24 Dec 2013 17:28:40 -0500 Subject: Move mysql2 test for when adapter will be loaded When run with only the Mysql adapter, we get this failure: https://travis-ci.org/rails/rails/jobs/15937907#L2416 Porting the test over to only run when mysql2 is loaded --- activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb | 7 ------- activerecord/test/cases/adapters/mysql2/connection_test.rb | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb index a8b5cfb0cd..a85f3d4298 100644 --- a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb +++ b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb @@ -23,13 +23,6 @@ module ActiveRecord end end - def test_bad_connection_mysql2 - assert_raise ActiveRecord::NoDatabaseError do - connection = ActiveRecord::Base.mysql2_connection(adapter: "mysql2", database: "should_not_exist-cinco-dog-db") - connection.exec_query('drop table if exists ex') - end - end - def test_valid_column column = @conn.columns('ex').find { |col| col.name == 'id' } assert @conn.valid_type?(column.type) diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb index 8dc1df1851..91b780a7ee 100644 --- a/activerecord/test/cases/adapters/mysql2/connection_test.rb +++ b/activerecord/test/cases/adapters/mysql2/connection_test.rb @@ -13,6 +13,13 @@ class MysqlConnectionTest < ActiveRecord::TestCase super end + def test_bad_connection + assert_raise ActiveRecord::NoDatabaseError do + connection = ActiveRecord::Base.mysql2_connection(adapter: "mysql2", database: "should_not_exist-cinco-dog-db") + connection.exec_query('drop table if exists ex') + end + end + def test_no_automatic_reconnection_after_timeout assert @connection.active? @connection.update('set @@wait_timeout=1') -- cgit v1.2.3