From a6290ae0fee1df2bd61f2dec1847f0ed18a95ea7 Mon Sep 17 00:00:00 2001 From: usa Date: Sat, 30 May 2015 09:05:50 +0000 Subject: * lib/tempfile.rb (Remover#call): fixed wrong condition introduced at r50682. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50686 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/tempfile.rb | 2 +- test/test_tempfile.rb | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e3c874aab..1574fd22ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat May 30 18:05:02 2015 NAKAMURA Usaku + + * lib/tempfile.rb (Remover#call): fixed wrong condition. introduced at + r50682. + Sat May 30 16:12:35 2015 Eric Wong * ext/socket/ancdata.c: use RB_GC_GUARD instead of volatile diff --git a/lib/tempfile.rb b/lib/tempfile.rb index e2bb9d1f0b..63d4f8c330 100644 --- a/lib/tempfile.rb +++ b/lib/tempfile.rb @@ -251,7 +251,7 @@ class Tempfile < DelegateClass(File) warn "removing #{@tmpfile.path}..." if $DEBUG - @tmpfile.close if @tmpfile.closed? + @tmpfile.close unless @tmpfile.closed? begin File.unlink(@tmpfile.path) rescue Errno::ENOENT diff --git a/test/test_tempfile.rb b/test/test_tempfile.rb index 5904050dd7..e9ce45da94 100644 --- a/test/test_tempfile.rb +++ b/test/test_tempfile.rb @@ -207,7 +207,7 @@ File.open(path, "w").close assert_in_out_err('-rtempfile', <<-'EOS') do |(filename), (error)| puts Tempfile.new('foo').path EOS - assert !File.exist?(filename) + assert !File.exist?(filename), "tempfile must not be exist after GC." assert_nil(error) end end -- cgit v1.2.3