You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/08/18 11:25:10 UTC
svn commit: r1374536 - in /camel/branches/camel-2.9.x: ./
components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptServerStoppedTest.java
Author: bvahdat
Date: Sat Aug 18 09:25:09 2012
New Revision: 1374536
URL: http://svn.apache.org/viewvc?rev=1374536&view=rev
Log:
Merged revisions 1374535 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................
r1374535 | bvahdat | 2012-08-18 11:21:52 +0200 (Sa, 18 Aug 2012) | 9 lines
Merged revisions 1374530 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1374530 | bvahdat | 2012-08-18 11:13:46 +0200 (Sa, 18 Aug 2012) | 1 line
Fix the test failing occasionally on the slow CI-server.
........
................
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptServerStoppedTest.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1374530
Merged /camel/branches/camel-2.10.x:r1374535
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptServerStoppedTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptServerStoppedTest.java?rev=1374536&r1=1374535&r2=1374536&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptServerStoppedTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptServerStoppedTest.java Sat Aug 18 09:25:09 2012
@@ -52,6 +52,9 @@ public class FtpReconnectAttemptServerSt
// resume the server so we can connect
ftpServer.resume();
+ // wait a bit so that the server resumes properly
+ Thread.sleep(3000);
+
assertMockEndpointsSatisfied();
}