Author: bvahdat Date: Sat Dec 22 09:21:22 2012 New Revision: 1425264 URL: http://svn.apache.org/viewvc?rev=1425264&view=rev Log: Merged revisions 1425263 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1425263 | bvahdat | 2012-12-22 10:20:00 +0100 (Sa, 22 Dez 2012) | 9 lines Merged revisions 1425262 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1425262 | bvahdat | 2012-12-22 10:17:39 +0100 (Sa, 22 Dez 2012) | 1 line Fixed the failed test on the CI-Server. ........ ................ Modified: camel/branches/camel-2.9.x/ (props changed) camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1425262 Merged /camel/branches/camel-2.10.x:r1425263 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java?rev=1425264&r1=1425263&r2=1425264&view=diff ============================================================================== --- camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java (original) +++ camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java Sat Dec 22 09:21:22 2012 @@ -28,6 +28,13 @@ import org.apache.camel.builder.RouteBui */ public class FileConsumeDoneFileIssueTest extends ContextTestSupport { + @Override + protected void setUp() throws Exception { + deleteDirectory("target/done"); + + super.setUp(); + } + public void testFileConsumeDoneFileIssue() throws Exception { NotifyBuilder notify = new NotifyBuilder(context).whenDone(5).create();
