aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-10 11:17:00 +0100
committerJosé Valim <jose.valim@gmail.com>2011-12-10 11:17:00 +0100
commitcd7fbcbba82c08aeaac791e4d8ff3f789e628b3b (patch)
tree48a79717e12ab40ab1da4992a445242b076871bf
parentaace38ae09e7a9495d8ab8e73c69a3c14fdbdabd (diff)
downloadrails-cd7fbcbba82c08aeaac791e4d8ff3f789e628b3b.tar.gz
rails-cd7fbcbba82c08aeaac791e4d8ff3f789e628b3b.tar.bz2
rails-cd7fbcbba82c08aeaac791e4d8ff3f789e628b3b.zip
Fix AS test suite.
-rw-r--r--activesupport/lib/active_support/tagged_logging.rb1
-rw-r--r--activesupport/test/buffered_logger_test.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb
index c3c61e178e..0f3ac0c132 100644
--- a/activesupport/lib/active_support/tagged_logging.rb
+++ b/activesupport/lib/active_support/tagged_logging.rb
@@ -40,6 +40,7 @@ module ActiveSupport
def flush
@tags.delete(Thread.current)
+ @logger.flush if @logger.respond_to?(:flush)
end
def method_missing(method, *args)
diff --git a/activesupport/test/buffered_logger_test.rb b/activesupport/test/buffered_logger_test.rb
index c818235fc0..dfdf1b4023 100644
--- a/activesupport/test/buffered_logger_test.rb
+++ b/activesupport/test/buffered_logger_test.rb
@@ -43,6 +43,7 @@ class BufferedLoggerTest < Test::Unit::TestCase
def test_write_binary_data_create_file
fname = File.join Dir.tmpdir, 'lol', 'rofl.log'
+ FileUtils.mkdir_p File.dirname(fname)
f = File.open(fname, 'w')
f.binmode