mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* test/logger/test_logger.rb: close logger (or logdevice) if it's related to
a file because some platforms such as Windows cannot remove opened files. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
520647325b
commit
a8f8b617c0
1 changed files with 27 additions and 10 deletions
|
@ -311,10 +311,14 @@ class TestLogDevice < Test::Unit::TestCase
|
|||
end
|
||||
# create logfile whitch is already exist.
|
||||
logdev = d(@filename)
|
||||
logdev.write('world')
|
||||
logfile = File.read(@filename)
|
||||
assert_equal(2, logfile.split(/\n/).size)
|
||||
assert_match(/^helloworld$/, logfile)
|
||||
begin
|
||||
logdev.write('world')
|
||||
logfile = File.read(@filename)
|
||||
assert_equal(2, logfile.split(/\n/).size)
|
||||
assert_match(/^helloworld$/, logfile)
|
||||
ensure
|
||||
logdev.close
|
||||
end
|
||||
end
|
||||
|
||||
def test_write
|
||||
|
@ -464,6 +468,7 @@ class TestLogDevice < Test::Unit::TestCase
|
|||
assert(File.exist?(filename2))
|
||||
assert(File.exist?(filename3))
|
||||
ensure
|
||||
logger.close if logger
|
||||
[filename1, filename2, filename3].each do |filename|
|
||||
File.unlink(filename) if File.exist?(filename)
|
||||
end
|
||||
|
@ -491,20 +496,32 @@ class TestLoggerApplication < Test::Unit::TestCase
|
|||
|
||||
def test_start
|
||||
@app.set_log(@filename)
|
||||
@app.level = Logger::UNKNOWN
|
||||
@app.start # logs FATAL log
|
||||
assert_equal(1, File.read(@filename).split(/\n/).size)
|
||||
begin
|
||||
@app.level = Logger::UNKNOWN
|
||||
@app.start # logs FATAL log
|
||||
assert_equal(1, File.read(@filename).split(/\n/).size)
|
||||
ensure
|
||||
@app.logger.close
|
||||
end
|
||||
end
|
||||
|
||||
def test_logger
|
||||
@app.level = Logger::WARN
|
||||
@app.set_log(@filename)
|
||||
assert_equal(Logger::WARN, @app.logger.level)
|
||||
begin
|
||||
assert_equal(Logger::WARN, @app.logger.level)
|
||||
ensure
|
||||
@app.logger.close
|
||||
end
|
||||
@app.logger = logger = Logger.new(STDOUT)
|
||||
assert_equal(logger, @app.logger)
|
||||
assert_equal(Logger::WARN, @app.logger.level)
|
||||
@app.log = @filename
|
||||
assert(logger != @app.logger)
|
||||
assert_equal(Logger::WARN, @app.logger.level)
|
||||
begin
|
||||
assert(logger != @app.logger)
|
||||
assert_equal(Logger::WARN, @app.logger.level)
|
||||
ensure
|
||||
@app.logger.close
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Reference in a new issue