[前][次][番号順一覧][スレッド一覧]

ruby-changes:15939

From: usa <ko1@a...>
Date: Wed, 19 May 2010 12:07:06 +0900 (JST)
Subject: [ruby-changes:15939] Ruby:r27880 (trunk): * test/logger/test_logger.rb: close logger (or logdevice) if it's related to

usa	2010-05-19 12:05:05 +0900 (Wed, 19 May 2010)

  New Revision: 27880

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27880

  Log:
    * 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.

  Modified files:
    trunk/test/logger/test_logger.rb

Index: test/logger/test_logger.rb
===================================================================
--- test/logger/test_logger.rb	(revision 27879)
+++ test/logger/test_logger.rb	(revision 27880)
@@ -311,10 +311,14 @@
     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 @@
       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 @@
 
   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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]