Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-5832. Fixed TestJobClient to not fail on JDK7 or on Windows. Contributed by Jian He and Vinod Kumar Vavilapalli. 

svn merge --ignore-ancestry -c 1589315 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589316 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2014-04-23 00:02:46 +00:00
parent 8296b7e3cc
commit c5450fd0fe
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -82,6 +82,9 @@ Release 2.4.1 - UNRELEASED
MAPREDUCE-5833. TestRMContainerAllocator fails ocassionally. MAPREDUCE-5833. TestRMContainerAllocator fails ocassionally.
(Zhijie Shen via cnauroth) (Zhijie Shen via cnauroth)
MAPREDUCE-5832. Fixed TestJobClient to not fail on JDK7 or on Windows. (Jian
He and Vinod Kumar Vavilapalli via vinodkv)
Release 2.4.0 - 2014-04-07 Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

17
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestJobClient.java
View File

@ -23,16 +23,24 @@ import java.util.Collection;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.ClusterStatus.BlackListInfo; import org.apache.hadoop.mapred.ClusterStatus.BlackListInfo;
import org.apache.hadoop.mapreduce.MRConfig; import org.apache.hadoop.mapreduce.MRConfig;
import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig; import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
import org.junit.After;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
public class TestJobClient { public class TestJobClient {
final static String TEST_DIR = new File(System.getProperty("test.build.data",
"/tmp")).getAbsolutePath(); final static String TEST_DIR = new File("target",
TestJobClient.class.getSimpleName()).getAbsolutePath();
@After
public void tearDown() {
FileUtil.fullyDelete(new File(TEST_DIR));
}
@Test @Test
public void testGetClusterStatusWithLocalJobRunner() throws Exception { public void testGetClusterStatusWithLocalJobRunner() throws Exception {
@ -51,11 +59,12 @@ public class TestJobClient {
Assert.assertEquals(0, blackListedTrackersInfo.size()); Assert.assertEquals(0, blackListedTrackersInfo.size());
} }
@Test(timeout = 1000) @Test(timeout = 10000)
public void testIsJobDirValid() throws IOException { public void testIsJobDirValid() throws IOException {
Configuration conf = new Configuration(); Configuration conf = new Configuration();
FileSystem fs = FileSystem.getLocal(conf); FileSystem fs = FileSystem.getLocal(conf);
Path testDir = new Path(TEST_DIR); Path testDir = new Path(TEST_DIR);
fs.mkdirs(testDir);
Assert.assertFalse(JobClient.isJobDirValid(testDir, fs)); Assert.assertFalse(JobClient.isJobDirValid(testDir, fs));
Path jobconf = new Path(testDir, "job.xml"); Path jobconf = new Path(testDir, "job.xml");
@ -68,7 +77,7 @@ public class TestJobClient {
fs.delete(jobsplit, true); fs.delete(jobsplit, true);
} }
@Test(timeout = 1000) @Test(timeout = 10000)
public void testGetStagingAreaDir() throws IOException, InterruptedException { public void testGetStagingAreaDir() throws IOException, InterruptedException {
Configuration conf = new Configuration(); Configuration conf = new Configuration();
JobClient client = new JobClient(conf); JobClient client = new JobClient(conf);