You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sz...@apache.org on 2011/09/07 08:05:04 UTC
svn commit: r1166009 - in
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src:
main/resources/core-default.xml
test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
Author: szetszwo
Date: Wed Sep 7 06:05:04 2011
New Revision: 1166009
URL: http://svn.apache.org/viewvc?rev=1166009&view=rev
Log:
Commit the test and the conf changes in common for HDFS-2284.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml?rev=1166009&r1=1166008&r2=1166009&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml Wed Sep 7 06:05:04 2011
@@ -318,6 +318,11 @@
</property>
<property>
+ <name>fs.webhdfs.impl</name>
+ <value>org.apache.hadoop.hdfs.web.WebHdfsFileSystem</value>
+</property>
+
+<property>
<name>fs.ftp.impl</name>
<value>org.apache.hadoop.fs.ftp.FTPFileSystem</value>
<description>The FileSystem for ftp: uris.</description>
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java?rev=1166009&r1=1166008&r2=1166009&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java Wed Sep 7 06:05:04 2011
@@ -32,6 +32,7 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.mortbay.log.Log;
import static org.apache.hadoop.fs.FileSystemTestHelper.*;
@@ -62,8 +63,6 @@ public abstract class FSMainOperationsBa
private static String TEST_DIR_AXX = "test/hadoop/axx";
private static int numBlocks = 2;
- static final String LOCAL_FS_ROOT_URI = "file:///tmp/test";
-
protected static FileSystem fSys;
@@ -83,7 +82,7 @@ public abstract class FSMainOperationsBa
}
};
- private static byte[] data = getFileData(numBlocks,
+ protected static final byte[] data = getFileData(numBlocks,
getDefaultBlockSize());
@Before
@@ -183,7 +182,7 @@ public abstract class FSMainOperationsBa
@Test
public void testWDAbsolute() throws IOException {
- Path absoluteDir = new Path(LOCAL_FS_ROOT_URI + "/existingDir");
+ Path absoluteDir = new Path(fSys.getUri() + "/test/existingDir");
fSys.mkdirs(absoluteDir);
fSys.setWorkingDirectory(absoluteDir);
Assert.assertEquals(absoluteDir, fSys.getWorkingDirectory());
@@ -646,7 +645,7 @@ public abstract class FSMainOperationsBa
writeReadAndDelete(getDefaultBlockSize() * 2);
}
- private void writeReadAndDelete(int len) throws IOException {
+ protected void writeReadAndDelete(int len) throws IOException {
Path path = getTestRootPath(fSys, "test/hadoop/file");
fSys.mkdirs(path.getParent());
@@ -768,6 +767,7 @@ public abstract class FSMainOperationsBa
rename(src, dst, false, false, false, Rename.NONE);
Assert.fail("Should throw FileNotFoundException");
} catch (IOException e) {
+ Log.info("XXX", e);
Assert.assertTrue(unwrapException(e) instanceof FileNotFoundException);
}
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java?rev=1166009&r1=1166008&r2=1166009&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java Wed Sep 7 06:05:04 2011
@@ -45,7 +45,7 @@ import org.apache.hadoop.fs.Path;
public abstract class FileSystemContractBaseTest extends TestCase {
protected FileSystem fs;
- private byte[] data = new byte[getBlockSize() * 2]; // two blocks of data
+ protected byte[] data = new byte[getBlockSize() * 2]; // two blocks of data
{
for (int i = 0; i < data.length; i++) {
data[i] = (byte) (i % 10);
@@ -215,7 +215,7 @@ public abstract class FileSystemContract
writeReadAndDelete(getBlockSize() * 2);
}
- private void writeReadAndDelete(int len) throws IOException {
+ protected void writeReadAndDelete(int len) throws IOException {
Path path = path("/test/hadoop/file");
fs.mkdirs(path.getParent());
@@ -256,7 +256,7 @@ public abstract class FileSystemContract
assertEquals("Length", data.length, fs.getFileStatus(path).getLen());
try {
- fs.create(path, false);
+ fs.create(path, false).close();
fail("Should throw IOException.");
} catch (IOException e) {
// Expected