Fixed tests on CI servers
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6e33f34b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6e33f34b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6e33f34b Branch: refs/heads/camel-2.11.x Commit: 6e33f34b3b9ccfcb6626fff9a9cdd135539dc067 Parents: 5d12940 Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Oct 13 10:58:29 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Oct 13 10:59:22 2013 +0200 ---------------------------------------------------------------------- .../file/FilerConsumerShouldSkipDoneFileSuffixTest.java | 4 +++- .../RecipientListParallelAggregateThreadPoolIssueTest.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6e33f34b/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerShouldSkipDoneFileSuffixTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerShouldSkipDoneFileSuffixTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerShouldSkipDoneFileSuffixTest.java index e6ab1d3..258b98a 100644 --- a/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerShouldSkipDoneFileSuffixTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerShouldSkipDoneFileSuffixTest.java @@ -67,7 +67,9 @@ public class FilerConsumerShouldSkipDoneFileSuffixTest extends ContextTestSuppor return new RouteBuilder() { @Override public void configure() throws Exception { - from("file:target/done?doneFileName=${file:name}.ready&initialDelay=0&delay=10").to("mock:result"); + from("file:target/done?doneFileName=${file:name}.ready&initialDelay=0") + .convertBodyTo(String.class) + .to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/6e33f34b/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelAggregateThreadPoolIssueTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelAggregateThreadPoolIssueTest.java b/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelAggregateThreadPoolIssueTest.java index 7040251..078c4a1 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelAggregateThreadPoolIssueTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/RecipientListParallelAggregateThreadPoolIssueTest.java @@ -42,9 +42,9 @@ public class RecipientListParallelAggregateThreadPoolIssueTest extends ContextTe int num1 = context.getTypeConverter().convertTo(int.class, before); int num2 = context.getTypeConverter().convertTo(int.class, after); int diff = num2 - num1; - // should be 10 + 1 other threads (10 in parallel pool + 1 in aggregate pool) + // should be at least 10 + 1 other threads (10 in parallel pool + 1 in aggregate pool) // we run unit test per jmv fork, so there may be a hanging thread - assertTrue("There should be 12 threads in diff, was: " + diff, diff >= 12 && diff <= 13); + assertTrue("There should be 12 or more threads in use, was: " + diff, diff >= 11); } @Override
