Author: bvahdat
Date: Sat Aug 18 09:21:52 2012
New Revision: 1374535

URL: http://svn.apache.org/viewvc?rev=1374535&view=rev
Log:
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.10.x/   (props changed)
    
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptServerStoppedTest.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1374530

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.10.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.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptServerStoppedTest.java?rev=1374535&r1=1374534&r2=1374535&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptServerStoppedTest.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptServerStoppedTest.java
 Sat Aug 18 09:21:52 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();
     }
 


Reply via email to