Skip to content

Commit da19704

Browse files
authored
Backport(v1.19): test_supervisor: fix flaky tests for Win32 event (#5174) (#5176)
Backport #5174 **Which issue(s) this PR fixes**: This patch will fix following failures on Windows with old Ruby (3.0, 2.7). ``` 1) Failure: test_supervisor_event_handler(SupervisorTest): <false> is not true. D:/a/fluentd/fluentd/test/test_supervisor.rb:388:in `test_supervisor_event_handler' 385: 386: debug_msg = '[debug]: Got Win32 event "TestFluentdEvent_USR1"' 387: logs = $log.out.logs => 388: assert{ logs.any?{|log| log.include?(debug_msg) } } 389: ensure 390: $log.out.reset if $log&.out&.respond_to?(:reset) 391: end 2) Failure: test_windows_shutdown_event(SupervisorTest): <false> is not true. D:/a/fluentd/fluentd/test/test_supervisor.rb:362:in `test_windows_shutdown_event' 359: 360: debug_msg = '[debug]: Got Win32 event "TestFluentdEvent"' 361: logs = $log.out.logs => 362: assert{ logs.any?{|log| log.include?(debug_msg) } } 363: ensure 364: $log.out.reset if $log&.out&.respond_to?(:reset) 365: end ``` https://github.com/fluent/fluentd/actions/runs/19950323545/job/57208741261 **What this PR does / why we need it**: It seems we need to wait a bit to reliably capture events as logs. Similar to following codes, this also includes sleep. https://github.com/fluent/fluentd/blob/6d26f8de536601d9c192476f00cd22925a8882ad/test/test_supervisor.rb#L417-L421 **Docs Changes**: N/A **Release Note**: N/A <!-- Thank you for contributing to Fluentd! Your commits need to follow DCO: https://probot.github.io/apps/dco/ And please provide the following information to help us make the most of your pull request: --> **Which issue(s) this PR fixes**: Fixes # **What this PR does / why we need it**: **Docs Changes**: **Release Note**: Signed-off-by: Shizuo Fujita <fujita@clear-code.com>
1 parent efdc4dc commit da19704

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

test/test_supervisor.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,7 @@ def server.config
443443
event = Win32::Event.open("TestFluentdEvent")
444444
event.set
445445
event.close
446+
sleep 1.0 # Wait for dumping
446447
ensure
447448
server.stop_windows_event_thread
448449
end
@@ -469,6 +470,7 @@ def server.config
469470
event = Win32::Event.open("TestFluentdEvent_USR1")
470471
event.set
471472
event.close
473+
sleep 1.0 # Wait for dumping
472474
ensure
473475
server.stop_windows_event_thread
474476
end

0 commit comments

Comments
 (0)