summaryrefslogtreecommitdiff
path: root/test/logger
diff options
context:
space:
mode:
authorsonots <sonots@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-18 00:53:14 +0000
committersonots <sonots@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-18 00:53:14 +0000
commit9876377040ff710a8c68bea2530aafacf81334ff (patch)
tree81a4499e07ec56a88dcd038053adb6ffb644114a /test/logger
parent3b91ff89dad6599a73a8ecada03b6c2816421f85 (diff)
* test/logger/test_logdevice.rb: Fix tests of logger to make it work on
windows (windows can not remove opened file) [Bug #11702] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52628 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/logger')
-rw-r--r--test/logger/test_logdevice.rb16
1 files changed, 11 insertions, 5 deletions
diff --git a/test/logger/test_logdevice.rb b/test/logger/test_logdevice.rb
index 6482e25adb..f6dcf9a5a3 100644
--- a/test/logger/test_logdevice.rb
+++ b/test/logger/test_logdevice.rb
@@ -131,7 +131,7 @@ class TestLogDevice < Test::Unit::TestCase
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 @@ class TestLogDevice < Test::Unit::TestCase
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