CAMEL-23893: Fix flaky SpringFileWatcherTest.testDefaultConfig on JDK 25#24403
Merged
gnodet merged 1 commit intoJul 3, 2026
Merged
Conversation
On JDK 25, the WatchService initializes faster and delivers CREATE events from file creation in @beforeeach, causing testDefaultConfig to receive 3 events (1 CREATE + 2 MODIFY) instead of the expected 2. Changes: - Use expectedMinimumMessageCount(2) instead of exact count to tolerate CREATE events from @beforeeach file creation on JDK 25+ - Replace Thread.sleep(50) with Awaitility to wait for the watcher to process and hash the first write before the second one - Increase result wait time from 1s to 2s for CI robustness Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Contributor
|
🌟 Thank you for your contribution to the Apache Camel project! 🌟 🐫 Apache Camel Committers, please review the following items:
|
Contributor
|
🧪 CI tested the following changed modules:
🔬 Scalpel shadow comparison — Scalpel: 1 tested, 0 compile-only — current: 9 all testedMaveniverse Scalpel detected 1 affected modules (current approach: 9). Modules only in current approach (8)
Skip-tests mode would test 1 modules (1 direct + 0 downstream), skip tests for 0 (generated code, meta-modules) Modules Scalpel would test (1)
All tested modules (9 modules)
|
davsclaus
approved these changes
Jul 3, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Fix flaky
SpringFileWatcherTest.testDefaultConfigincamel-file-watchthat fails on JDK 25 but passes on JDK 17.Root cause: JDK 25's
WatchServiceinitializes faster than JDK 17's, causing it to deliver aCREATEevent for the file created in@BeforeEach. This produces 3 events (1 CREATE + 2 MODIFY) instead of the expected 2 (2 MODIFY only).Fix:
setExpectedCount(2)toexpectedMinimumMessageCount(2)to tolerate the extra CREATE event while still verifying that both MODIFY events are deliveredThread.sleep(50)with Awaitility to reliably wait for the watcher to process and hash the first write before the second (per project coding standards)setResultWaitTimeto 2000ms for CI robustnessJIRA: CAMEL-23893
Test plan
SpringFileWatcherTest.testDefaultConfigpasses on JDK 17SpringFileWatcherTest.testDefaultConfigpasses on JDK 25SpringFileWatcherTest.testCustomHasherpasses on both JDKs🤖 Generated with Claude Code on behalf of @gnodet