VXQUERY-194: Moved HDFS created test files to target
Also automatically delete these files after the tests
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/MiniDFS.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/MiniDFS.java
index a675150..345a6b5 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/MiniDFS.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/MiniDFS.java
@@ -18,7 +18,6 @@
import java.io.IOException;
-import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hdfs.MiniDFSCluster;
@@ -31,9 +30,8 @@
private static final String PATH_TO_HADOOP_CONF = "src/test/resources/hadoop/conf";
private static final String DATA_PATH = "src/test/resources/TestSources/ghcnd";
- public void startHDFS() throws IOException {
+ public void startHDFS(String folder) throws IOException {
- FileSystem lfs = FileSystem.getLocal(new Configuration());
JobConf conf = new JobConf();
conf.addResource(new Path(PATH_TO_HADOOP_CONF + "/core-site.xml"));
conf.addResource(new Path(PATH_TO_HADOOP_CONF + "/mapred-site.xml"));
@@ -41,9 +39,8 @@
int numDataNodes = 1;
int nameNodePort = 40000;
- // cleanup artifacts created on the local file system
- lfs.delete(new Path("build"), true);
System.setProperty("hadoop.log.dir", "logs");
+ System.setProperty("test.build.data", folder.concat("/"));
MiniDFSCluster.Builder build = new MiniDFSCluster.Builder(conf);
build.nameNodePort(nameNodePort);
build.nameNodeHttpPort(nameNodePort + 34);
diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
index 11f7eb2..3679aba 100644
--- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
+++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java
@@ -65,9 +65,11 @@
FileUtils.deleteDirectory(tmp);
}
new File(TMP.concat("/indexFolder")).mkdirs();
+ String HDFSFolder = TMP.concat("/hdfsFolder");
+ new File(HDFSFolder).mkdirs();
dfs = new MiniDFS();
try {
- dfs.startHDFS();
+ dfs.startHDFS(HDFSFolder);
} catch (IOException e) {
System.err.println(e);
}
