diff options
author | José Valim <jose.valim@gmail.com> | 2011-12-20 11:34:12 -0800 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-12-20 11:34:12 -0800 |
commit | 635080f33cdcbfb5a8dd85830eaef85f1555d93c (patch) | |
tree | 663b0f5a5cf0b55ad0aa678ab7ea2cbcf98f1a61 | |
parent | d4f539850936a505194557fdcc4a403855b3e780 (diff) | |
parent | c056787d5de2f3fb5c050c432d3eff3cdade09a3 (diff) | |
download | rails-635080f33cdcbfb5a8dd85830eaef85f1555d93c.tar.gz rails-635080f33cdcbfb5a8dd85830eaef85f1555d93c.tar.bz2 rails-635080f33cdcbfb5a8dd85830eaef85f1555d93c.zip |
Merge pull request #4078 from Karunakar/fix_failing_test
remove more uses of deprecated loggers
-rw-r--r-- | activerecord/test/cases/base_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index 1012bfbd94..e34b0f655e 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -1914,7 +1914,7 @@ class BasicsTest < ActiveRecord::TestCase def test_benchmark_with_log_level original_logger = ActiveRecord::Base.logger log = StringIO.new - ActiveRecord::Base.logger = Logger.new(log) + ActiveRecord::Base.logger = ActiveSupport::Logger.new(log) ActiveRecord::Base.logger.level = Logger::WARN ActiveRecord::Base.benchmark("Debug Topic Count", :level => :debug) { Topic.count } ActiveRecord::Base.benchmark("Warn Topic Count", :level => :warn) { Topic.count } @@ -1929,7 +1929,7 @@ class BasicsTest < ActiveRecord::TestCase def test_benchmark_with_use_silence original_logger = ActiveRecord::Base.logger log = StringIO.new - ActiveRecord::Base.logger = Logger.new(log) + ActiveRecord::Base.logger = ActiveSupport::Logger.new(log) ActiveRecord::Base.benchmark("Logging", :level => :debug, :silence => false) { ActiveRecord::Base.logger.debug "Quiet" } assert_match(/Quiet/, log.string) ensure |