Skip to content

refactor: test/test_supervisor.rb #4044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashie merged 3 commits into from
Feb 8, 2023
Merged

refactor: test/test_supervisor.rb #4044

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11f9358
test: use double quotes for strings containing line breaks
abetomo Feb 7, 2023
84ceac9
test: use `.&` for nil check
abetomo Feb 7, 2023
c6a76ce
test: remove `begin rescue end` when `Process.kill`
abetomo Feb 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 11 additions & 16 deletions test/test_supervisor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,17 +200,14 @@ 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

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)
$log.out.reset if $log&.out&.respond_to?(:reset)
end

def test_main_process_command_handlers
Expand All @@ -233,10 +230,10 @@ 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)
$log.out.reset if $log&.out&.respond_to?(:reset)
end

def test_supervisor_signal_handler
Expand All @@ -246,18 +243,16 @@ 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

debug_msg = '[debug]: fluentd supervisor process get SIGUSR1'
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
Expand Down Expand Up @@ -285,7 +280,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
Expand All @@ -311,7 +306,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"})
Expand Down Expand Up @@ -385,7 +380,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

Expand Down