You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/11/01 09:20:06 UTC
svn commit: r1404497 - in /camel/branches/camel-2.10.x: ./
camel-core/src/test/java/org/apache/camel/component/file/
camel-core/src/test/java/org/apache/camel/impl/
camel-core/src/test/java/org/apache/camel/processor/resequencer/
Author: davsclaus
Date: Thu Nov 1 08:20:05 2012
New Revision: 1404497
URL: http://svn.apache.org/viewvc?rev=1404497&view=rev
Log:
Fixed test on slow CI servers
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerEngineTest.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1404496
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java?rev=1404497&r1=1404496&r2=1404497&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java (original)
+++ camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java Thu Nov 1 08:20:05 2012
@@ -49,7 +49,7 @@ public class FileConsumerPollStrategyRol
public void testRollbackThrowException() throws Exception {
// let it run for a little, but it fails all the time
- Thread.sleep(20);
+ Thread.sleep(200);
// and we should rollback X number of times
assertTrue(event.startsWith("rollback"));
Modified: camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java?rev=1404497&r1=1404496&r2=1404497&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java (original)
+++ camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java Thu Nov 1 08:20:05 2012
@@ -150,7 +150,7 @@ public class DefaultConsumerTemplateTest
template.sendBody("seda:foo", "Hello");
// a little delay to let the consumer see it
- Thread.sleep(200);
+ Thread.sleep(400);
body = consumer.receiveBodyNoWait("seda:foo", String.class);
assertEquals("Hello", body);
@@ -186,7 +186,7 @@ public class DefaultConsumerTemplateTest
template.sendBody("seda:foo", "Hello");
// a little delay to let the consumer see it
- Thread.sleep(200);
+ Thread.sleep(400);
out = consumer.receiveNoWait(endpoint);
assertEquals("Hello", out.getIn().getBody());
@@ -249,7 +249,7 @@ public class DefaultConsumerTemplateTest
template.sendBody("seda:foo", "Hello");
// a little delay to let the consumer see it
- Thread.sleep(200);
+ Thread.sleep(400);
out = consumer.receiveBodyNoWait(endpoint, String.class);
assertEquals("Hello", out);
@@ -265,7 +265,7 @@ public class DefaultConsumerTemplateTest
template.sendBody("seda:foo", "Hello");
// a little delay to let the consumer see it
- Thread.sleep(200);
+ Thread.sleep(400);
out = consumer.receiveBodyNoWait(endpoint);
assertEquals("Hello", out);
Modified: camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerEngineTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerEngineTest.java?rev=1404497&r1=1404496&r2=1404497&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerEngineTest.java (original)
+++ camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerEngineTest.java Thu Nov 1 08:20:05 2012
@@ -28,9 +28,7 @@ public class ResequencerEngineTest exten
= Boolean.parseBoolean(System.getProperty("ignore.load.tests", "true"));
private ResequencerEngineSync<Integer> resequencer;
-
private ResequencerRunner<Integer> runner;
-
private SequenceBuffer<Integer> buffer;
public void setUp() throws Exception {
@@ -70,13 +68,13 @@ public class ResequencerEngineTest exten
assertEquals((Integer)4, resequencer.getLastDelivered());
}
- public void testTimout4() throws Exception {
+ public void testTimeout4() throws Exception {
initResequencer(500, 10);
resequencer.setLastDelivered(2);
resequencer.insert(4);
resequencer.insert(3);
- assertEquals((Integer)3, buffer.poll(125));
- assertEquals((Integer)4, buffer.poll(125));
+ assertEquals((Integer)3, buffer.poll(250));
+ assertEquals((Integer)4, buffer.poll(250));
assertEquals((Integer)4, resequencer.getLastDelivered());
}