Reset ActiveRecord::Migration.verbose to the value before

2 files changed, 5 insertions, 2 deletions

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 034a0f567e..0fed0a862f 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -34,7 +34,7 @@ class MigrationTest < ActiveRecord::TestCase
       Reminder.connection.drop_table(table) rescue nil
     end
     Reminder.reset_column_information
-    ActiveRecord::Migration.verbose = true
+    @verbose_was, ActiveRecord::Migration.verbose = ActiveRecord::Migration.verbose, true
     ActiveRecord::Migration.message_count = 0
     ActiveRecord::Base.connection.schema_cache.clear!
   end
@@ -65,6 +65,8 @@ class MigrationTest < ActiveRecord::TestCase
     Person.connection.remove_column("people", "middle_name") rescue nil
     Person.connection.add_column("people", "first_name", :string)
     Person.reset_column_information
+
+    ActiveRecord::Migration.verbose = @verbose_was
   end
 
   def test_migrator_versions
diff --git a/activerecord/test/cases/migrator_test.rb b/activerecord/test/cases/migrator_test.rb
index bf9e35a80b..a9e4a4d058 100644
--- a/activerecord/test/cases/migrator_test.rb
+++ b/activerecord/test/cases/migrator_test.rb
@@ -23,11 +23,12 @@ class MigratorTest < ActiveRecord::TestCase
     super
     ActiveRecord::SchemaMigration.create_table
     ActiveRecord::SchemaMigration.delete_all rescue nil
+    @verbose_was = ActiveRecord::Migration.verbose
   end
 
   teardown do
     ActiveRecord::SchemaMigration.delete_all rescue nil
-    ActiveRecord::Migration.verbose = true
+    ActiveRecord::Migration.verbose = @verbose_was
   end
 
   def test_migrator_with_duplicate_names