You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zh...@apache.org on 2024/04/26 07:14:45 UTC
(camel-quarkus) branch 3.8.x updated (325911d5e2 -> 62cbecd222)
This is an automated email from the ASF dual-hosted git repository.
zhfeng pushed a change to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from 325911d5e2 Jt400: possible missing resource in the native
new b54fafe637 [LRA] Fix test when running with DOCKER_HOST (#6042)
new 62cbecd222 [CXF] Fix exception message expectation on windows (#6043)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../cxf/soap/wss/client/it/CxfSoapWssClientTest.java | 3 +--
.../camel/quarkus/component/lra/it/LraTestResource.java | 11 +++++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
(camel-quarkus) 02/02: [CXF] Fix exception message expectation on windows (#6043)
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhfeng pushed a commit to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 62cbecd2226f1855ecf951c4ea7ac0bf06763965
Author: Andrej Vaňo <av...@redhat.com>
AuthorDate: Fri Apr 26 06:57:38 2024 +0200
[CXF] Fix exception message expectation on windows (#6043)
---
.../quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientTest.java b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientTest.java
index e217d84b14..554f76369c 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientTest.java
+++ b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientTest.java
@@ -43,7 +43,6 @@ import org.junit.jupiter.api.Test;
import org.testcontainers.shaded.org.awaitility.Awaitility;
import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
@QuarkusTest
@QuarkusTestResource(CxfWssClientTestResource.class)
@@ -116,7 +115,7 @@ class CxfSoapWssClientTest {
//always fails because there is no server implementation
createSayHelloWrongClient().sayHelloWrong("Sheldon");
} catch (SOAPFaultException e) {
- return "Connection refused".equals(e.getMessage());
+ return e.getMessage() != null && e.getMessage().toLowerCase().contains("connection refused");
}
//can not happen (client does not work)
return false;
(camel-quarkus) 01/02: [LRA] Fix test when running with DOCKER_HOST (#6042)
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhfeng pushed a commit to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit b54fafe637191759adc57a055154053dd714e8ec
Author: Andrej Vaňo <av...@redhat.com>
AuthorDate: Fri Apr 26 06:00:55 2024 +0200
[LRA] Fix test when running with DOCKER_HOST (#6042)
---
.../camel/quarkus/component/lra/it/LraTestResource.java | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/integration-tests/lra/src/test/java/org/apache/camel/quarkus/component/lra/it/LraTestResource.java b/integration-tests/lra/src/test/java/org/apache/camel/quarkus/component/lra/it/LraTestResource.java
index 49e1e5be05..dcfbefbe92 100644
--- a/integration-tests/lra/src/test/java/org/apache/camel/quarkus/component/lra/it/LraTestResource.java
+++ b/integration-tests/lra/src/test/java/org/apache/camel/quarkus/component/lra/it/LraTestResource.java
@@ -58,7 +58,18 @@ public class LraTestResource implements QuarkusTestResourceLifecycleManager {
lraPort = container.getMappedPort(LRA_PORT);
}
+ // If the test runs with a remote docker, it needs to know the IP of the machine where the test app runs
+ if (System.getenv("DOCKER_HOST") != null) {
+ hostname = System.getProperty("lra.appNode.ip");
+ if (hostname == null) {
+ throw new RuntimeException(
+ "You need to supply application node IP when running LRA test with a remote docker instance using lra.appNode.ip property");
+ }
+ }
+
return CollectionHelper.mapOf(
+ // In case of remote docker, expose the endpoint at 0.0.0.0, as the default is "localhost" only
+ "quarkus.http.host", "0.0.0.0",
"camel.lra.coordinator-url",
String.format("http://%s:%d", container.getHost(), lraPort),
"camel.lra.local-participant-url",