Fix flaky test TestTLSConfig/update_key_file_with_an_invalid_key_start_error_log_loop #6528
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…t_error_log_loop Signed-off-by: Agustín Martínez Fayó <amartinezfayo@gmail.com>
amartinezfayo
requested review from
MarcosDY,
evan2645,
rturner3 and
sorindumitru
as code owners
sorindumitru
approved these changes
Jan 3, 2026
amartinezfayo
added a commit
to amartinezfayo/spire
that referenced
this pull request
Jan 5, 2026
…or_log_loop in diskcertmanager package. The previous fix in spiffe#6528 removed Eventually assuming synchronous execution with the mock clock, but the goroutine processing ticker events needs real wall-clock time to write log entries after clk.Add() returns, causing intermittent failures when assertions ran before logs appeared. Signed-off-by: Agustín Martínez Fayó <amartinezfayo@gmail.com>
amartinezfayo
added a commit
that referenced
this pull request
Jan 5, 2026
…or_log_loop in diskcertmanager package. (#6533) The previous fix in #6528 removed Eventually assuming synchronous execution with the mock clock, but the goroutine processing ticker events needs real wall-clock time to write log entries after clk.Add() returns, causing intermittent failures when assertions ran before logs appeared. Signed-off-by: Agustín Martínez Fayó <amartinezfayo@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixed flaky test
TestTLSConfig/update_key_file_with_an_invalid_key_start_error_log_loopthat was failing due to race conditions in log validation.Example of failure run: https://github.com/spiffe/spire/actions/runs/20639598110/job/59269434940#step:5:417
The original test used
require.Eventuallywith a condition that could pass prematurely (with 0 logs) before any errors were actually logged, and accumulated logs from previous subtests caused incorrect counts.The fix removes the unnecessary Eventually wrapper (since the mock clock makes logging synchronous), adds
logHook.Reset()calls to isolate each test's log entries, and replaces the condition with a single-line range assertion.Also, introduced constants (testFileSyncInterval, testTickerIterations, testTotalSyncDuration) to replace magic numbers throughout the test, making the timing relationships explicit.