Author: cnauroth
Date: Sat Feb 1 05:58:31 2014
New Revision: 1563375
URL: http://svn.apache.org/r1563375
Log:
HDFS-5861. Add CLI test for Ls output for extended ACL marker. Contributed by
Vinay.
Modified:
hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt
hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml
Modified:
hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt?rev=1563375&r1=1563374&r2=1563375&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt
(original)
+++
hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt
Sat Feb 1 05:58:31 2014
@@ -59,6 +59,9 @@ HDFS-4685 (Unreleased)
HDFS-5860. Refactor INodeDirectory getDirectoryXFeature methods to use
common getFeature helper method. (Jing Zhao via cnauroth)
+ HDFS-5861. Add CLI test for Ls output for extended ACL marker.
+ (Vinay via cnauroth)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml?rev=1563375&r1=1563374&r2=1563375&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml
(original)
+++
hadoop/common/branches/HDFS-4685/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml
Sat Feb 1 05:58:31 2014
@@ -886,5 +886,26 @@
</comparator>
</comparators>
</test>
+ <test>
+ <description>ls: display extended acl marker</description>
+ <test-commands>
+ <command>-fs NAMENODE -mkdir -p /dir1/dir2</command>
+ <command>-fs NAMENODE -setfacl -m
user:charlie:rwx,group::-wx,group:sales:rwx,mask::r-x,default:user:charlie:rwx,default:group::r-x,default:group:sales:rwx,default:mask::rw-
/dir1/dir2</command>
+ <command>-fs NAMENODE -ls /dir1</command>
+ </test-commands>
+ <cleanup-commands>
+ <command>-fs NAMENODE -rm -R /dir1</command>
+ </cleanup-commands>
+ <comparators>
+ <comparator>
+ <type>TokenComparator</type>
+ <expected-output>Found 1 items</expected-output>
+ </comparator>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>^drwxr-xr-x\+( )*-( )*[a-zA-z0-9]*( )*supergroup(
)*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*/dir1/dir2</expected-output>
+ </comparator>
+ </comparators>
+ </test>
</tests>
</configuration>
