Author: szetszwo
Date: Tue Oct 14 11:49:31 2008
New Revision: 704612
URL: http://svn.apache.org/viewvc?rev=704612&view=rev
Log:
HADOOP-4403. Make TestLeaseRecovery and TestFileCreation more robust. (szetszwo)
Modified:
hadoop/core/branches/branch-0.18/CHANGES.txt
hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestFileCreation.java
hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestLeaseRecovery.java
Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=704612&r1=704611&r2=704612&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Tue Oct 14 11:49:31 2008
@@ -23,6 +23,9 @@
HADOOP-4407. HADOOP-4395 should use a Java 1.5 API for 0.18. (szetszwo)
+ HADOOP-4403. Make TestLeaseRecovery and TestFileCreation more robust.
+ (szetszwo)
+
NEW FEATURES
HADOOP-2421. Add jdiff output to documentation, listing all API
Modified:
hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestFileCreation.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestFileCreation.java?rev=704612&r1=704611&r2=704612&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestFileCreation.java
(original)
+++
hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestFileCreation.java
Tue Oct 14 11:49:31 2008
@@ -199,7 +199,6 @@
assertEquals(SimulatedFSDataset.DEFAULT_CAPACITY-fileSize,
dn.getFSDataset().getRemaining());
}
} finally {
- fs.close();
cluster.shutdown();
}
}
@@ -334,7 +333,6 @@
assertTrue("Error blocks were not cleaned up",
locations.locatedBlockCount() == 0);
} finally {
- fs.close();
cluster.shutdown();
client.close();
}
@@ -583,9 +581,6 @@
assertTrue(file1 + " does not exist.", fs.exists(file1));
} finally {
- if (fs != null) {
- fs.close();
- }
cluster.shutdown();
}
}
Modified:
hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestLeaseRecovery.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestLeaseRecovery.java?rev=704612&r1=704611&r2=704612&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestLeaseRecovery.java
(original)
+++
hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestLeaseRecovery.java
Tue Oct 14 11:49:31 2008
@@ -64,6 +64,7 @@
Path filepath = new Path(filestr);
DFSTestUtil.createFile(dfs, filepath, ORG_FILE_SIZE, REPLICATION_NUM,
0L);
assertTrue(dfs.dfs.exists(filestr));
+ DFSTestUtil.waitReplication(dfs, filepath, REPLICATION_NUM);
//get block info for the last block
LocatedBlock locatedblock =
TestInterDatanodeProtocol.getLastLocatedBlock(
