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

svn merge -c 1584767 from trunk for the hadoop-common part of HDFS-6189. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584771 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2014-04-04 15:54:50 +00:00
parent 0741fef232
commit f290904937
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
View File

@ -90,6 +90,10 @@ public abstract class FSMainOperationsBaseTest extends FileSystemTestHelper {
public FSMainOperationsBaseTest() { public FSMainOperationsBaseTest() {
} }
public FSMainOperationsBaseTest(String testRootDir) {
super(testRootDir);
}
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
fSys = createFileSystem(); fSys = createFileSystem();

2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextTestHelper.java
View File

@ -49,7 +49,7 @@ public final class FileContextTestHelper {
/** /**
* Create a context with the given test root * Create a context with the given test root
*/ */
private FileContextTestHelper(String testRootDir) { public FileContextTestHelper(String testRootDir) {
this.testRootDir = testRootDir; this.testRootDir = testRootDir;
} }

2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemTestHelper.java
View File

@ -52,7 +52,7 @@ public class FileSystemTestHelper {
/** /**
* Create helper with the specified test root dir * Create helper with the specified test root dir
*/ */
private FileSystemTestHelper(String testRootDir) { public FileSystemTestHelper(String testRootDir) {
this.testRootDir = testRootDir; this.testRootDir = testRootDir;
} }