Permalink
Browse files

Waits max 30 seconds for backup process to exit, before killing it an…

…d failing
  • Loading branch information...
1 parent 43bb0de commit 9a998c322aa337f69af707b6c44bedc3dbcbb36c @tinwelint committed Apr 19, 2012
Showing with 5 additions and 4 deletions.
  1. +5 −4 backup/src/test/java/org/neo4j/backup/TestBackupToolEmbedded.java
@@ -20,10 +20,14 @@
package org.neo4j.backup;
+import static org.junit.Assert.assertEquals;
+import static org.neo4j.graphdb.factory.GraphDatabaseSetting.osIsWindows;
+
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+
import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.Before;
@@ -37,9 +41,6 @@
import org.neo4j.test.DbRepresentation;
import org.neo4j.test.ProcessStreamHandler;
-import static org.junit.Assert.*;
-import static org.neo4j.graphdb.factory.GraphDatabaseSetting.*;
-
public class TestBackupToolEmbedded
{
public static final String PATH = "target/var/db";
@@ -167,6 +168,6 @@ public static int runBackupToolFromOtherJvmToGetExitCode( String... args )
allArgs.addAll( Arrays.asList( args ) );
Process process = Runtime.getRuntime().exec( allArgs.toArray( new String[allArgs.size()] ));
- return new ProcessStreamHandler( process, false ).waitForResult();
+ return new ProcessStreamHandler( process, false ).waitForResult( 30 );
}
}

0 comments on commit 9a998c3

Please sign in to comment.