* ActiveSupport::BufferedLogger#silence is deprecated. If you want to squelch

    logs for a certain block, change the log level for that block.

*   ActiveSupport::BufferedLogger#open_log is deprecated.  This method should
    not have been public in the first place.

*   ActiveSupport::BufferedLogger's behavior of automatically creating the
    directory for your log file is deprecated.  Please make sure to create the
    directory for your log file before instantiating.

*   ActiveSupport::BufferedLogger#auto_flushing is deprecated.  Either set the
    sync level on the underlying file handle like this:

        f = File.open('foo.log', 'w')
        f.sync = true
        ActiveSupport::BufferedLogger.new f

    Or tune your filesystem.  The FS cache is now what controls flushing.

*   ActiveSupport::BufferedLogger#flush is deprecated.  Set sync on your
    filehandle, or tune your filesystem.

1 files changed, 12 insertions, 127 deletions

diff --git a/activesupport/test/buffered_logger_test.rb b/activesupport/test/buffered_logger_test.rb
index 386006677b..c818235fc0 100644
--- a/activesupport/test/buffered_logger_test.rb
+++ b/activesupport/test/buffered_logger_test.rb
@@ -7,6 +7,7 @@ require 'active_support/buffered_logger'
 
 class BufferedLoggerTest < Test::Unit::TestCase
   include MultibyteTestHelpers
+  include ActiveSupport::Testing::Deprecation
 
   Logger = ActiveSupport::BufferedLogger
 
@@ -23,7 +24,10 @@ class BufferedLoggerTest < Test::Unit::TestCase
     t.write 'hi mom!'
     t.close
 
-    logger = Logger.new t.path
+    f = File.open(t.path, 'w')
+    f.binmode
+
+    logger = Logger.new f
     logger.level = Logger::DEBUG
 
     str = "\x80"
@@ -32,7 +36,6 @@ class BufferedLoggerTest < Test::Unit::TestCase
     end
 
     logger.add Logger::DEBUG, str
-    logger.flush
   ensure
     logger.close
     t.close true
@@ -40,7 +43,10 @@ class BufferedLoggerTest < Test::Unit::TestCase
 
   def test_write_binary_data_create_file
     fname = File.join Dir.tmpdir, 'lol', 'rofl.log'
-    logger = Logger.new fname
+    f = File.open(fname, 'w')
+    f.binmode
+
+    logger = Logger.new f
     logger.level = Logger::DEBUG
 
     str = "\x80"
@@ -49,7 +55,6 @@ class BufferedLoggerTest < Test::Unit::TestCase
     end
 
     logger.add Logger::DEBUG, str
-    logger.flush
   ensure
     logger.close
     File.unlink fname
@@ -104,34 +109,6 @@ class BufferedLoggerTest < Test::Unit::TestCase
     assert_equal message_copy, @message
   end
 
-
-  [false, nil, 0].each do |disable|
-    define_method "test_disabling_auto_flush_with_#{disable.inspect}_should_buffer_until_explicit_flush" do
-      @logger.auto_flushing = disable
-
-      4.times do
-        @logger.info 'wait for it..'
-        assert @output.string.empty?, "@output.string should be empty but it is #{@output.string}"
-      end
-
-      @logger.flush
-      assert !@output.string.empty?, "@logger.send(:buffer).size.to_s should not be empty but it is empty"
-    end
-
-    define_method "test_disabling_auto_flush_with_#{disable.inspect}_should_flush_at_max_buffer_size_as_failsafe" do
-      @logger.auto_flushing = disable
-      assert_equal Logger::MAX_BUFFER_SIZE, @logger.auto_flushing
-
-      (Logger::MAX_BUFFER_SIZE - 1).times do
-        @logger.info 'wait for it..'
-        assert @output.string.empty?, "@output.string should be empty but is #{@output.string}"
-      end
-
-      @logger.info 'there it is.'
-      assert !@output.string.empty?, "@logger.send(:buffer).size.to_s should not be empty but it is empty"
-    end
-  end
-
   def test_should_know_if_its_loglevel_is_below_a_given_level
     Logger::Severity.constants.each do |level|
       @logger.level = Logger::Severity.const_get(level) - 1
@@ -139,56 +116,17 @@ class BufferedLoggerTest < Test::Unit::TestCase
     end
   end
 
-  def test_should_auto_flush_every_n_messages
-    @logger.auto_flushing = 5
-
-    4.times do
-      @logger.info 'wait for it..'
-      assert @output.string.empty?, "@output.string should be empty but it is #{@output.string}"
-    end
-
-    @logger.info 'there it is.'
-    assert !@output.string.empty?, "@output.string should not be empty but it is empty"
-  end
-
   def test_should_create_the_log_directory_if_it_doesnt_exist
     tmp_directory = File.join(File.dirname(__FILE__), "tmp")
     log_file = File.join(tmp_directory, "development.log")
     FileUtils.rm_rf(tmp_directory)
-    @logger  = Logger.new(log_file)
-    assert File.exist?(tmp_directory)
-  end
-
-  def test_logger_should_maintain_separate_buffers_for_each_thread
-    @logger.auto_flushing = false
-
-    a = Thread.new do
-      @logger.info("a"); Thread.pass;
-      @logger.info("b"); Thread.pass;
-      @logger.info("c"); @logger.flush
-    end
-
-    b = Thread.new do
-      @logger.info("x"); Thread.pass;
-      @logger.info("y"); Thread.pass;
-      @logger.info("z"); @logger.flush
+    assert_deprecated do
+      @logger  = Logger.new(log_file)
     end
-
-    a.join
-    b.join
-
-    assert @output.string.include?("a\nb\nc\n")
-    assert @output.string.include?("x\ny\nz\n")
-  end
-
-  def test_flush_should_remove_empty_buffers
-    @logger.send :buffer
-    @logger.expects :clear_buffer
-    @logger.flush
+    assert File.exist?(tmp_directory)
   end
 
   def test_buffer_multibyte
-    @logger.auto_flushing = 2
     @logger.info(UNICODE_STRING)
     @logger.info(BYTE_STRING)
     assert @output.string.include?(UNICODE_STRING)
@@ -198,57 +136,4 @@ class BufferedLoggerTest < Test::Unit::TestCase
     end
     assert byte_string.include?(BYTE_STRING)
   end
-
-  def test_silence_only_current_thread
-    @logger.auto_flushing = true
-    run_thread_a = false
-
-    a = Thread.new do
-      while !run_thread_a do
-        sleep(0.001)
-      end
-      @logger.info("x")
-      run_thread_a = false
-    end
-
-    @logger.silence do
-      run_thread_a = true
-      @logger.info("a")
-      while run_thread_a do
-        sleep(0.001)
-      end
-    end
-
-    a.join
-
-    assert @output.string.include?("x")
-    assert !@output.string.include?("a")
-  end
-
-  def test_flush_dead_buffers
-    @logger.auto_flushing = false
-
-    a = Thread.new do
-      @logger.info("a")
-    end
-    
-    keep_running = true
-    Thread.new do
-      @logger.info("b")
-      while keep_running
-        sleep(0.001)
-      end
-    end
-
-    @logger.info("x")
-    a.join
-    @logger.flush
-
-
-    assert @output.string.include?("x")
-    assert @output.string.include?("a")
-    assert !@output.string.include?("b")
-    
-    keep_running = false
-  end
 end