From 7784b10808c2146cde8025d56e80f042ec3581c6 Mon Sep 17 00:00:00 2001 From: arp Date: Fri, 12 Dec 2014 14:27:50 -0800 Subject: [PATCH] HDFS-7514. TestTextCommand fails on Windows. (Arpit Agarwal) --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../java/org/apache/hadoop/fs/shell/TestHdfsTextCommand.java | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 9cd5b0591c1..d635400fb5c 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 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 f589d7e27a4..76c32bfbaa9 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 @@ * 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;