Author: cnauroth Date: Mon Apr 14 04:38:46 2014 New Revision: 1587146 URL: http://svn.apache.org/r1587146 Log: HDFS-6237. TestDFSShell#testGet fails on Windows due to invalid file system path. Contributed by Chris Nauroth.
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1587146&r1=1587145&r2=1587146&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Mon Apr 14 04:38:46 2014 @@ -338,6 +338,9 @@ Release 2.5.0 - UNRELEASED HDFS-5669. Storage#tryLock() should check for null before logging successfull message (Vinayakumar B via umamahesh) + HDFS-6237. TestDFSShell#testGet fails on Windows due to invalid file system + path. (cnauroth) + Release 2.4.1 - UNRELEASED INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java?rev=1587146&r1=1587145&r2=1587146&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java Mon Apr 14 04:38:46 2014 @@ -1477,7 +1477,8 @@ public class TestDFSShell { private final FsShell shell = new FsShell(conf); public String run(int exitcode, String... options) throws IOException { - String dst = TEST_ROOT_DIR + "/" + fname+ ++count; + String dst = new File(TEST_ROOT_DIR, fname + ++count) + .getAbsolutePath(); String[] args = new String[options.length + 3]; args[0] = "-get"; args[args.length - 2] = remotef.toString();