Repository: hadoop Updated Branches: refs/heads/branch-2 d9f31c647 -> d15fb57f4 refs/heads/trunk 46612c7a5 -> 7784b1080
HDFS-7514. TestTextCommand fails on Windows. (Arpit Agarwal) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7784b108 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7784b108 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7784b108 Branch: refs/heads/trunk Commit: 7784b10808c2146cde8025d56e80f042ec3581c6 Parents: 46612c7 Author: arp <[email protected]> Authored: Fri Dec 12 14:27:50 2014 -0800 Committer: arp <[email protected]> Committed: Fri Dec 12 14:27:50 2014 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../test/java/org/apache/hadoop/fs/shell/TestHdfsTextCommand.java | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7784b108/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 9cd5b05..d635400 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -582,6 +582,8 @@ Release 2.7.0 - UNRELEASED HDFS-7517. Remove redundant non-null checks in FSNamesystem# getBlockLocations. (wheat9) + HDFS-7514. TestTextCommand fails on Windows. (Arpit Agarwal) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/7784b108/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/shell/TestHdfsTextCommand.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/shell/TestHdfsTextCommand.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/shell/TestHdfsTextCommand.java index f589d7e..76c32bf 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/shell/TestHdfsTextCommand.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/shell/TestHdfsTextCommand.java @@ -43,8 +43,7 @@ import org.junit.Test; * by the Text command. */ public class TestHdfsTextCommand { - private static final String TEST_ROOT_DIR = - System.getProperty("test.build.data", "build/test/data/") + "/testText"; + private static final String TEST_ROOT_DIR = "/test/data/testText"; private static final Path AVRO_FILENAME = new Path(TEST_ROOT_DIR, "weather.avro"); private static MiniDFSCluster cluster; private static FileSystem fs;
