Author: daryn
Date: Tue Nov 6 16:13:05 2012
New Revision: 1406203
URL: http://svn.apache.org/viewvc?rev=1406203&view=rev
Log:
svn merge -c 1406198 FIXES: HDFS-1331. dfs -test should work like /bin/test
(Andy Isaacson via daryn)
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1406203&r1=1406202&r2=1406203&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Tue Nov 6 16:13:05 2012
@@ -199,6 +199,8 @@ Release 2.0.3-alpha - Unreleased
HDFS-4132. When libwebhdfs is not enabled, nativeMiniDfsClient frees
uninitialized memory (Colin Patrick McCabe via todd)
+ HDFS-1331. dfs -test should work like /bin/test (Andy Isaacson via daryn)
+
Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java?rev=1406203&r1=1406202&r2=1406203&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java
Tue Nov 6 16:13:05 2012
@@ -1243,7 +1243,106 @@ public class TestDFSShell {
}
assertEquals(0, val);
}
-
+
+ // Verify -test -f negative case (missing file)
+ {
+ String[] args = new String[3];
+ args[0] = "-test";
+ args[1] = "-f";
+ args[2] = "/test/mkdirs/noFileHere";
+ int val = -1;
+ try {
+ val = shell.run(args);
+ } catch (Exception e) {
+ System.err.println("Exception raised from DFSShell.run " +
+ e.getLocalizedMessage());
+ }
+ assertEquals(1, val);
+ }
+
+ // Verify -test -f negative case (directory rather than file)
+ {
+ String[] args = new String[3];
+ args[0] = "-test";
+ args[1] = "-f";
+ args[2] = "/test/mkdirs";
+ int val = -1;
+ try {
+ val = shell.run(args);
+ } catch (Exception e) {
+ System.err.println("Exception raised from DFSShell.run " +
+ e.getLocalizedMessage());
+ }
+ assertEquals(1, val);
+ }
+
+ // Verify -test -f positive case
+ {
+ writeFile(fileSys, myFile);
+ assertTrue(fileSys.exists(myFile));
+
+ String[] args = new String[3];
+ args[0] = "-test";
+ args[1] = "-f";
+ args[2] = myFile.toString();
+ int val = -1;
+ try {
+ val = shell.run(args);
+ } catch (Exception e) {
+ System.err.println("Exception raised from DFSShell.run " +
+ e.getLocalizedMessage());
+ }
+ assertEquals(0, val);
+ }
+
+ // Verify -test -s negative case (missing file)
+ {
+ String[] args = new String[3];
+ args[0] = "-test";
+ args[1] = "-s";
+ args[2] = "/test/mkdirs/noFileHere";
+ int val = -1;
+ try {
+ val = shell.run(args);
+ } catch (Exception e) {
+ System.err.println("Exception raised from DFSShell.run " +
+ e.getLocalizedMessage());
+ }
+ assertEquals(1, val);
+ }
+
+ // Verify -test -s negative case (zero length file)
+ {
+ String[] args = new String[3];
+ args[0] = "-test";
+ args[1] = "-s";
+ args[2] = "/test/mkdirs/isFileHere";
+ int val = -1;
+ try {
+ val = shell.run(args);
+ } catch (Exception e) {
+ System.err.println("Exception raised from DFSShell.run " +
+ e.getLocalizedMessage());
+ }
+ assertEquals(1, val);
+ }
+
+ // Verify -test -s positive case (nonzero length file)
+ {
+ String[] args = new String[3];
+ args[0] = "-test";
+ args[1] = "-s";
+ args[2] = myFile.toString();
+ int val = -1;
+ try {
+ val = shell.run(args);
+ } catch (Exception e) {
+ System.err.println("Exception raised from DFSShell.run " +
+ e.getLocalizedMessage());
+ }
+ assertEquals(0, val);
+ }
+
} finally {
try {
fileSys.close();
