Skip to content

Commit

Permalink
* test/logger/test_logdevice.rb: Fix tests of logger to make it work on
Browse files Browse the repository at this point in the history
  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
  • Loading branch information
sonots committed Nov 18, 2015
1 parent 3b91ff8 commit 9876377
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 5 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Wed Nov 18 09:50:21 2015 Naotoshi Seo <sonots@gmail.com>

* test/logger/test_logdevice.rb: Fix tests of logger to make it work on
windows (windows can not remove opened file) [Bug #11702]

Wed Nov 18 06:59:52 2015 Eric Wong <e@80x24.org>

* ext/socket/ancdata.c (bsock_recvmsg_internal): grow buffer
Expand Down
16 changes: 11 additions & 5 deletions test/logger/test_logdevice.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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

Expand Down

0 comments on commit 9876377

Please sign in to comment.