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

HADOOP-9372. Fix bad timeout annotations on tests. Contributed by Arpit Agarwal. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1453637 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2013-03-07 01:09:53 +00:00
parent b427fe9de8
commit 6942fd1db5
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -453,6 +453,9 @@ Trunk (Unreleased)
HADOOP-9373. Merge CHANGES.branch-trunk-win.txt to CHANGES.txt. HADOOP-9373. Merge CHANGES.branch-trunk-win.txt to CHANGES.txt.
(suresh) (suresh)
HADOOP-9372. Fix bad timeout annotations on tests.
(Arpit Agarwal via suresh)
Release 2.0.4-beta - UNRELEASED Release 2.0.4-beta - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

3
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestWinUtils.java
View File

@ -152,7 +152,6 @@ private void assertPermissions(File file, String expected)
assertEquals(expected, output); assertEquals(expected, output);
} }
@Test (timeout = 30000)
private void testChmodInternal(String mode, String expectedPerm) private void testChmodInternal(String mode, String expectedPerm)
throws IOException { throws IOException {
File a = new File(TEST_DIR, "file1"); File a = new File(TEST_DIR, "file1");
@ -171,7 +170,6 @@ private void testChmodInternal(String mode, String expectedPerm)
assertFalse(a.exists()); assertFalse(a.exists());
} }
@Test (timeout = 30000)
private void testNewFileChmodInternal(String expectedPerm) throws IOException { private void testNewFileChmodInternal(String expectedPerm) throws IOException {
// Create a new directory // Create a new directory
File dir = new File(TEST_DIR, "dir1"); File dir = new File(TEST_DIR, "dir1");
@ -193,7 +191,6 @@ private void testNewFileChmodInternal(String expectedPerm) throws IOException {
assertFalse(dir.exists()); assertFalse(dir.exists());
} }
@Test (timeout = 30000)
private void testChmodInternalR(String mode, String expectedPerm, private void testChmodInternalR(String mode, String expectedPerm,
String expectedPermx) throws IOException { String expectedPermx) throws IOException {
// Setup test folder hierarchy // Setup test folder hierarchy

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

@ -177,6 +177,9 @@ Trunk (Unreleased)
MAPREDUCE-4983. Fixed various platform specific assumptions in various tests, MAPREDUCE-4983. Fixed various platform specific assumptions in various tests,
so that they can pass on Windows too. (Chris Nauroth via vinodkv) so that they can pass on Windows too. (Chris Nauroth via vinodkv)
HADOOP-9372. Fix bad timeout annotations on tests.
(Arpit Agarwal via suresh)
Release 2.0.4-beta - UNRELEASED Release 2.0.4-beta - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobs.java
View File

@ -144,7 +144,7 @@ public static void tearDown() {
} }
} }
@Test (timeout = 30000) @Test (timeout = 300000)
public void testSleepJob() throws IOException, InterruptedException, public void testSleepJob() throws IOException, InterruptedException,
ClassNotFoundException { ClassNotFoundException {
LOG.info("\n\n\nStarting testSleepJob()."); LOG.info("\n\n\nStarting testSleepJob().");
@ -542,7 +542,7 @@ public void _testDistributedCache(String jobJarPath) throws Exception {
trackingUrl.endsWith(jobId.substring(jobId.lastIndexOf("_")) + "/")); trackingUrl.endsWith(jobId.substring(jobId.lastIndexOf("_")) + "/"));
} }
@Test (timeout = 30000) @Test (timeout = 300000)
public void testDistributedCache() throws Exception { public void testDistributedCache() throws Exception {
// Test with a local (file:///) Job Jar // Test with a local (file:///) Job Jar
Path localJobJarPath = makeJobJarWithLib(TEST_ROOT_DIR.toUri().toString()); Path localJobJarPath = makeJobJarWithLib(TEST_ROOT_DIR.toUri().toString());