From 1bfdccc30fb873ec72c25e29f1bbbfb6c462ca6a Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Wed, 18 Aug 2021 02:47:32 +0000
Subject: [PATCH] Don't unlink files before closing them (#35539, #35721).
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Patch by Pavel Rosický.


git-svn-id: http://svn.redmine.org/redmine/trunk@21194 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/unit/attachment_test.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/test/unit/attachment_test.rb b/test/unit/attachment_test.rb
index 2aee87964..a870e3697 100644
--- a/test/unit/attachment_test.rb
+++ b/test/unit/attachment_test.rb
@@ -276,27 +276,31 @@ class AttachmentTest < ActiveSupport::TestCase
   end
 
   def test_create_diskfile
+    path = nil
     Attachment.create_diskfile("test_file.txt") do |f|
       path = f.path
       assert_match(/^\d{12}_test_file.txt$/, File.basename(path))
       assert_equal 'test_file.txt', File.basename(path)[13..-1]
-      File.unlink f.path
     end
+    File.unlink path
 
     Attachment.create_diskfile("test_accentué.txt") do |f|
+      path = f.path
       assert_equal '770c509475505f37c2b8fb6030434d6b.txt', File.basename(f.path)[13..-1]
-      File.unlink f.path
     end
+    File.unlink path
 
     Attachment.create_diskfile("test_accentué") do |f|
+      path = f.path
       assert_equal 'f8139524ebb8f32e51976982cd20a85d', File.basename(f.path)[13..-1]
-      File.unlink f.path
     end
+    File.unlink path
 
     Attachment.create_diskfile("test_accentué.ça") do |f|
+      path = f.path
       assert_equal 'cbb5b0f30978ba03731d61f9f6d10011', File.basename(f.path)[13..-1]
-      File.unlink f.path
     end
+    File.unlink path
   end
 
   def test_title
-- 
2.39.5