* test/logger/test_logdevice.rb: Fix tests of logger to make it work on

windows (windows can not remove opened file) [Bug #11702]
sonots · Nov 17, 2015 · e438ac0 · sonots · Nov 17, 2015 · e438ac0
1 parent 3d74897
commit e438ac0
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/test/logger/test_logdevice.rb b/test/logger/test_logdevice.rb
@@ -131,7 +131,7 @@ def test_reopen_io_by_file
   def test_reopen_file
     logdev = d(@filename)
     old_dev = logdev.dev
-    File.unlink(@filename) if File.exist?(@filename) # remove once, then reopen
+
     logdev.reopen
     begin
       assert(File.exist?(@filename))
@@ -154,14 +154,20 @@ def test_reopen_file_by_io
   def test_reopen_file_by_file
     logdev = d(@filename)
     old_dev = logdev.dev
-    File.unlink(@filename) if File.exist?(@filename) # remove once, then reopen
-    logdev.reopen(@filename)
+
+    tempfile2 = Tempfile.new("logger")
+    tempfile2.close
+    filename2 = tempfile2.path
+    File.unlink(filename2)
+
+    logdev.reopen(filename2)
     begin
-      assert(File.exist?(@filename))
-      assert_equal(@filename, logdev.filename)
+      assert(File.exist?(filename2))
+      assert_equal(filename2, logdev.filename)
       assert(old_dev.closed?)
     ensure
       logdev.close
+      tempfile2.close(true)
     end
   end