From 6a4abab8ce00b5b0cb6e0a161bfedf3366393308 Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Mon, 27 May 2024 14:26:16 +0000
Subject: Add timeout for thumbnail generation process (#37530).

Patch by Go MAEDA (@maeda).


git-svn-id: https://svn.redmine.org/redmine/trunk@22847 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/unit/attachment_test.rb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'test')

diff --git a/test/unit/attachment_test.rb b/test/unit/attachment_test.rb
index 2e37672ab..b88350fba 100644
--- a/test/unit/attachment_test.rb
+++ b/test/unit/attachment_test.rb
@@ -626,6 +626,25 @@ class AttachmentTest < ActiveSupport::TestCase
     ensure
       set_tmp_attachments_directory
     end
+
+    def test_thumbnail_should_timeout
+      dummy_pid = 37530
+      Process.stubs(:spawn).returns(dummy_pid)
+      Process.stubs(:wait2).raises(Timeout::Error)
+      Process.stubs(:kill).returns(1)
+      Process.stubs(:wait).returns(dummy_pid)
+      Rails.logger.expects(:error).with(regexp_matches(/Creating thumbnail timed out/))
+
+      set_fixtures_attachments_directory
+      Attachment.clear_thumbnails
+
+      attachment = Attachment.find(16)
+      thumbnail = attachment.thumbnail
+
+      assert_nil thumbnail
+    ensure
+      set_tmp_attachments_directory
+    end
   else
     puts '(ImageMagick convert not available)'
   end
-- 
cgit v1.2.3