MAPREDUCE-6662. Clear ASF Warnings on test data files. Contributed by Vinayakumar B
This commit is contained in:
parent
948b758070
commit
0ef8bbfd87
|
@ -71,8 +71,9 @@ public class TestHistoryFileManager {
|
|||
Configuration conf = new HdfsConfiguration();
|
||||
Configuration conf2 = new HdfsConfiguration();
|
||||
dfsCluster = new MiniDFSCluster.Builder(conf).build();
|
||||
conf2.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR,
|
||||
conf.get(MiniDFSCluster.HDFS_MINIDFS_BASEDIR) + "_2");
|
||||
conf2.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, conf.get(
|
||||
MiniDFSCluster.HDFS_MINIDFS_BASEDIR, MiniDFSCluster.getBaseDirectory())
|
||||
+ "_2");
|
||||
dfsCluster2 = new MiniDFSCluster.Builder(conf2).build();
|
||||
}
|
||||
|
||||
|
|
|
@ -44,8 +44,9 @@ private static NumberFormat idFormat = NumberFormat.getInstance();
|
|||
FileSystem fs = FileSystem.get(conf);
|
||||
int numOfInputLines = 10;
|
||||
|
||||
Path OUTPUT_DIR = new Path("build/test/output_for_field_selection_test");
|
||||
Path INPUT_DIR = new Path("build/test/input_for_field_selection_test");
|
||||
String baseDir = System.getProperty("test.build.data", "build/test/data");
|
||||
Path OUTPUT_DIR = new Path(baseDir + "/output_for_field_selection_test");
|
||||
Path INPUT_DIR = new Path(baseDir + "/input_for_field_selection_test");
|
||||
String inputFile = "input.txt";
|
||||
fs.delete(INPUT_DIR, true);
|
||||
fs.mkdirs(INPUT_DIR);
|
||||
|
|
|
@ -97,9 +97,10 @@ public class TestMRTimelineEventHandling {
|
|||
+ cluster.getApplicationHistoryServer().getPort());
|
||||
TimelineStore ts = cluster.getApplicationHistoryServer()
|
||||
.getTimelineStore();
|
||||
|
||||
Path inDir = new Path("input");
|
||||
Path outDir = new Path("output");
|
||||
String localPathRoot = System.getProperty("test.build.data",
|
||||
"build/test/data");
|
||||
Path inDir = new Path(localPathRoot, "input");
|
||||
Path outDir = new Path(localPathRoot, "output");
|
||||
RunningJob job =
|
||||
UtilsForTests.runJobSucceed(new JobConf(conf), inDir, outDir);
|
||||
Assert.assertEquals(JobStatus.SUCCEEDED,
|
||||
|
@ -155,8 +156,10 @@ public class TestMRTimelineEventHandling {
|
|||
TimelineStore ts = cluster.getApplicationHistoryServer()
|
||||
.getTimelineStore();
|
||||
|
||||
Path inDir = new Path("input");
|
||||
Path outDir = new Path("output");
|
||||
String localPathRoot = System.getProperty("test.build.data",
|
||||
"build/test/data");
|
||||
Path inDir = new Path(localPathRoot, "input");
|
||||
Path outDir = new Path(localPathRoot, "output");
|
||||
RunningJob job =
|
||||
UtilsForTests.runJobSucceed(new JobConf(conf), inDir, outDir);
|
||||
Assert.assertEquals(JobStatus.SUCCEEDED,
|
||||
|
@ -195,8 +198,10 @@ public class TestMRTimelineEventHandling {
|
|||
TimelineStore ts = cluster.getApplicationHistoryServer()
|
||||
.getTimelineStore();
|
||||
|
||||
Path inDir = new Path("input");
|
||||
Path outDir = new Path("output");
|
||||
String localPathRoot = System.getProperty("test.build.data",
|
||||
"build/test/data");
|
||||
Path inDir = new Path(localPathRoot, "input");
|
||||
Path outDir = new Path(localPathRoot, "output");
|
||||
|
||||
conf.setBoolean(MRJobConfig.MAPREDUCE_JOB_EMIT_TIMELINE_DATA, false);
|
||||
RunningJob job =
|
||||
|
|
|
@ -436,8 +436,10 @@ public class TestMiniMRChildTask {
|
|||
|
||||
JobConf conf = new JobConf(mr.getConfig());
|
||||
// initialize input, output directories
|
||||
Path inDir = new Path("input");
|
||||
Path outDir = new Path("output");
|
||||
Path rootDir = new Path(System.getProperty("test.build.data",
|
||||
"build/test/data"));
|
||||
Path inDir = new Path(rootDir, "input");
|
||||
Path outDir = new Path(rootDir, "output");
|
||||
String input = "The input";
|
||||
|
||||
// set config to use the ExecutionEnvCheckMapClass map class
|
||||
|
@ -462,9 +464,10 @@ public class TestMiniMRChildTask {
|
|||
public void testTaskEnv(){
|
||||
try {
|
||||
JobConf conf = new JobConf(mr.getConfig());
|
||||
String baseDir = System.getProperty("test.build.data", "build/test/data");
|
||||
// initialize input, output directories
|
||||
Path inDir = new Path("testing/wc/input1");
|
||||
Path outDir = new Path("testing/wc/output1");
|
||||
Path inDir = new Path(baseDir + "/testing/wc/input1");
|
||||
Path outDir = new Path(baseDir + "/testing/wc/output1");
|
||||
FileSystem outFs = outDir.getFileSystem(conf);
|
||||
runTestTaskEnv(conf, inDir, outDir, false);
|
||||
outFs.delete(outDir, true);
|
||||
|
@ -485,9 +488,10 @@ public class TestMiniMRChildTask {
|
|||
public void testTaskOldEnv(){
|
||||
try {
|
||||
JobConf conf = new JobConf(mr.getConfig());
|
||||
String baseDir = System.getProperty("test.build.data", "build/test/data");
|
||||
// initialize input, output directories
|
||||
Path inDir = new Path("testing/wc/input1");
|
||||
Path outDir = new Path("testing/wc/output1");
|
||||
Path inDir = new Path(baseDir + "/testing/wc/input1");
|
||||
Path outDir = new Path(baseDir + "/testing/wc/output1");
|
||||
FileSystem outFs = outDir.getFileSystem(conf);
|
||||
runTestTaskEnv(conf, inDir, outDir, true);
|
||||
outFs.delete(outDir, true);
|
||||
|
|
|
@ -37,8 +37,9 @@ import java.util.Set;
|
|||
import java.util.UUID;
|
||||
|
||||
public class TestOldCombinerGrouping {
|
||||
private static String TEST_ROOT_DIR =
|
||||
new File("build", UUID.randomUUID().toString()).getAbsolutePath();
|
||||
private static String TEST_ROOT_DIR = new File(System.getProperty(
|
||||
"test.build.data", "build/test/data"), UUID.randomUUID().toString())
|
||||
.getAbsolutePath();
|
||||
|
||||
public static class Map implements
|
||||
Mapper<LongWritable, Text, Text, LongWritable> {
|
||||
|
|
|
@ -46,8 +46,9 @@ public class TestAggregates extends TestCase {
|
|||
FileSystem fs = FileSystem.get(conf);
|
||||
int numOfInputLines = 20;
|
||||
|
||||
Path OUTPUT_DIR = new Path("build/test/output_for_aggregates_test");
|
||||
Path INPUT_DIR = new Path("build/test/input_for_aggregates_test");
|
||||
String baseDir = System.getProperty("test.build.data", "build/test/data");
|
||||
Path OUTPUT_DIR = new Path(baseDir + "/output_for_aggregates_test");
|
||||
Path INPUT_DIR = new Path(baseDir + "/input_for_aggregates_test");
|
||||
String inputFile = "input.txt";
|
||||
fs.delete(INPUT_DIR, true);
|
||||
fs.mkdirs(INPUT_DIR);
|
||||
|
@ -115,7 +116,7 @@ public class TestAggregates extends TestCase {
|
|||
outdata = outdata.substring(0, expectedOutput.toString().length());
|
||||
|
||||
assertEquals(expectedOutput.toString(),outdata);
|
||||
//fs.delete(OUTPUT_DIR);
|
||||
fs.delete(OUTPUT_DIR, true);
|
||||
fs.delete(INPUT_DIR, true);
|
||||
}
|
||||
|
||||
|
|
|
@ -39,8 +39,9 @@ import java.util.Set;
|
|||
import java.util.UUID;
|
||||
|
||||
public class TestNewCombinerGrouping {
|
||||
private static String TEST_ROOT_DIR =
|
||||
new File("build", UUID.randomUUID().toString()).getAbsolutePath();
|
||||
private static String TEST_ROOT_DIR = new File(System.getProperty(
|
||||
"test.build.data", "build/test/data"), UUID.randomUUID().toString())
|
||||
.getAbsolutePath();
|
||||
|
||||
public static class Map extends
|
||||
Mapper<LongWritable, Text, Text, LongWritable> {
|
||||
|
|
|
@ -51,8 +51,9 @@ public class TestMapReduceAggregates extends TestCase {
|
|||
FileSystem fs = FileSystem.get(conf);
|
||||
int numOfInputLines = 20;
|
||||
|
||||
Path OUTPUT_DIR = new Path("build/test/output_for_aggregates_test");
|
||||
Path INPUT_DIR = new Path("build/test/input_for_aggregates_test");
|
||||
String baseDir = System.getProperty("test.build.data", "build/test/data");
|
||||
Path OUTPUT_DIR = new Path(baseDir + "/output_for_aggregates_test");
|
||||
Path INPUT_DIR = new Path(baseDir + "/input_for_aggregates_test");
|
||||
String inputFile = "input.txt";
|
||||
fs.delete(INPUT_DIR, true);
|
||||
fs.mkdirs(INPUT_DIR);
|
||||
|
|
|
@ -1772,7 +1772,9 @@ public class TestCombineFileInputFormat {
|
|||
// default fs path
|
||||
assertEquals(DUMMY_FS_URI, FileSystem.getDefaultUri(conf).toString());
|
||||
// add a local file
|
||||
Path localPath = new Path("testFile1");
|
||||
String localPathRoot = System.getProperty("test.build.data",
|
||||
"build/test/data");
|
||||
Path localPath = new Path(localPathRoot, "testFile1");
|
||||
FileSystem lfs = FileSystem.getLocal(conf);
|
||||
FSDataOutputStream dos = lfs.create(localPath);
|
||||
dos.writeChars("Local file for CFIF");
|
||||
|
|
Loading…
Reference in New Issue