From 11f93582b49897629989f0e13f441df24c30fe15 Mon Sep 17 00:00:00 2001
From: abetomo <abe@enzou.tokyo>
Date: Tue, 7 Feb 2023 22:46:01 +0900
Subject: [PATCH 1/3] test: use double quotes for strings containing line
 breaks

Signed-off-by: abetomo <abe@enzou.tokyo>
---
 test/test_supervisor.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/test_supervisor.rb b/test/test_supervisor.rb
index bafb2b3a0e..ecc8f242d8 100644
--- a/test/test_supervisor.rb
+++ b/test/test_supervisor.rb
@@ -207,7 +207,7 @@ def test_main_process_signal_handlers
 
     sleep 1
 
-    info_msg = '[info]: force flushing buffered events' + "\n"
+    info_msg = "[info]: force flushing buffered events\n"
     assert{ $log.out.logs.first.end_with?(info_msg) }
   ensure
     $log.out.reset if $log && $log.out && $log.out.respond_to?(:reset)
@@ -233,7 +233,7 @@ def test_main_process_command_handlers
 
     sleep 1
 
-    info_msg = '[info]: force flushing buffered events' + "\n"
+    info_msg = "[info]: force flushing buffered events\n"
     assert{ $log.out.logs.first.end_with?(info_msg) }
   ensure
     $log.out.reset if $log && $log.out && $log.out.respond_to?(:reset)
@@ -385,7 +385,7 @@ def test_rpc_server(data)
 
     sv.send(:install_main_process_signal_handlers)
     response = Net::HTTP.get(URI.parse("http://#{localhost}:24447/api/plugins.flushBuffers"))
-    info_msg = '[info]: force flushing buffered events' + "\n"
+    info_msg = "[info]: force flushing buffered events\n"
 
     server.stop_rpc_server
 

From 84ceac9e41189478dd539d608b131b1faf4ba6d0 Mon Sep 17 00:00:00 2001
From: abetomo <abe@enzou.tokyo>
Date: Tue, 7 Feb 2023 22:46:29 +0900
Subject: [PATCH 2/3] test: use `.&` for nil check

Signed-off-by: abetomo <abe@enzou.tokyo>
---
 test/test_supervisor.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/test_supervisor.rb b/test/test_supervisor.rb
index ecc8f242d8..ff8c0fdd45 100644
--- a/test/test_supervisor.rb
+++ b/test/test_supervisor.rb
@@ -210,7 +210,7 @@ def test_main_process_signal_handlers
     info_msg = "[info]: force flushing buffered events\n"
     assert{ $log.out.logs.first.end_with?(info_msg) }
   ensure
-    $log.out.reset if $log && $log.out && $log.out.respond_to?(:reset)
+    $log.out.reset if $log&.out&.respond_to?(:reset)
   end
 
   def test_main_process_command_handlers
@@ -236,7 +236,7 @@ def test_main_process_command_handlers
     info_msg = "[info]: force flushing buffered events\n"
     assert{ $log.out.logs.first.end_with?(info_msg) }
   ensure
-    $log.out.reset if $log && $log.out && $log.out.respond_to?(:reset)
+    $log.out.reset if $log&.out&.respond_to?(:reset)
   end
 
   def test_supervisor_signal_handler
@@ -257,7 +257,7 @@ def test_supervisor_signal_handler
     logs = $log.out.logs
     assert{ logs.any?{|log| log.include?(debug_msg) } }
   ensure
-    $log.out.reset if $log && $log.out && $log.out.respond_to?(:reset)
+    $log.out.reset if $log&.out&.respond_to?(:reset)
   end
 
   def test_windows_shutdown_event
@@ -285,7 +285,7 @@ def server.config
     logs = $log.out.logs
     assert{ logs.any?{|log| log.include?(debug_msg) } }
   ensure
-    $log.out.reset if $log && $log.out && $log.out.respond_to?(:reset)
+    $log.out.reset if $log&.out&.respond_to?(:reset)
   end
 
   def test_supervisor_event_handler
@@ -311,7 +311,7 @@ def server.config
     logs = $log.out.logs
     assert{ logs.any?{|log| log.include?(debug_msg) } }
   ensure
-    $log.out.reset if $log && $log.out && $log.out.respond_to?(:reset)
+    $log.out.reset if $log&.out&.respond_to?(:reset)
   end
 
   data("Normal", {raw_path: "C:\\Windows\\Temp\\sigdump.log", expected: "C:\\Windows\\Temp\\sigdump-#{Process.pid}.log"})

From c6a76ce855a3c3638be60b803f728e5b116f5112 Mon Sep 17 00:00:00 2001
From: abetomo <abe@enzou.tokyo>
Date: Tue, 7 Feb 2023 22:46:49 +0900
Subject: [PATCH 3/3] test: remove `begin rescue end` when `Process.kill`

It is more helpful to the investigation if the exception is not ignored.

Signed-off-by: abetomo <abe@enzou.tokyo>
---
 test/test_supervisor.rb | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/test/test_supervisor.rb b/test/test_supervisor.rb
index ff8c0fdd45..1516e32342 100644
--- a/test/test_supervisor.rb
+++ b/test/test_supervisor.rb
@@ -200,10 +200,7 @@ def test_main_process_signal_handlers
     sv = Fluent::Supervisor.new(opts)
     sv.send(:install_main_process_signal_handlers)
 
-    begin
-      Process.kill :USR1, Process.pid
-    rescue
-    end
+    Process.kill :USR1, Process.pid
 
     sleep 1
 
@@ -246,10 +243,8 @@ def test_supervisor_signal_handler
 
     server = DummyServer.new
     server.install_supervisor_signal_handlers
-    begin
-      Process.kill :USR1, Process.pid
-    rescue
-    end
+
+    Process.kill :USR1, Process.pid
 
     sleep 1