HADOOP-3114. Fix TestDFSShell on Windows. Contributed by Lohit Vijaya Renu.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@642321 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -409,6 +409,8 @@ Trunk (unreleased changes)
     HADOOP-2997. Adds test for non-writable serialier. Also fixes a problem 
     introduced by HADOOP-2399. (Tom White via ddas)
 
+    HADOOP-3114. Fix TestDFSShell on Windows. (Lohit Vijaya Renu via cdouglas)
+
 Release 0.16.2 - Unreleased
 
   BUG FIXES

src/java/org/apache/hadoop/fs/FsShell.java

@@ -1610,7 +1610,7 @@ public class FsShell extends Configured implements Tool {
     } else if ("-put".equals(cmd) || "-copyFromLocal".equals(cmd) ||
                "-moveFromLocal".equals(cmd)) {
       System.err.println("Usage: java FsShell" + 
-                         " [" + cmd + " <localsrc> <dst>]");
+                         " [" + cmd + " <localsrc> ... <dst>]");
     } else if ("-get".equals(cmd)) {
       System.err.println("Usage: java FsShell [" + GET_SHORT_USAGE + "]"); 
     } else if ("-copyToLocal".equals(cmd)) {

src/test/org/apache/hadoop/dfs/TestDFSShell.java

@@ -211,8 +211,8 @@ public class TestDFSShell extends TestCase {
       srcs[0] = new Path(f1.getPath());
       srcs[1] = new Path(f2.getPath());
       dfs.moveFromLocalFile(srcs, destmultiple2);
-      assertFalse(dfs.exists(srcs[0]));
-      assertFalse(dfs.exists(srcs[1]));
+      assertFalse(f1.exists());
+      assertFalse(f2.exists());
       srcs[0] = new Path(destmultiple2, "f1");
       srcs[1] = new Path(destmultiple2, "f2");
       assertTrue(dfs.exists(srcs[0]));