This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9ca230d9a28ee5ffa1710b0e1a82f2d3e6e523a8 Author: Colm O hEigeartaigh <cohei...@apache.org> AuthorDate: Tue Jun 25 11:03:32 2019 +0100 Fixing flaky Lumberjack SSL tests --- .../component/lumberjack/LumberjackComponentGlobalSSLTest.java | 4 ---- .../camel/component/lumberjack/LumberjackComponentSSLTest.java | 1 + .../java/org/apache/camel/component/lumberjack/LumberjackUtil.java | 6 +++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java index 97c181f..2aa8473 100644 --- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java +++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java @@ -61,10 +61,6 @@ public class LumberjackComponentGlobalSSLTest extends CamelTestSupport { @Test public void shouldListenToMessagesOverSSL() throws Exception { - // cannot test on java 1.9 - if (isJava19()) { - return; - } // We're expecting 25 messages with Maps MockEndpoint mock = getMockEndpoint("mock:output"); diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java index 2df6a36..f1965c3 100644 --- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java +++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java @@ -48,6 +48,7 @@ public class LumberjackComponentSSLTest extends CamelTestSupport { @Override protected RouteBuilder createRouteBuilder() { + return new RouteBuilder() { public void configure() { // Lumberjack configured with SSL diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java index 45fa108..3cea515 100644 --- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java +++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java @@ -83,11 +83,11 @@ final class LumberjackUtil { .connect("127.0.0.1", port).sync().channel(); // // Send the 2 window frames - TimeUnit.MILLISECONDS.sleep(100); + TimeUnit.MILLISECONDS.sleep(500); channel.writeAndFlush(readSample("io/window10")); - TimeUnit.MILLISECONDS.sleep(100); + TimeUnit.MILLISECONDS.sleep(500); channel.writeAndFlush(readSample("io/window15")); - TimeUnit.MILLISECONDS.sleep(100); + TimeUnit.MILLISECONDS.sleep(500); channel.close();