You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by su...@apache.org on 2009/12/17 10:09:45 UTC
svn commit: r891593 - in /hadoop/hdfs/trunk: CHANGES.txt
src/test/hdfs/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java
Author: suresh
Date: Thu Dec 17 09:09:45 2009
New Revision: 891593
URL: http://svn.apache.org/viewvc?rev=891593&view=rev
Log:
HDFS-840. Change tests to use FileContext test helper introduced in HADOOP-6394. Contributed by Jitendra Nath Pandey.
Modified:
hadoop/hdfs/trunk/CHANGES.txt
hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java
Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=891593&r1=891592&r2=891593&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Thu Dec 17 09:09:45 2009
@@ -38,6 +38,9 @@
HDFS-832. HDFS side of HADOOP-6222. (cos)
+ HDFS-840. Change tests to use FileContext test helper introduced in
+ HADOOP-6394. (Jitendra Nath Pandey via suresh)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java?rev=891593&r1=891592&r2=891593&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java (original)
+++ hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java Thu Dec 17 09:09:45 2009
@@ -37,6 +37,8 @@
import org.junit.BeforeClass;
import org.junit.Test;
+import static org.apache.hadoop.fs.FileContextTestHelper.*;
+
public class TestHDFSFileContextMainOperations extends
FileContextMainOperationsBaseTest {
private static MiniDFSCluster cluster;
@@ -99,10 +101,10 @@
@Test
public void testOldRenameWithQuota() throws Exception {
DistributedFileSystem fs = (DistributedFileSystem) cluster.getFileSystem();
- Path src1 = getTestRootPath("test/testOldRenameWithQuota/srcdir/src1");
- Path src2 = getTestRootPath("test/testOldRenameWithQuota/srcdir/src2");
- Path dst1 = getTestRootPath("test/testOldRenameWithQuota/dstdir/dst1");
- Path dst2 = getTestRootPath("test/testOldRenameWithQuota/dstdir/dst2");
+ Path src1 = getTestRootPath(fc, "test/testOldRenameWithQuota/srcdir/src1");
+ Path src2 = getTestRootPath(fc, "test/testOldRenameWithQuota/srcdir/src2");
+ Path dst1 = getTestRootPath(fc, "test/testOldRenameWithQuota/dstdir/dst1");
+ Path dst2 = getTestRootPath(fc, "test/testOldRenameWithQuota/dstdir/dst2");
createFile(src1);
createFile(src2);
fs.setQuota(src1.getParent(), FSConstants.QUOTA_DONT_SET,
@@ -134,10 +136,10 @@
@Test
public void testRenameWithQuota() throws Exception {
DistributedFileSystem fs = (DistributedFileSystem) cluster.getFileSystem();
- Path src1 = getTestRootPath("test/testRenameWithQuota/srcdir/src1");
- Path src2 = getTestRootPath("test/testRenameWithQuota/srcdir/src2");
- Path dst1 = getTestRootPath("test/testRenameWithQuota/dstdir/dst1");
- Path dst2 = getTestRootPath("test/testRenameWithQuota/dstdir/dst2");
+ Path src1 = getTestRootPath(fc, "test/testRenameWithQuota/srcdir/src1");
+ Path src2 = getTestRootPath(fc, "test/testRenameWithQuota/srcdir/src2");
+ Path dst1 = getTestRootPath(fc, "test/testRenameWithQuota/dstdir/dst1");
+ Path dst2 = getTestRootPath(fc, "test/testRenameWithQuota/dstdir/dst2");
createFile(src1);
createFile(src2);
fs.setQuota(src1.getParent(), FSConstants.QUOTA_DONT_SET,
@@ -184,7 +186,7 @@
@Test
public void testRenameRoot() throws Exception {
- Path src = getTestRootPath("test/testRenameRoot/srcdir/src1");
+ Path src = getTestRootPath(fc, "test/testRenameRoot/srcdir/src1");
Path dst = new Path("/");
createFile(src);
rename(src, dst, true, false, true, Rename.OVERWRITE);
@@ -198,8 +200,8 @@
@Test
public void testEditsLogOldRename() throws Exception {
DistributedFileSystem fs = (DistributedFileSystem) cluster.getFileSystem();
- Path src1 = getTestRootPath("testEditsLogOldRename/srcdir/src1");
- Path dst1 = getTestRootPath("testEditsLogOldRename/dstdir/dst1");
+ Path src1 = getTestRootPath(fc, "testEditsLogOldRename/srcdir/src1");
+ Path dst1 = getTestRootPath(fc, "testEditsLogOldRename/dstdir/dst1");
createFile(src1);
fs.mkdirs(dst1.getParent());
createFile(dst1);
@@ -214,8 +216,8 @@
// loaded from the edits log
restartCluster();
fs = (DistributedFileSystem)cluster.getFileSystem();
- src1 = getTestRootPath("testEditsLogOldRename/srcdir/src1");
- dst1 = getTestRootPath("testEditsLogOldRename/dstdir/dst1");
+ src1 = getTestRootPath(fc, "testEditsLogOldRename/srcdir/src1");
+ dst1 = getTestRootPath(fc, "testEditsLogOldRename/dstdir/dst1");
Assert.assertFalse(fs.exists(src1)); // ensure src1 is already renamed
Assert.assertTrue(fs.exists(dst1)); // ensure rename dst exists
}
@@ -227,8 +229,8 @@
@Test
public void testEditsLogRename() throws Exception {
DistributedFileSystem fs = (DistributedFileSystem) cluster.getFileSystem();
- Path src1 = getTestRootPath("testEditsLogRename/srcdir/src1");
- Path dst1 = getTestRootPath("testEditsLogRename/dstdir/dst1");
+ Path src1 = getTestRootPath(fc, "testEditsLogRename/srcdir/src1");
+ Path dst1 = getTestRootPath(fc, "testEditsLogRename/dstdir/dst1");
createFile(src1);
fs.mkdirs(dst1.getParent());
createFile(dst1);
@@ -243,8 +245,8 @@
// loaded from the edits log
restartCluster();
fs = (DistributedFileSystem)cluster.getFileSystem();
- src1 = getTestRootPath("testEditsLogRename/srcdir/src1");
- dst1 = getTestRootPath("testEditsLogRename/dstdir/dst1");
+ src1 = getTestRootPath(fc, "testEditsLogRename/srcdir/src1");
+ dst1 = getTestRootPath(fc, "testEditsLogRename/dstdir/dst1");
Assert.assertFalse(fs.exists(src1)); // ensure src1 is already renamed
Assert.assertTrue(fs.exists(dst1)); // ensure rename dst exists
}