Repository: camel Updated Branches: refs/heads/master a757ea7d9 -> 217562c45
CAMEL-11446: Use awaitility in camel-core for testing where we otherwise use thred sleep which can be speeded up. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/217562c4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/217562c4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/217562c4 Branch: refs/heads/master Commit: 217562c4512cae2af188cfc6111ac911d25e1328 Parents: a757ea7 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Jul 7 14:20:02 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Jul 7 14:20:02 2017 +0200 ---------------------------------------------------------------------- .../camel/impl/DefaultExecutorServiceManagerTest.java | 2 +- ...yDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java | 10 +++++----- .../PollEnrichFileCustomAggregationStrategyTest.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/217562c4/camel-core/src/test/java/org/apache/camel/impl/DefaultExecutorServiceManagerTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultExecutorServiceManagerTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultExecutorServiceManagerTest.java index 84aa8cf..c07015b 100644 --- a/camel-core/src/test/java/org/apache/camel/impl/DefaultExecutorServiceManagerTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultExecutorServiceManagerTest.java @@ -496,7 +496,7 @@ public class DefaultExecutorServiceManagerTest extends ContextTestSupport { } @Ignore("This is a manual test, by looking at the logs") - public void testLongShutdownOfThreadPool() throws Exception { + public void xxxtestLongShutdownOfThreadPool() throws Exception { final CountDownLatch latch = new CountDownLatch(1); ExecutorService pool = context.getExecutorServiceManager().newSingleThreadExecutor(this, "Cool"); http://git-wip-us.apache.org/repos/asf/camel/blob/217562c4/camel-core/src/test/java/org/apache/camel/processor/RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java b/camel-core/src/test/java/org/apache/camel/processor/RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java index be8d351..a3e8bec 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest.java @@ -40,8 +40,8 @@ public class RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest extends // should not take long to stop the route StopWatch watch = new StopWatch(); - // sleep 3 seconds to do some redeliveries before we stop - Thread.sleep(3000); + // sleep 0.5 seconds to do some redeliveries before we stop + Thread.sleep(500); log.info("==== stopping route foo ===="); context.stopRoute("foo"); long taken = watch.taken(); @@ -50,8 +50,8 @@ public class RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest extends log.info("OnRedelivery processor counter {}", counter.get()); - assertTrue("Should stop route faster, was " + taken, taken < 7000); - assertTrue("Redelivery counter should be >= 2 and < 12, was: " + counter.get(), counter.get() >= 2 && counter.get() < 12); + assertTrue("Should stop route faster, was " + taken, taken < 5000); + assertTrue("Redelivery counter should be >= 20 and < 100, was: " + counter.get(), counter.get() >= 20 && counter.get() < 100); } private final class MyRedeliverProcessor implements Processor { @@ -70,7 +70,7 @@ public class RedeliveryDeadLetterErrorHandlerNoRedeliveryOnShutdownTest extends errorHandler(deadLetterChannel("mock:deadLetter") .allowRedeliveryWhileStopping(false) .onRedelivery(new MyRedeliverProcessor()) - .maximumRedeliveries(20).redeliveryDelay(1000).retryAttemptedLogLevel(LoggingLevel.INFO)); + .maximumRedeliveries(200).redeliveryDelay(10).retryAttemptedLogLevel(LoggingLevel.INFO)); from("seda:foo").routeId("foo") .to("mock:foo") http://git-wip-us.apache.org/repos/asf/camel/blob/217562c4/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileCustomAggregationStrategyTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileCustomAggregationStrategyTest.java b/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileCustomAggregationStrategyTest.java index 5b68004..04af57e 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileCustomAggregationStrategyTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileCustomAggregationStrategyTest.java @@ -46,8 +46,8 @@ public class PollEnrichFileCustomAggregationStrategyTest extends ContextTestSupp template.sendBodyAndHeader("file://target/enrich", "Start", Exchange.FILE_NAME, "AAA.fin"); - log.info("Sleeping for 1 sec before writing enrichdata file"); - Thread.sleep(1000); + log.info("Sleeping for 0.5 sec before writing enrichdata file"); + Thread.sleep(500); template.sendBodyAndHeader("file://target/enrichdata", "Big file", Exchange.FILE_NAME, "AAA.dat"); log.info("... write done");
