Skip to content

Revert "CAMEL-24026: Fix flaky XsltFromFileExceptionTest" - #24945

Merged
apupier merged 1 commit into
mainfrom
revert-24625-CAMEL-24026-fix-flaky-XsltFromFileExceptionTest
Jul 20, 2026
Merged

Revert "CAMEL-24026: Fix flaky XsltFromFileExceptionTest"#24945
apupier merged 1 commit into
mainfrom
revert-24625-CAMEL-24026-fix-flaky-XsltFromFileExceptionTest

Conversation

@apupier

@apupier apupier commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Reverts #24625

the issue is still failing sometimes. the error message is less descriptive than before so reverting

@github-actions

Copy link
Copy Markdown
Contributor

🌟 Thank you for your contribution to the Apache Camel project! 🌟
🤖 CI automation will test this PR automatically.

🐫 Apache Camel Committers, please review the following items:

  • First-time contributors require MANUAL approval for the GitHub Actions to run
  • You can use the command /component-test (camel-)component-name1 (camel-)component-name2.. to request a test from the test bot although they are normally detected and executed by CI.
  • You can label PRs using skip-tests and test-dependents to fine-tune the checks executed by this PR.
  • Build and test logs are available in the summary page. Only Apache Camel committers have access to the summary.

⚠️ Be careful when sharing logs. Review their contents before sharing them publicly.

@github-actions github-actions Bot added the core label Jul 20, 2026
@apupier

apupier commented Jul 20, 2026

Copy link
Copy Markdown
Contributor Author

with current main:

org.opentest4j.AssertionFailedError: Exchange should have completed ==> expected: <true> but was: <false>	
	at org.junit.jupiter.api.Assertions.assertTrue(Assertions.java:232)	
	at org.apache.camel.component.xslt.XsltFromFileExceptionTest.testXsltFromFileExceptionFail(XsltFromFileExceptionTest.java:56)

with the revert:

java.lang.AssertionError: mock://error Received message count. Expected: <1> but was: <0>	
	at org.apache.camel.component.mock.MockEndpoint.fail(MockEndpoint.java:2075)	
	at org.apache.camel.component.mock.MockEndpoint.assertEquals(MockEndpoint.java:2010)	
	at org.apache.camel.component.mock.MockEndpoint.doAssertIsSatisfied(MockEndpoint.java:498)	
	at org.apache.camel.component.mock.MockEndpoint.assertIsSatisfied(MockEndpoint.java:476)	
	at org.apache.camel.component.mock.MockEndpoint.assertIsSatisfied(MockEndpoint.java:466)	
	at org.apache.camel.component.mock.MockEndpoint.assertIsSatisfied(MockEndpoint.java:265)	
	at org.apache.camel.ContextTestSupport.assertMockEndpointsSatisfied(ContextTestSupport.java:900)	
	at org.apache.camel.component.xslt.XsltFromFileExceptionTest.testXsltFromFileExceptionFail(XsltFromFileExceptionTest.java:52)

@github-actions

Copy link
Copy Markdown
Contributor

🧪 CI tested the following changed modules:

  • core/camel-core

🔬 Scalpel shadow comparison — Scalpel: 23 tested, 0 compile-only — current: 0 all tested

Maveniverse Scalpel detected 23 affected modules (current approach: 0).

⚠️ Modules only in Scalpel (23)
  • camel-console
  • camel-core
  • camel-csimple-joor
  • camel-datasonnet
  • camel-groovy
  • camel-hl7
  • camel-javascript
  • camel-joor
  • camel-jq
  • camel-jsonpath
  • camel-main
  • camel-management
  • camel-mvel
  • camel-ognl
  • camel-platform-http-jolokia
  • camel-python
  • camel-saxon
  • camel-spring-xml
  • camel-stax
  • camel-xml-io-dsl
  • camel-xml-jaxb-dsl
  • camel-xml-jaxb-dsl-test-definition
  • camel-xml-jaxb-dsl-test-spring

Skip-tests mode would test 23 modules (1 direct + 22 downstream), skip tests for 0 (generated code, meta-modules)

Modules Scalpel would test (23)
  • camel-console
  • camel-core
  • camel-csimple-joor
  • camel-datasonnet
  • camel-groovy
  • camel-hl7
  • camel-javascript
  • camel-joor
  • camel-jq
  • camel-jsonpath
  • camel-main
  • camel-management
  • camel-mvel
  • camel-ognl
  • camel-platform-http-jolokia
  • camel-python
  • camel-saxon
  • camel-spring-xml
  • camel-stax
  • camel-xml-io-dsl
  • camel-xml-jaxb-dsl
  • camel-xml-jaxb-dsl-test-definition
  • camel-xml-jaxb-dsl-test-spring

ℹ️ Shadow mode — Scalpel observes but does not affect test execution. Learn more

⚠️ Some tests are disabled on GitHub Actions (@DisabledIfSystemProperty(named = "ci.env.name")) and require manual verification:

  • core/camel-core: 2 test(s) disabled on GitHub Actions
All tested modules (23 modules)
  • Camel :: Console
  • Camel :: Core
  • Camel :: DataSonnet
  • Camel :: Groovy
  • Camel :: HL7
  • Camel :: JQ
  • Camel :: JSon Path
  • Camel :: JavaScript
  • Camel :: MVEL
  • Camel :: Main
  • Camel :: Management
  • Camel :: OGNL (deprecated)
  • Camel :: Platform HTTP :: Jolokia
  • Camel :: Python
  • Camel :: Saxon
  • Camel :: Spring XML
  • Camel :: StAX
  • Camel :: XML DSL Jaxb :: Test :: Definition
  • Camel :: XML DSL Jaxb :: Test :: Spring
  • Camel :: XML DSL with camel-xml-io
  • Camel :: XML DSL with camel-xml-jaxb
  • Camel :: csimple jOOR (deprecated)
  • Camel :: jOOR

⚙️ View full build and test results

@apupier
apupier marked this pull request as ready for review July 20, 2026 13:29

@gnodet gnodet left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clean revert — restoring the original test structure makes sense given the fix didn't resolve the flakiness.

The change:

  • Reverts #24625 which wrapped `oneExchangeDone.matchesWaitTime()` with `assertTrue()` and reordered it before `assertMockEndpointsSatisfied()`.
  • Restores the original pattern: `assertMockEndpointsSatisfied()` first (which already waits internally via its latch), then `oneExchangeDone.matchesWaitTime()` as an additional wait.

One observation (non-blocking):
After the revert, `oneExchangeDone.matchesWaitTime()` is called without using its return value — it serves only as a secondary wait, which is reasonable but could be confusing to future readers. If the flakiness needs another fix attempt, consider using `Awaitility` to wait for the file assertions (`assertFileNotExists` / `assertFileExists`) since the flakiness may stem from file-system timing rather than exchange completion.

LGTM ✅

Claude Code on behalf of gnodet — AI-generated review

@apupier
apupier merged commit 9cf88ca into main Jul 20, 2026
5 checks passed
@apupier
apupier deleted the revert-24625-CAMEL-24026-fix-flaky-XsltFromFileExceptionTest branch July 20, 2026 13:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants