This is an automated email from the ASF dual-hosted git repository. apupier pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4a3a1d4067d931615d1906ef885fb423150be321 Author: Aurélien Pupier <[email protected]> AuthorDate: Fri Sep 25 14:22:25 2026 +0200 Stabilize Zookeeper tests using different zookeeper endpoints In case, it is not failing, it should at least improve the error messages to detect potential tests that are interacting with each other Signed-off-by: Aurélien Pupier <[email protected]> --- .../integration/ZooKeeperClusterViewLeadershipLostIT.java | 2 +- .../integration/ZooKeeperClusteredRoutePolicyFactoryIT.java | 2 +- .../cluster/integration/ZooKeeperClusteredRoutePolicyIT.java | 2 +- .../zookeeper/cluster/integration/ZooKeeperMasterIT.java | 2 +- .../camel/component/zookeeper/integration/ConsumeDataIT.java | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperClusterViewLeadershipLostIT.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperClusterViewLeadershipLostIT.java index 69ba30dc3b2d..c8751d867ce3 100644 --- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperClusterViewLeadershipLostIT.java +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperClusterViewLeadershipLostIT.java @@ -54,7 +54,7 @@ class ZooKeeperClusterViewLeadershipLostIT { ZooKeeperClusterService clusterService = new ZooKeeperClusterService(); clusterService.setId("node-1"); clusterService.setNodes(service.serverUrls()); - clusterService.setBasePath("/camel"); + clusterService.setBasePath("/camel-ZooKeeperClusterViewLeadershipLostIT"); clusterService.setSessionTimeout(5000); diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperClusteredRoutePolicyFactoryIT.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperClusteredRoutePolicyFactoryIT.java index 06eb707f08f3..efd4a697cb47 100644 --- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperClusteredRoutePolicyFactoryIT.java +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperClusteredRoutePolicyFactoryIT.java @@ -79,7 +79,7 @@ public final class ZooKeeperClusteredRoutePolicyFactoryIT { ZooKeeperClusterService service = new ZooKeeperClusterService(); service.setId("node-" + id); service.setNodes(connectString); - service.setBasePath("/camel"); + service.setBasePath("/camel-ZooKeeperClusteredRoutePolicyFactoryIT"); context.disableJMX(); context.getCamelContextExtension().setName("context-" + id); diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperClusteredRoutePolicyIT.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperClusteredRoutePolicyIT.java index 96ae127b6e7a..ca621b6eb614 100644 --- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperClusteredRoutePolicyIT.java +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperClusteredRoutePolicyIT.java @@ -79,7 +79,7 @@ public final class ZooKeeperClusteredRoutePolicyIT { ZooKeeperClusterService service = new ZooKeeperClusterService(); service.setId("node-" + id); service.setNodes(connectString); - service.setBasePath("/camel"); + service.setBasePath("/camel-ZooKeeperClusteredRoutePolicyIT"); context.disableJMX(); context.getCamelContextExtension().setName("context-" + id); diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperMasterIT.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperMasterIT.java index 3d6a91ad38f0..9a5c2eb6509c 100644 --- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperMasterIT.java +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/integration/ZooKeeperMasterIT.java @@ -78,7 +78,7 @@ public final class ZooKeeperMasterIT { ZooKeeperClusterService service = new ZooKeeperClusterService(); service.setId("node-" + id); service.setNodes(connectString); - service.setBasePath("/camel/master"); + service.setBasePath("/camel-ZooKeeperMasterIT/master"); context.disableJMX(); context.getCamelContextExtension().setName("context-" + id); diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/integration/ConsumeDataIT.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/integration/ConsumeDataIT.java index f76e89484fb4..78c9f199c352 100644 --- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/integration/ConsumeDataIT.java +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/integration/ConsumeDataIT.java @@ -34,7 +34,7 @@ public class ConsumeDataIT extends ZooKeeperITSupport { protected RouteBuilder[] createRouteBuilders() { return new RouteBuilder[] { new RouteBuilder() { public void configure() { - from("zookeeper://{{zookeeper.connection.string}}/camel?repeat=true") + from("zookeeper://{{zookeeper.connection.string}}/camel-ConsumeDataIT?repeat=true") .to("mock:zookeeper-data"); } } }; @@ -64,7 +64,7 @@ public class ConsumeDataIT extends ZooKeeperITSupport { updateNode(10); delay(500); - client.deleteAll("/camel"); + client.deleteAll("/camel-ConsumeDataIT"); MockEndpoint.assertIsSatisfied(30, TimeUnit.SECONDS); @@ -90,7 +90,7 @@ public class ConsumeDataIT extends ZooKeeperITSupport { delay(500); // by now we are back waiting for a change so delete the node - client.deleteAll("/camel"); + client.deleteAll("/camel-ConsumeDataIT"); // recreate and update a number of times. createCamelNode(); @@ -98,20 +98,20 @@ public class ConsumeDataIT extends ZooKeeperITSupport { MockEndpoint.assertIsSatisfied(30, TimeUnit.SECONDS); - client.deleteAll("/camel"); + client.deleteAll("/camel-ConsumeDataIT"); } private void updateNode(int times) throws Exception { for (int x = 1; x < times; x++) { delay(500); - client.setData("/camel", testPayload + "_" + x, -1); + client.setData("/camel-ConsumeDataIT", testPayload + "_" + x, -1); } } private void createCamelNode() throws Exception { try { delay(1000); - client.create("/camel", testPayload + "_0"); + client.create("/camel-ConsumeDataIT", testPayload + "_0"); } catch (NodeExistsException e) { } }
