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:
parent
b427fe9de8
commit
6942fd1db5
@ -453,6 +453,9 @@ Trunk (Unreleased)
|
||||
HADOOP-9373. Merge CHANGES.branch-trunk-win.txt to CHANGES.txt.
|
||||
(suresh)
|
||||
|
||||
HADOOP-9372. Fix bad timeout annotations on tests.
|
||||
(Arpit Agarwal via suresh)
|
||||
|
||||
Release 2.0.4-beta - UNRELEASED
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
@ -152,7 +152,6 @@ private void assertPermissions(File file, String expected)
|
||||
assertEquals(expected, output);
|
||||
}
|
||||
|
||||
@Test (timeout = 30000)
|
||||
private void testChmodInternal(String mode, String expectedPerm)
|
||||
throws IOException {
|
||||
File a = new File(TEST_DIR, "file1");
|
||||
@ -171,7 +170,6 @@ private void testChmodInternal(String mode, String expectedPerm)
|
||||
assertFalse(a.exists());
|
||||
}
|
||||
|
||||
@Test (timeout = 30000)
|
||||
private void testNewFileChmodInternal(String expectedPerm) throws IOException {
|
||||
// Create a new directory
|
||||
File dir = new File(TEST_DIR, "dir1");
|
||||
@ -193,7 +191,6 @@ private void testNewFileChmodInternal(String expectedPerm) throws IOException {
|
||||
assertFalse(dir.exists());
|
||||
}
|
||||
|
||||
@Test (timeout = 30000)
|
||||
private void testChmodInternalR(String mode, String expectedPerm,
|
||||
String expectedPermx) throws IOException {
|
||||
// Setup test folder hierarchy
|
||||
|
@ -177,6 +177,9 @@ Trunk (Unreleased)
|
||||
MAPREDUCE-4983. Fixed various platform specific assumptions in various tests,
|
||||
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
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
@ -144,7 +144,7 @@ public static void tearDown() {
|
||||
}
|
||||
}
|
||||
|
||||
@Test (timeout = 30000)
|
||||
@Test (timeout = 300000)
|
||||
public void testSleepJob() throws IOException, InterruptedException,
|
||||
ClassNotFoundException {
|
||||
LOG.info("\n\n\nStarting testSleepJob().");
|
||||
@ -542,7 +542,7 @@ public void _testDistributedCache(String jobJarPath) throws Exception {
|
||||
trackingUrl.endsWith(jobId.substring(jobId.lastIndexOf("_")) + "/"));
|
||||
}
|
||||
|
||||
@Test (timeout = 30000)
|
||||
@Test (timeout = 300000)
|
||||
public void testDistributedCache() throws Exception {
|
||||
// Test with a local (file:///) Job Jar
|
||||
Path localJobJarPath = makeJobJarWithLib(TEST_ROOT_DIR.toUri().toString());
|
||||
|
Loading…
Reference in New Issue
Block a user