From f290904937a99d4d4baed63e5571749b8c81d666 Mon Sep 17 00:00:00 2001
From: Tsz-wo Sze <szetszwo@apache.org>
Date: Fri, 4 Apr 2014 15:54:50 +0000
Subject: [PATCH] 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
---
 .../java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java   | 4 ++++
 .../test/java/org/apache/hadoop/fs/FileContextTestHelper.java | 2 +-
 .../test/java/org/apache/hadoop/fs/FileSystemTestHelper.java  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
index 0df0fe7f259..e862db4acd9 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
@@ -90,6 +90,10 @@ public abstract class FSMainOperationsBaseTest extends FileSystemTestHelper {
   public FSMainOperationsBaseTest() {
   }
   
+  public FSMainOperationsBaseTest(String testRootDir) {
+      super(testRootDir);
+  }
+  
   @Before
   public void setUp() throws Exception {
     fSys = createFileSystem();
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextTestHelper.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextTestHelper.java
index 698d38d9c36..677aa037f03 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextTestHelper.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextTestHelper.java
@@ -49,7 +49,7 @@ public final class FileContextTestHelper {
   /**
    * Create a context with the given test root
    */
-  private FileContextTestHelper(String testRootDir) {
+  public FileContextTestHelper(String testRootDir) {
     this.testRootDir = testRootDir;
   }
   
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemTestHelper.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemTestHelper.java
index fc058ca19bf..a5d8403c66a 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemTestHelper.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemTestHelper.java
@@ -52,7 +52,7 @@ public class FileSystemTestHelper {
   /**
    * Create helper with the specified test root dir
    */
-  private FileSystemTestHelper(String testRootDir) {
+  public FileSystemTestHelper(String testRootDir) {
       this.testRootDir = testRootDir;
   }