From e62c2ce0e086378d454368fe24e58411c8b0b5a4 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Wed, 7 Aug 2024 03:54:11 +0900 Subject: [PATCH] Wait a bit longer for worker quit --- tool/lib/test/unit.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tool/lib/test/unit.rb b/tool/lib/test/unit.rb index 0b352060af..eff2b71580 100644 --- a/tool/lib/test/unit.rb +++ b/tool/lib/test/unit.rb @@ -416,7 +416,7 @@ module Test def kill Process.kill(:KILL, @pid) - warn "worker #{@pid} does not respond; SIGKILL is sent" + warn "worker #{to_s} does not respond; SIGKILL is sent" rescue Errno::ESRCH end @@ -534,7 +534,7 @@ module Test @workers.reject! do |worker| next unless cond&.call(worker) begin - Timeout.timeout(1) do + Timeout.timeout(5) do worker.quit(cond ? :timeout : :normal) end rescue Errno::EPIPE @@ -542,7 +542,7 @@ module Test end closed&.push worker begin - Timeout.timeout(0.2) do + Timeout.timeout(1) do worker.close end rescue Timeout::Error @@ -555,7 +555,7 @@ module Test return if (closed ||= @workers).empty? pids = closed.map(&:pid) begin - Timeout.timeout(0.2 * closed.size) do + Timeout.timeout(1 * closed.size) do Process.waitall end rescue Timeout::Error