CAMEL-23902: Fix flaky UndertowWsConsumerRouteTest#24421
Draft
gnodet wants to merge 1 commit into
Draft
Conversation
Contributor
|
🌟 Thank you for your contribution to the Apache Camel project! 🌟 🐫 Apache Camel Committers, please review the following items:
|
davsclaus
approved these changes
Jul 4, 2026
Contributor
|
🧪 CI tested the following changed modules:
🔬 Scalpel shadow comparison — Scalpel: 37 tested, 29 compile-only — current: 37 all testedMaveniverse Scalpel detected 66 affected modules (current approach: 37).
|
ammachado
approved these changes
Jul 4, 2026
The WebSocket tests in UndertowWsConsumerRouteTest fail intermittently on JDK 17 because WebSocket.sendText() returns a CompletableFuture that must complete before the next send. When two messages are sent in rapid succession, the second send can fail silently with IllegalStateException. Replace CountDownLatch-based assertTrue(await(10)) with Awaitility polling in echo(), echoMulti(), sendToAll() and connectionKeyList(). For tests that send multiple messages on the same connection (echo, connectionKeyList), wait for the echo of the first message before sending the next to avoid the JDK WebSocket pending-send conflict. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
davsclaus
force-pushed
the
camel-23902-fix-flaky-test-undertowwsconsumerrout
branch
from
1b2b35d to
1f0f1ed
Compare
davsclaus
approved these changes
Jul 5, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This PR aims to stabilize UndertowWsConsumerRouteTest on JDK 17 by avoiding overlapping WebSocket.sendText() operations and by switching some latch-based waits to Awaitility-based polling.
Changes:
- Add Awaitility to
camel-undertowtest dependencies. - In
echo()andconnectionKeyList(), wait for the first message delivery before sending a second message on the same WebSocket connection. - Replace several
CountDownLatch-basedawait()usages withawait().untilAsserted(...)assertions.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 5 comments.
| File | Description |
|---|---|
| components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsConsumerRouteTest.java | Updates WebSocket tests to sequence sends and to use Awaitility for polling assertions. |
| components/camel-undertow/pom.xml | Adds Awaitility as a test-scoped dependency for the updated tests. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
171
to
+175
| wsclient1.sendTextMessage("Test1"); | ||
| wsclient1.sendTextMessage("Test2"); | ||
|
|
||
| assertTrue(wsclient1.await(10)); | ||
| // Wait for the first echo before sending the next message to avoid | ||
| // IllegalStateException from JDK WebSocket when a send is still pending | ||
| await().atMost(10, TimeUnit.SECONDS) | ||
| .untilAsserted(() -> assertTrue(wsclient1.getReceived(String.class).contains("Test1"))); |
Comment on lines
+195
to
+199
| await().atMost(10, TimeUnit.SECONDS) | ||
| .untilAsserted(() -> { | ||
| assertEquals(List.of("Gambas"), wsclient1.getReceived(String.class)); | ||
| assertEquals(List.of("Calamares"), wsclient2.getReceived(String.class)); | ||
| }); |
Comment on lines
+216
to
+220
| .untilAsserted(() -> { | ||
| List<String> received1 = wsclient1.getReceived(String.class); | ||
| assertEquals(2, received1.size()); | ||
| assertTrue(received1.contains("Gambas")); | ||
| assertTrue(received1.contains("Calamares")); |
Comment on lines
+299
to
+303
| await().atMost(10, TimeUnit.SECONDS) | ||
| .untilAsserted(() -> assertConnected(wsclient1)); | ||
| final String connectionKey1 = assertConnected(wsclient1); | ||
| assertNotNull(connectionKey1); | ||
| wsclient2.await(10); | ||
| await().atMost(10, TimeUnit.SECONDS) |
Comment on lines
+317
to
+321
| await().atMost(10, TimeUnit.SECONDS) | ||
| .untilAsserted(() -> { | ||
| assertEquals(broadcastMsg, wsclient2.getReceived(String.class).get(0)); | ||
| assertEquals(broadcastMsg, wsclient3.getReceived(String.class).get(0)); | ||
| }); |
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
Claude Code on behalf of Guillaume Nodet
Fix flaky WebSocket tests in
UndertowWsConsumerRouteTestthat fail intermittently on JDK 17.Root cause: JDK's
WebSocket.sendText()returns aCompletableFuturethat must complete before the next send. When two messages are sent in rapid succession on the same connection, the second send fails silently withIllegalStateExceptionbecauseWebsocketTestClient.sendTextMessage()ignores the returned future.Fix:
CountDownLatch-basedassertTrue(await(10))+ subsequent assertions with Awaitility polling (untilAsserted) inecho(),echoMulti(),sendToAll(), andconnectionKeyList()echo,connectionKeyList), wait for the echo of the first message before sending the next, avoiding the JDK WebSocket pending-send conflictawaitilitytest dependency tocamel-undertowTest plan
UndertowWsConsumerRouteTestpasses (all 10 tests, 0 flakes)echo()test 3x consecutively — all greenmvn formatter:format impsort:sort— no changes needed)🤖 Generated with Claude Code