From 1a6cb061979632892ff66dae9d2207530ded8431 Mon Sep 17 00:00:00 2001 From: Eli Collins Date: Wed, 22 Aug 2012 16:22:55 +0000 Subject: [PATCH] HADOOP-8720. TestLocalFileSystem should use test root subdirectory. Contributed by Vlad Rozov git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376124 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../test/java/org/apache/hadoop/fs/TestLocalFileSystem.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 21ed78531bb..3fd89b817dc 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -210,6 +210,9 @@ Release 2.0.1-alpha - UNRELEASED HADOOP-8614. IOUtils#skipFully hangs forever on EOF. (Colin Patrick McCabe via eli) + HADOOP-8720. TestLocalFileSystem should use test root subdirectory. + (Vlad Rozov via eli) + BREAKDOWN OF HDFS-3042 SUBTASKS HADOOP-8220. ZKFailoverController doesn't handle failure to become active diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java index 4d821f96f81..e411314b85e 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java @@ -33,8 +33,8 @@ * This class tests the local file system via the FileSystem abstraction. */ public class TestLocalFileSystem { - private static String TEST_ROOT_DIR - = System.getProperty("test.build.data","build/test/data/work-dir/localfs"); + private static final String TEST_ROOT_DIR + = System.getProperty("test.build.data","build/test/data") + "/work-dir/localfs"; private Configuration conf; private FileSystem fileSys;