From 68e98d918bce7e37025ffc9a6890d9e6c70797b9 Mon Sep 17 00:00:00 2001
From: tangyoupeng <tommy@juicedata.io>
Date: Wed, 20 Mar 2024 10:16:08 +0800
Subject: [PATCH] add more test

---
 pkg/fs/fs.go                                  |   19 +
 sdk/java/libjfs/main.go                       |    8 +-
 sdk/java/pom.xml                              |    6 +
 .../java/io/juicefs/JuiceFileSystemImpl.java  |   29 +-
 .../juicefs/utils/FsPermissionExtension.java  |   63 +
 .../java/io/juicefs/utils/ReflectionUtil.java |   53 +
 .../java/io/juicefs/JuiceFileSystemTest.java  |   20 +
 .../test/java/io/juicefs/acl/TestAclCLI.java  |   79 ++
 sdk/java/src/test/resources/testAclCLI.xml    | 1075 +++++++++++++++++
 9 files changed, 1347 insertions(+), 5 deletions(-)
 create mode 100644 sdk/java/src/main/java/io/juicefs/utils/FsPermissionExtension.java
 create mode 100644 sdk/java/src/main/java/io/juicefs/utils/ReflectionUtil.java
 create mode 100644 sdk/java/src/test/java/io/juicefs/acl/TestAclCLI.java
 create mode 100644 sdk/java/src/test/resources/testAclCLI.xml

diff --git a/pkg/fs/fs.go b/pkg/fs/fs.go
index a9ef77099bfa..95ae19c08849 100644
--- a/pkg/fs/fs.go
+++ b/pkg/fs/fs.go
@@ -87,6 +87,9 @@ func (fs *FileStat) Mode() os.FileMode {
 	if attr.Mode&01000 != 0 {
 		mode |= os.ModeSticky
 	}
+	if attr.AccessACL+attr.DefaultACL > 0 {
+		mode |= 1 << 18
+	}
 	switch attr.Typ {
 	case meta.TypeDirectory:
 		mode |= os.ModeDir
@@ -650,6 +653,22 @@ func (fs *FileSystem) SetFacl(ctx meta.Context, p string, acltype uint8, rule *a
 	if err != 0 {
 		return
 	}
+	if acltype == acl.TypeDefault && fi.Mode().IsRegular() {
+		if rule.IsEmpty() {
+			return
+		} else {
+			return syscall.ENOTSUP
+		}
+	}
+	if rule.IsEmpty() {
+		oldRule := acl.EmptyRule()
+		if err = fs.m.GetFacl(ctx, fi.inode, acltype, oldRule); err != 0 {
+			return err
+		}
+		rule.Owner = oldRule.Owner
+		rule.Other = oldRule.Other
+		rule.Group = oldRule.Group & oldRule.Mask
+	}
 	err = fs.m.SetFacl(ctx, fi.inode, acltype, rule)
 	return
 }
diff --git a/sdk/java/libjfs/main.go b/sdk/java/libjfs/main.go
index feb2400ad47c..cdd045d6b845 100644
--- a/sdk/java/libjfs/main.go
+++ b/sdk/java/libjfs/main.go
@@ -889,8 +889,8 @@ func jfs_getfacl(pid int, h int64, path *C.char, acltype int, buf uintptr, blen
 	if w == nil {
 		return EINVAL
 	}
-	var rule acl.Rule
-	err := w.GetFacl(w.withPid(pid), C.GoString(path), uint8(acltype), &rule)
+	rule := acl.EmptyRule()
+	err := w.GetFacl(w.withPid(pid), C.GoString(path), uint8(acltype), rule)
 	if err != 0 {
 		return errno(err)
 	}
@@ -925,7 +925,7 @@ func jfs_setfacl(pid int, h int64, path *C.char, acltype int, buf uintptr, alen
 	if w == nil {
 		return EINVAL
 	}
-	var rule acl.Rule
+	rule := acl.EmptyRule()
 	r := utils.NewNativeBuffer(toBuf(buf, alen))
 	rule.Owner = r.Get16()
 	rule.Group = r.Get16()
@@ -945,7 +945,7 @@ func jfs_setfacl(pid int, h int64, path *C.char, acltype int, buf uintptr, alen
 			rule.NamedGroups = append(rule.NamedGroups, entry)
 		}
 	}
-	return errno(w.SetFacl(w.withPid(pid), C.GoString(path), uint8(acltype), &rule))
+	return errno(w.SetFacl(w.withPid(pid), C.GoString(path), uint8(acltype), rule))
 }
 
 //export jfs_readlink
diff --git a/sdk/java/pom.xml b/sdk/java/pom.xml
index 8359c228904a..31340d73c79a 100644
--- a/sdk/java/pom.xml
+++ b/sdk/java/pom.xml
@@ -42,6 +42,9 @@
 				<configuration>
 					<argLine>${argLine}</argLine>
 					<trimStackTrace>false</trimStackTrace>
+					<systemProperties>
+						<test.cache.data>${project.build.directory}/test-classes</test.cache.data>
+					</systemProperties>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -217,6 +220,9 @@
 			<testResource>
 				<directory>conf</directory>
 			</testResource>
+			<testResource>
+				<directory>src/test/resources</directory>
+			</testResource>
 		</testResources>
 	</build>
 	<dependencies>
diff --git a/sdk/java/src/main/java/io/juicefs/JuiceFileSystemImpl.java b/sdk/java/src/main/java/io/juicefs/JuiceFileSystemImpl.java
index cb39171c1472..374cb8f79ae7 100644
--- a/sdk/java/src/main/java/io/juicefs/JuiceFileSystemImpl.java
+++ b/sdk/java/src/main/java/io/juicefs/JuiceFileSystemImpl.java
@@ -99,6 +99,8 @@ public class JuiceFileSystemImpl extends FileSystem {
    * hadoop compatibility
    */
   private boolean withStreamCapability;
+  private Constructor<FileStatus> fileStatusConstructor;
+
   // constructor for BufferedFSOutputStreamWithStreamCapabilities
   private Constructor<?> constructor;
   private Method setStorageIds;
@@ -432,6 +434,17 @@ public void initialize(URI uri, Configuration conf) throws IOException {
         throw new RuntimeException(e);
       }
     }
+    // for hadoop compatibility
+    boolean hasAclMtd = ReflectionUtil.hasMethod(FileStatus.class.getName(), "hasAcl", (String[]) null);
+    if (hasAclMtd) {
+      fileStatusConstructor = ReflectionUtil.getConstructor(FileStatus.class,
+          long.class, boolean.class, int.class, long.class, long.class,
+          long.class, FsPermission.class, String.class, String.class, Path.class,
+          Path.class, boolean.class, boolean.class, boolean.class);
+      if (fileStatusConstructor == null) {
+        throw new IOException("incompatible hadoop version");
+      }
+    }
 
     uMask = FsPermission.getUMask(conf);
     String umaskStr = getConf(conf, "umask", null);
@@ -1433,14 +1446,25 @@ private FileStatus newFileStatus(Path p, Pointer buf, int size, boolean readlink
     int mode = buf.getInt(0);
     boolean isdir = ((mode >>> 31) & 1) == 1; // Go
     int stickybit = (mode >>> 20) & 1;
+    boolean hasAcl = (mode >> 18 & 1) == 1;
     FsPermission perm = new FsPermission((short) ((mode & 0777) | (stickybit << 9)));
+    perm = new FsPermissionExtension(perm, hasAcl, false);
     long length = buf.getLongLong(4);
     long mtime = buf.getLongLong(12);
     long atime = buf.getLongLong(20);
     String user = buf.getString(28);
     String group = buf.getString(28 + user.length() + 1);
     assert (30 + user.length() + group.length() == size);
-    return new FileStatus(length, isdir, 1, blocksize, mtime, atime, perm, user, group, p);
+
+    if (fileStatusConstructor == null) {
+      return new FileStatus(length, isdir, 1, blocksize, mtime, atime, perm, user, group, p);
+    } else {
+      try {
+        return fileStatusConstructor.newInstance(length, isdir, 1, blocksize, mtime, atime, perm, user, group, null, p, hasAcl, false, false);
+      } catch (Exception e) {
+        throw new IOException("construct fileStatus failed", e);
+      }
+    }
   }
 
   @Override
@@ -1821,6 +1845,9 @@ private void setAclInternal(Path path, AclEntryScope scope, List<AclEntry> aclSp
     }
     int r = lib.jfs_setfacl(Thread.currentThread().getId(), handle, normalizePath(path), scope.ordinal() + 1, buf,
         12 + namedaclsize);
+    if (r == ENOTSUP) {
+      throw new IOException("Invalid ACL: only directories may have a default ACL");
+    }
     if (r < 0)
       throw error(r, path);
   }
diff --git a/sdk/java/src/main/java/io/juicefs/utils/FsPermissionExtension.java b/sdk/java/src/main/java/io/juicefs/utils/FsPermissionExtension.java
new file mode 100644
index 000000000000..c0dee7e0f0df
--- /dev/null
+++ b/sdk/java/src/main/java/io/juicefs/utils/FsPermissionExtension.java
@@ -0,0 +1,63 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.juicefs.utils;
+
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.fs.permission.FsPermission;
+
+/**
+ * HDFS permission subclass used to indicate an ACL is present and/or that the
+ * underlying file/dir is encrypted. The ACL/encrypted bits are not visible
+ * directly to users of {@link FsPermission} serialization.  This is
+ * done for backwards compatibility in case any existing clients assume the
+ * value of FsPermission is in a particular range.
+ */
+@InterfaceAudience.Private
+public class FsPermissionExtension extends FsPermission {
+  private final static short ACL_BIT = 1 << 12;
+  private final static short ENCRYPTED_BIT = 1 << 13;
+  private final boolean aclBit;
+  private final boolean encryptedBit;
+
+  /**
+   * Constructs a new FsPermissionExtension based on the given FsPermission.
+   *
+   * @param perm FsPermission containing permission bits
+   */
+  public FsPermissionExtension(FsPermission perm, boolean hasAcl,
+                               boolean isEncrypted) {
+    super(perm.toShort());
+    aclBit = hasAcl;
+    encryptedBit = isEncrypted;
+  }
+
+  @Override
+  public short toExtendedShort() {
+    return (short) (toShort() |
+            (aclBit ? ACL_BIT : 0) | (encryptedBit ? ENCRYPTED_BIT : 0));
+  }
+
+  public boolean getAclBit() {
+    return aclBit;
+  }
+
+  @Override
+  public boolean getEncryptedBit() {
+    return encryptedBit;
+  }
+}
\ No newline at end of file
diff --git a/sdk/java/src/main/java/io/juicefs/utils/ReflectionUtil.java b/sdk/java/src/main/java/io/juicefs/utils/ReflectionUtil.java
new file mode 100644
index 000000000000..418be1736022
--- /dev/null
+++ b/sdk/java/src/main/java/io/juicefs/utils/ReflectionUtil.java
@@ -0,0 +1,53 @@
+/*
+ * JuiceFS, Copyright 2024 Juicedata, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.juicefs.utils;
+
+import java.lang.reflect.Constructor;
+
+public class ReflectionUtil {
+  public static boolean hasMethod(String className, String method, String[] params) {
+    try {
+      Class<?>[] classes = null;
+      if (params != null) {
+        classes = new Class[params.length];
+        for (int i = 0; i < params.length; i++) {
+          classes[i] = Class.forName(params[i], false, Thread.currentThread().getContextClassLoader());
+        }
+      }
+      return hasMethod(className, method, classes);
+    } catch (ClassNotFoundException e) {
+      return false;
+    }
+  }
+
+  public static boolean hasMethod(String className, String method, Class<?>[] params) {
+    try {
+      Class<?> clazz = Class.forName(className, false, Thread.currentThread().getContextClassLoader());
+      clazz.getDeclaredMethod(method, params);
+    } catch (ClassNotFoundException | NoSuchMethodException e) {
+      return false;
+    }
+    return true;
+  }
+
+  public static <T> Constructor<T> getConstructor(Class<T> clazz, Class<?>... params) {
+    try {
+      return clazz.getConstructor(params);
+    } catch (NoSuchMethodException e) {
+      return null;
+    }
+  }
+}
diff --git a/sdk/java/src/test/java/io/juicefs/JuiceFileSystemTest.java b/sdk/java/src/test/java/io/juicefs/JuiceFileSystemTest.java
index eb5cde7f15d1..c9ad0891f9b3 100644
--- a/sdk/java/src/test/java/io/juicefs/JuiceFileSystemTest.java
+++ b/sdk/java/src/test/java/io/juicefs/JuiceFileSystemTest.java
@@ -1100,4 +1100,24 @@ public void testAccessAclNotInherited() throws IOException {
     fs.delete(parent, true);
   }
 
+  public void testFileStatusWithAcl() throws Exception {
+    List<AclEntry> acls = Lists.newArrayList(
+        aclEntry(ACCESS, USER, ALL),
+        aclEntry(ACCESS, USER, "foo", ALL),
+        aclEntry(ACCESS, OTHER, ALL),
+        aclEntry(ACCESS, GROUP, ALL)
+    );
+    Path p = new Path("/test_acl_status");
+    fs.delete(p, true);
+    fs.mkdirs(p);
+    FileStatus pStatus = fs.getFileStatus(p);
+    assertFalse(pStatus.hasAcl());
+
+    Path f = new Path(p, "f");
+    fs.create(f).close();
+    fs.setAcl(f, acls);
+    FileStatus[] fileStatuses = fs.listStatus(p);
+    assertTrue(fileStatuses[0].getPermission().getAclBit());
+    assertTrue(fileStatuses[0].hasAcl());
+  }
 }
diff --git a/sdk/java/src/test/java/io/juicefs/acl/TestAclCLI.java b/sdk/java/src/test/java/io/juicefs/acl/TestAclCLI.java
new file mode 100644
index 000000000000..e03999d5efff
--- /dev/null
+++ b/sdk/java/src/test/java/io/juicefs/acl/TestAclCLI.java
@@ -0,0 +1,79 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.juicefs.acl;
+
+import org.apache.hadoop.cli.CLITestHelperDFS;
+import org.apache.hadoop.cli.util.CLICommand;
+import org.apache.hadoop.cli.util.CommandExecutor.Result;
+import org.apache.hadoop.hdfs.DFSConfigKeys;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestAclCLI extends CLITestHelperDFS {
+  private String vol = null;
+  private String username = null;
+
+  protected void initConf() {
+    conf.setBoolean(DFSConfigKeys.DFS_NAMENODE_ACLS_ENABLED_KEY, true);
+    conf.setBoolean(
+        DFSConfigKeys.DFS_NAMENODE_POSIX_ACL_INHERITANCE_ENABLED_KEY, false);
+  }
+
+  @Before
+  @Override
+  public void setUp() throws Exception {
+    super.setUp();
+    initConf();
+    vol = "jfs://dev/";
+    username = System.getProperty("user.name");
+  }
+
+  @After
+  @Override
+  public void tearDown() throws Exception {
+    super.tearDown();
+  }
+
+  @Override
+  protected String getTestFile() {
+    return "testAclCLI.xml";
+  }
+
+  @Override
+  protected String expandCommand(final String cmd) {
+    String expCmd = cmd;
+    expCmd = expCmd.replaceAll("NAMENODE", vol);
+    expCmd = expCmd.replaceAll("USERNAME", username);
+    expCmd = expCmd.replaceAll("#LF#",
+        System.getProperty("line.separator"));
+    expCmd = super.expandCommand(expCmd);
+    return expCmd;
+  }
+
+  @Override
+  protected Result execute(CLICommand cmd) throws Exception {
+    return cmd.getExecutor(vol, conf).executeCommand(cmd.getCmd());
+  }
+
+  @Test
+  @Override
+  public void testAll() {
+    super.testAll();
+  }
+}
diff --git a/sdk/java/src/test/resources/testAclCLI.xml b/sdk/java/src/test/resources/testAclCLI.xml
new file mode 100644
index 000000000000..120da68e4f69
--- /dev/null
+++ b/sdk/java/src/test/resources/testAclCLI.xml
@@ -0,0 +1,1075 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="testConf.xsl"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<configuration>
+  <!-- Normal mode is test. To run just the commands and dump the output
+       to the log, set it to nocompare -->
+  <mode>test</mode>
+
+  <!--  Comparator types:
+           ExactComparator
+           SubstringComparator
+           RegexpComparator
+           TokenComparator
+           -->
+  <tests>
+    <!-- Tests for setfacl and getfacl-->
+    <test>
+      <description>getfacl: basic permissions</description>
+      <test-commands>
+        <command>-fs NAMENODE -touchz /file1</command>
+        <command>-fs NAMENODE -getfacl /file1</command>
+      </test-commands>
+      <cleanup-commands>
+        <command>-fs NAMENODE -rm /file1</command>
+      </cleanup-commands>
+      <comparators>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># file: /file1</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># owner: USERNAME</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># group: supergroup</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>user::rw-</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>group::r--</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>other::r--</expected-output>
+        </comparator>
+      </comparators>
+    </test>
+    <test>
+      <description>getfacl: basic permissions for directory</description>
+      <test-commands>
+        <command>-fs NAMENODE -mkdir /dir1</command>
+        <command>-fs NAMENODE -getfacl /dir1</command>
+      </test-commands>
+      <cleanup-commands>
+        <command>-fs NAMENODE -rm /dir1</command>
+      </cleanup-commands>
+      <comparators>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># file: /dir1</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># owner: USERNAME</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># group: supergroup</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>user::rwx</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>group::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>other::r-x</expected-output>
+        </comparator>
+      </comparators>
+    </test>
+    <test>
+      <description>setfacl : Add an ACL</description>
+      <test-commands>
+        <command>-fs NAMENODE -touchz /file1</command>
+        <command>-fs NAMENODE -setfacl -m user:bob:r-- /file1</command>
+        <command>-fs NAMENODE -getfacl /file1</command>
+      </test-commands>
+      <cleanup-commands>
+        <command>-fs NAMENODE -rm /file1</command>
+      </cleanup-commands>
+      <comparators>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># file: /file1</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># owner: USERNAME</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># group: supergroup</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>user::rw-</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>user:bob:r--</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>group::r--</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>mask::r--</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>other::r--</expected-output>
+        </comparator>
+      </comparators>
+    </test>
+    <test>
+      <description>setfacl : Add multiple ACLs at once</description>
+      <test-commands>
+        <command>-fs NAMENODE -touchz /file1</command>
+        <command>-fs NAMENODE -setfacl -m user:bob:r--,group:users:r-x /file1</command>
+        <command>-fs NAMENODE -getfacl /file1</command>
+      </test-commands>
+      <cleanup-commands>
+        <command>-fs NAMENODE -rm /file1</command>
+      </cleanup-commands>
+      <comparators>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># file: /file1</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># owner: USERNAME</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># group: supergroup</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>user::rw-</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>user:bob:r--</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>group::r--</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>group:users:r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>mask::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>other::r--</expected-output>
+        </comparator>
+      </comparators>
+    </test>
+    <test>
+      <description>setfacl : Remove an ACL</description>
+      <test-commands>
+        <command>-fs NAMENODE -touchz /file1</command>
+        <command>-fs NAMENODE -setfacl -m user:bob:r--,user:charlie:r-x /file1</command>
+        <command>-fs NAMENODE -setfacl -x user:bob /file1</command>
+        <command>-fs NAMENODE -getfacl /file1</command>
+      </test-commands>
+      <cleanup-commands>
+        <command>-fs NAMENODE -rm /file1</command>
+      </cleanup-commands>
+      <comparators>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># file: /file1</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># owner: USERNAME</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># group: supergroup</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>user::rw-</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>user:charlie:r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>group::r--</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>other::r--</expected-output>
+        </comparator>
+        <comparator>
+          <type>RegexpAcrossOutputComparator</type>
+          <expected-output>.*(?!bob)*</expected-output>
+        </comparator>
+      </comparators>
+    </test>
+    <test>
+      <description>setfacl : Add default ACL</description>
+      <test-commands>
+        <command>-fs NAMENODE -mkdir /dir1</command>
+        <command>-fs NAMENODE -setfacl -m user:bob:r--,group:users:r-x /dir1</command>
+        <command>-fs NAMENODE -setfacl -m default:user:charlie:r-x,default:group:admin:rwx /dir1</command>
+        <command>-fs NAMENODE -getfacl /dir1</command>
+      </test-commands>
+      <cleanup-commands>
+        <command>-fs NAMENODE -rm -R /dir1</command>
+      </cleanup-commands>
+      <comparators>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># file: /dir1</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># owner: USERNAME</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># group: supergroup</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>user::rwx</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>user:bob:r--</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>group::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>group:users:r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>mask::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>other::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>default:user::rwx</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>default:user:charlie:r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>default:group::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>default:group:admin:rwx</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>default:mask::rwx</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>default:other::r-x</expected-output>
+        </comparator>
+      </comparators>
+    </test>
+    <test>
+      <description>setfacl : Add minimal default ACL</description>
+      <test-commands>
+        <command>-fs NAMENODE -mkdir /dir1</command>
+        <command>-fs NAMENODE -setfacl -m default:user::rwx /dir1</command>
+        <command>-fs NAMENODE -getfacl /dir1</command>
+      </test-commands>
+      <cleanup-commands>
+        <command>-fs NAMENODE -rm -R /dir1</command>
+      </cleanup-commands>
+      <comparators>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># file: /dir1</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># owner: USERNAME</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># group: supergroup</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>user::rwx</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>group::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>other::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>default:user::rwx</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>default:group::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>default:other::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>RegexpAcrossOutputComparator</type>
+          <expected-output>.*(?!default\:mask)*</expected-output>
+        </comparator>
+      </comparators>
+    </test>
+    <test>
+      <description>setfacl : try adding default ACL to file</description>
+      <test-commands>
+        <command>-fs NAMENODE -touchz /file1</command>
+        <command>-fs NAMENODE -setfacl -m default:user:charlie:r-x /file1</command>
+      </test-commands>
+      <cleanup-commands>
+        <command>-fs NAMENODE -rm /file1</command>
+      </cleanup-commands>
+      <comparators>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>setfacl: Invalid ACL: only directories may have a default ACL</expected-output>
+        </comparator>
+      </comparators>
+    </test>
+    <test>
+      <description>setfacl : Remove one default ACL</description>
+      <test-commands>
+        <command>-fs NAMENODE -mkdir /dir1</command>
+        <command>-fs NAMENODE -setfacl -m user:bob:r--,group:users:r-x /dir1</command>
+        <command>-fs NAMENODE -setfacl -m default:user:charlie:r-x,default:group:admin:rwx /dir1</command>
+        <command>-fs NAMENODE -setfacl -x default:user:charlie /dir1</command>
+        <command>-fs NAMENODE -getfacl /dir1</command>
+      </test-commands>
+      <cleanup-commands>
+        <command>-fs NAMENODE -rm -R /dir1</command>
+      </cleanup-commands>
+      <comparators>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># file: /dir1</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># owner: USERNAME</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># group: supergroup</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>user::rwx</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>user:bob:r--</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>group::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>group:users:r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>mask::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>other::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>default:user::rwx</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>default:group::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>default:group:admin:rwx</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>default:mask::rwx</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>default:other::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>RegexpAcrossOutputComparator</type>
+          <expected-output>.*(?!default:user:charlie).*</expected-output>
+        </comparator>
+      </comparators>
+    </test>
+    <test>
+      <description>setfacl : Remove all default ACL</description>
+      <test-commands>
+        <command>-fs NAMENODE -mkdir /dir1</command>
+        <command>-fs NAMENODE -setfacl -m user:bob:r--,group:users:r-x /dir1</command>
+        <command>-fs NAMENODE -setfacl -m default:user:charlie:r-x,default:group:admin:rwx /dir1</command>
+        <command>-fs NAMENODE -setfacl -k /dir1</command>
+        <command>-fs NAMENODE -getfacl /dir1</command>
+      </test-commands>
+      <cleanup-commands>
+        <command>-fs NAMENODE -rm -R /dir1</command>
+      </cleanup-commands>
+      <comparators>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># file: /dir1</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># owner: USERNAME</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># group: supergroup</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>user::rwx</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>user:bob:r--</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>group::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>group:users:r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>mask::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>other::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>RegexpAcrossOutputComparator</type>
+          <expected-output>.*(?!default).*</expected-output>
+        </comparator>
+      </comparators>
+    </test>
+    <test>
+      <description>setfacl : Remove all but base ACLs for a directory</description>
+      <test-commands>
+        <command>-fs NAMENODE -mkdir /dir1</command>
+        <command>-fs NAMENODE -setfacl -m user:charlie:r-x,default:group:admin:rwx /dir1</command>
+        <command>-fs NAMENODE -setfacl -b /dir1</command>
+        <command>-fs NAMENODE -getfacl /dir1</command>
+      </test-commands>
+      <cleanup-commands>
+        <command>-fs NAMENODE -rm -R /dir1</command>
+      </cleanup-commands>
+      <comparators>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># file: /dir1</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># owner: USERNAME</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># group: supergroup</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>user::rwx</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>group::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>other::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>RegexpAcrossOutputComparator</type>
+          <expected-output>.*(?!charlie).*</expected-output>
+        </comparator>
+        <comparator>
+          <type>RegexpAcrossOutputComparator</type>
+          <expected-output>.*(?!default).*</expected-output>
+        </comparator>
+        <comparator>
+          <type>RegexpAcrossOutputComparator</type>
+          <expected-output>.*(?!admin).*</expected-output>
+        </comparator>
+      </comparators>
+    </test>
+    <test>
+      <description>setfacl : Remove all but base ACLs for a file</description>
+      <test-commands>
+        <command>-fs NAMENODE -touchz /file1</command>
+        <command>-fs NAMENODE -setfacl -m user:charlie:r-x,group:admin:rwx /file1</command>
+        <command>-fs NAMENODE -setfacl -b /file1</command>
+        <command>-fs NAMENODE -getfacl /file1</command>
+      </test-commands>
+      <cleanup-commands>
+        <command>-fs NAMENODE -rm /file1</command>
+      </cleanup-commands>
+      <comparators>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># file: /file1</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># owner: USERNAME</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># group: supergroup</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>user::rw-</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>group::r--</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>other::r--</expected-output>
+        </comparator>
+        <comparator>
+          <type>RegexpAcrossOutputComparator</type>
+          <expected-output>.*(?!charlie).*</expected-output>
+        </comparator>
+        <comparator>
+          <type>RegexpAcrossOutputComparator</type>
+          <expected-output>.*(?!admin).*</expected-output>
+        </comparator>
+      </comparators>
+    </test>
+    <test>
+      <description>setfacl : check inherit default ACL to file</description>
+      <test-commands>
+        <command>-fs NAMENODE -mkdir /dir1</command>
+        <command>-fs NAMENODE -setfacl -m default:user:charlie:r-x,default:group:admin:rwx /dir1</command>
+        <command>-fs NAMENODE -touchz /dir1/file</command>
+        <command>-fs NAMENODE -getfacl /dir1/file</command>
+      </test-commands>
+      <cleanup-commands>
+        <command>-fs NAMENODE -rm -R /dir1</command>
+      </cleanup-commands>
+      <comparators>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># file: /dir1/file</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># owner: USERNAME</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output># group: supergroup</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>user::rw-</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>user:charlie:r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>group::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>group:admin:rwx</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>mask::rw-</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>other::r--</expected-output>
+        </comparator>
+        <comparator>
+          <type>RegexpAcrossOutputComparator</type>
+          <expected-output>.*(?!default).*</expected-output>
+        </comparator>
+      </comparators>
+    </test>
+    <test>
+      <description>setfacl : check inherit default ACL to dir</description>
+      <test-commands>
+        <command>-fs NAMENODE -mkdir /dir1</command>
+        <command>-fs NAMENODE -setfacl -m default:user:charlie:r-x,default:group:admin:rwx /dir1</command>
+        <command>-fs NAMENODE -mkdir /dir1/dir2</command>
+        <command>-fs NAMENODE -getfacl /dir1/dir2</command>
+      </test-commands>
+      <cleanup-commands>
+        <command>-fs NAMENODE -rm -R /dir1</command>
+      </cleanup-commands>
+      <comparators>
+        <comparator>
+          <type>ExactLineComparator</type>
+          <expected-output># file: /dir1/dir2</expected-output>
+        </comparator>
+        <comparator>
+          <type>ExactLineComparator</type>
+          <expected-output># owner: USERNAME</expected-output>
+        </comparator>
+        <comparator>
+          <type>ExactLineComparator</type>
+          <expected-output># group: supergroup</expected-output>
+        </comparator>
+        <comparator>
+          <type>ExactLineComparator</type>
+          <expected-output>user::rwx</expected-output>
+        </comparator>
+        <comparator>
+          <type>ExactLineComparator</type>
+          <expected-output>user:charlie:r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>ExactLineComparator</type>
+          <expected-output>group::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>RegexpComparator</type>
+          <expected-output>^group:admin:rwx\b.*</expected-output>
+        </comparator>
+        <comparator>
+          <type>ExactLineComparator</type>
+          <expected-output>mask::rwx</expected-output>
+        </comparator>
+        <comparator>
+          <type>ExactLineComparator</type>
+          <expected-output>default:user::rwx</expected-output>
+        </comparator>
+        <comparator>
+          <type>ExactLineComparator</type>
+          <expected-output>default:user:charlie:r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>ExactLineComparator</type>
+          <expected-output>default:group::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>ExactLineComparator</type>
+          <expected-output>default:group:admin:rwx</expected-output>
+        </comparator>
+        <comparator>
+          <type>ExactLineComparator</type>
+          <expected-output>default:mask::rwx</expected-output>
+        </comparator>
+        <comparator>
+          <type>ExactLineComparator</type>
+          <expected-output>default:other::r-x</expected-output>
+        </comparator>
+        <comparator>
+          <type>ExactLineComparator</type>
+          <expected-output>other::r-x</expected-output>
+        </comparator>
+      </comparators>
+    </test>
+    <test>
+      <description>getfacl -R : recursive</description>
+      <test-commands>
+        <command>-fs NAMENODE -mkdir /dir1</command>
+        <command>-fs NAMENODE -setfacl -m user:charlie:r-x,group:admin:rwx /dir1</command>
+        <command>-fs NAMENODE -mkdir /dir1/dir2</command>
+        <command>-fs NAMENODE -setfacl -m user:user1:r-x,group:users:rwx /dir1/dir2</command>
+        <command>-fs NAMENODE -getfacl -R /dir1</command>
+      </test-commands>
+      <cleanup-commands>
+        <command>-fs NAMENODE -rm -R /dir1</command>
+      </cleanup-commands>
+      <comparators>
+        <comparator>
+          <type>ExactComparator</type>
+          <expected-output># file: /dir1#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#user:charlie:r-x#LF#group::r-x#LF#group:admin:rwx#LF#mask::rwx#LF#other::r-x#LF##LF## file: /dir1/dir2#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#user:user1:r-x#LF#group::r-x#LF#group:users:rwx#LF#mask::rwx#LF#other::r-x#LF##LF#</expected-output>
+        </comparator>
+      </comparators>
+    </test>
+    <test>
+      <description>setfacl -R : recursive</description>
+      <test-commands>
+        <command>-fs NAMENODE -mkdir /dir1</command>
+        <command>-fs NAMENODE -mkdir /dir1/dir2</command>
+        <command>-fs NAMENODE -setfacl -R -m user:charlie:r-x,group:admin:rwx /dir1</command>
+        <command>-fs NAMENODE -getfacl -R /dir1</command>
+      </test-commands>
+      <cleanup-commands>
+        <command>-fs NAMENODE -rm -R /dir1</command>
+      </cleanup-commands>
+      <comparators>
+        <comparator>
+          <type>ExactComparator</type>
+          <expected-output># file: /dir1#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#user:charlie:r-x#LF#group::r-x#LF#group:admin:rwx#LF#mask::rwx#LF#other::r-x#LF##LF## file: /dir1/dir2#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#user:charlie:r-x#LF#group::r-x#LF#group:admin:rwx#LF#mask::rwx#LF#other::r-x#LF##LF#</expected-output>
+        </comparator>
+      </comparators>
+    </test>
+    <test>
+      <description>setfacl --set : Set full set of ACLs</description>
+      <test-commands>
+        <command>-fs NAMENODE -mkdir /dir1</command>
+        <command>-fs NAMENODE -setfacl -m user:charlie:r-x,group:admin:rwx /dir1</command>
+        <command>-fs NAMENODE -setfacl --set user::rw-,group::r--,other::r--,user:user1:r-x,group:users:rw- /dir1</command>
+        <command>-fs NAMENODE -getfacl /dir1</command>
+      </test-commands>
+      <cleanup-commands>
+        <command>-fs NAMENODE -rm -R /dir1</command>
+      </cleanup-commands>
+      <comparators>
+        <comparator>
+          <type>ExactComparator</type>
+          <expected-output># file: /dir1#LF## owner: USERNAME#LF## group: supergroup#LF#user::rw-#LF#user:user1:r-x#LF#group::r--#LF#group:users:rw-#LF#mask::rwx#LF#other::r--#LF##LF#</expected-output>
+        </comparator>
+      </comparators>
+    </test>
+    <test>
+      <description>setfacl -x mask : remove mask entry along with other ACL entries</description>
+      <test-commands>
+        <command>-fs NAMENODE -mkdir /dir1</command>
+        <command>-fs NAMENODE -setfacl -m user:charlie:r-x,group:admin:rwx /dir1</command>
+        <command>-fs NAMENODE -setfacl -x mask::,user:charlie,group:admin /dir1</command>
+        <command>-fs NAMENODE -getfacl /dir1</command>
+      </test-commands>
+      <cleanup-commands>
+        <command>-fs NAMENODE -rm -R /dir1</command>
+      </cleanup-commands>
+      <comparators>
+        <comparator>
+          <type>ExactComparator</type>
+          <expected-output># file: /dir1#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#group::r-x#LF#other::r-x#LF##LF#</expected-output>
+        </comparator>
+      </comparators>
+    </test>
+<!--    <test>-->
+<!--      <description>getfacl: only default ACL</description>-->
+<!--      <test-commands>-->
+<!--        <command>-fs NAMENODE -mkdir /dir1</command>-->
+<!--        <command>-fs NAMENODE -setfacl -m default:user:charlie:rwx /dir1</command>-->
+<!--        <command>-fs NAMENODE -getfacl /dir1</command>-->
+<!--      </test-commands>-->
+<!--      <cleanup-commands>-->
+<!--        <command>-fs NAMENODE -rm -R /dir1</command>-->
+<!--      </cleanup-commands>-->
+<!--      <comparators>-->
+<!--        <comparator>-->
+<!--          <type>SubstringComparator</type>-->
+<!--          <expected-output># file: /dir1</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>SubstringComparator</type>-->
+<!--          <expected-output># owner: USERNAME</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>SubstringComparator</type>-->
+<!--          <expected-output># group: supergroup</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>SubstringComparator</type>-->
+<!--          <expected-output>user::rwx</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>SubstringComparator</type>-->
+<!--          <expected-output>group::r-x</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>SubstringComparator</type>-->
+<!--          <expected-output>other::r-x</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>SubstringComparator</type>-->
+<!--          <expected-output>default:user::rwx</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>SubstringComparator</type>-->
+<!--          <expected-output>default:user:charlie:rwx</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>SubstringComparator</type>-->
+<!--          <expected-output>default:group::r-x</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>SubstringComparator</type>-->
+<!--          <expected-output>default:mask::rwx</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>SubstringComparator</type>-->
+<!--          <expected-output>default:other::r-x</expected-output>-->
+<!--        </comparator>-->
+<!--      </comparators>-->
+<!--    </test>-->
+<!--    <test>-->
+<!--      <description>getfacl: effective permissions</description>-->
+<!--      <test-commands>-->
+<!--        <command>-fs NAMENODE -mkdir /dir1</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</command>-->
+<!--        <command>-fs NAMENODE -getfacl /dir1</command>-->
+<!--      </test-commands>-->
+<!--      <cleanup-commands>-->
+<!--        <command>-fs NAMENODE -rm -R /dir1</command>-->
+<!--      </cleanup-commands>-->
+<!--      <comparators>-->
+<!--        <comparator>-->
+<!--          <type>SubstringComparator</type>-->
+<!--          <expected-output># file: /dir1</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>SubstringComparator</type>-->
+<!--          <expected-output># owner: USERNAME</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>SubstringComparator</type>-->
+<!--          <expected-output># group: supergroup</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>SubstringComparator</type>-->
+<!--          <expected-output>user::rwx</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>RegexpComparator</type>-->
+<!--          <expected-output>^user:charlie:rwx\t#effective:r-x$</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>RegexpComparator</type>-->
+<!--          <expected-output>^group::-wx\t#effective:&#45;&#45;x$</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>RegexpComparator</type>-->
+<!--          <expected-output>^group:sales:rwx\t#effective:r-x$</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>SubstringComparator</type>-->
+<!--          <expected-output>mask::r-x</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>SubstringComparator</type>-->
+<!--          <expected-output>other::r-x</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>SubstringComparator</type>-->
+<!--          <expected-output>default:user::rwx</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>RegexpComparator</type>-->
+<!--          <expected-output>^default:user:charlie:rwx\t#effective:rw-$</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>RegexpComparator</type>-->
+<!--          <expected-output>^default:group::r-x\t#effective:r&#45;&#45;$</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>RegexpComparator</type>-->
+<!--          <expected-output>^default:group:sales:rwx\t#effective:rw-$</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>SubstringComparator</type>-->
+<!--          <expected-output>default:mask::rw-</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>SubstringComparator</type>-->
+<!--          <expected-output>default:other::r-x</expected-output>-->
+<!--        </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>RegexpComparator</type>-->
+<!--          <expected-output>^drwxr-xr-x\+( )*-( )*USERNAME( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*/dir1/dir2</expected-output>-->
+<!--        </comparator>-->
+<!--      </comparators>-->
+<!--    </test>-->
+<!--    <test>-->
+<!--      <description>setfacl: recursive modify entries with mix of files and directories</description>-->
+<!--      <test-commands>-->
+<!--        <command>-fs NAMENODE -mkdir -p /dir1</command>-->
+<!--        <command>-fs NAMENODE -touchz /dir1/file1</command>-->
+<!--        <command>-fs NAMENODE -mkdir -p /dir1/dir2</command>-->
+<!--        <command>-fs NAMENODE -touchz /dir1/dir2/file2</command>-->
+<!--        <command>-fs NAMENODE -setfacl -R -m user:charlie:rwx,default:user:charlie:r-x /dir1</command>-->
+<!--        <command>-fs NAMENODE -getfacl -R /dir1</command>-->
+<!--      </test-commands>-->
+<!--      <cleanup-commands>-->
+<!--        <command>-fs NAMENODE -rm -R /dir1</command>-->
+<!--      </cleanup-commands>-->
+<!--      <comparators>-->
+<!--        <comparator>-->
+<!--          <type>ExactComparator</type>-->
+<!--          <expected-output># file: /dir1#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#user:charlie:rwx#LF#group::r-x#LF#mask::rwx#LF#other::r-x#LF#default:user::rwx#LF#default:user:charlie:r-x#LF#default:group::r-x#LF#default:mask::r-x#LF#default:other::r-x#LF##LF## file: /dir1/dir2#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#user:charlie:rwx#LF#group::r-x#LF#mask::rwx#LF#other::r-x#LF#default:user::rwx#LF#default:user:charlie:r-x#LF#default:group::r-x#LF#default:mask::r-x#LF#default:other::r-x#LF##LF## file: /dir1/dir2/file2#LF## owner: USERNAME#LF## group: supergroup#LF#user::rw-#LF#user:charlie:rwx#LF#group::r&#45;&#45;#LF#mask::rwx#LF#other::r&#45;&#45;#LF##LF## file: /dir1/file1#LF## owner: USERNAME#LF## group: supergroup#LF#user::rw-#LF#user:charlie:rwx#LF#group::r&#45;&#45;#LF#mask::rwx#LF#other::r&#45;&#45;#LF##LF#</expected-output>-->
+<!--        </comparator>-->
+<!--      </comparators>-->
+<!--    </test>-->
+<!--    <test>-->
+<!--      <description>setfacl: recursive remove entries with mix of files and directories</description>-->
+<!--      <test-commands>-->
+<!--        <command>-fs NAMENODE -mkdir -p /dir1</command>-->
+<!--        <command>-fs NAMENODE -touchz /dir1/file1</command>-->
+<!--        <command>-fs NAMENODE -mkdir -p /dir1/dir2</command>-->
+<!--        <command>-fs NAMENODE -touchz /dir1/dir2/file2</command>-->
+<!--        <command>-fs NAMENODE -setfacl -R -m user:bob:rwx,user:charlie:rwx,default:user:bob:rwx,default:user:charlie:r-x /dir1</command>-->
+<!--        <command>-fs NAMENODE -setfacl -R -x user:bob,default:user:bob /dir1</command>-->
+<!--        <command>-fs NAMENODE -getfacl -R /dir1</command>-->
+<!--      </test-commands>-->
+<!--      <cleanup-commands>-->
+<!--        <command>-fs NAMENODE -rm -R /dir1</command>-->
+<!--      </cleanup-commands>-->
+<!--      <comparators>-->
+<!--        <comparator>-->
+<!--          <type>ExactComparator</type>-->
+<!--          <expected-output># file: /dir1#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#user:charlie:rwx#LF#group::r-x#LF#mask::rwx#LF#other::r-x#LF#default:user::rwx#LF#default:user:charlie:r-x#LF#default:group::r-x#LF#default:mask::r-x#LF#default:other::r-x#LF##LF## file: /dir1/dir2#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#user:charlie:rwx#LF#group::r-x#LF#mask::rwx#LF#other::r-x#LF#default:user::rwx#LF#default:user:charlie:r-x#LF#default:group::r-x#LF#default:mask::r-x#LF#default:other::r-x#LF##LF## file: /dir1/dir2/file2#LF## owner: USERNAME#LF## group: supergroup#LF#user::rw-#LF#user:charlie:rwx#LF#group::r&#45;&#45;#LF#mask::rwx#LF#other::r&#45;&#45;#LF##LF## file: /dir1/file1#LF## owner: USERNAME#LF## group: supergroup#LF#user::rw-#LF#user:charlie:rwx#LF#group::r&#45;&#45;#LF#mask::rwx#LF#other::r&#45;&#45;#LF##LF#</expected-output>-->
+<!--        </comparator>-->
+<!--      </comparators>-->
+<!--    </test>-->
+<!--    <test>-->
+<!--      <description>setfacl: recursive set with mix of files and directories</description>-->
+<!--      <test-commands>-->
+<!--        <command>-fs NAMENODE -mkdir -p /dir1</command>-->
+<!--        <command>-fs NAMENODE -touchz /dir1/file1</command>-->
+<!--        <command>-fs NAMENODE -mkdir -p /dir1/dir2</command>-->
+<!--        <command>-fs NAMENODE -touchz /dir1/dir2/file2</command>-->
+<!--        <command>-fs NAMENODE -setfacl -R &#45;&#45;set user::rwx,user:charlie:rwx,group::r-x,other::r-x,default:user:charlie:r-x /dir1</command>-->
+<!--        <command>-fs NAMENODE -getfacl -R /dir1</command>-->
+<!--      </test-commands>-->
+<!--      <cleanup-commands>-->
+<!--        <command>-fs NAMENODE -rm -R /dir1</command>-->
+<!--      </cleanup-commands>-->
+<!--      <comparators>-->
+<!--        <comparator>-->
+<!--          <type>ExactComparator</type>-->
+<!--          <expected-output># file: /dir1#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#user:charlie:rwx#LF#group::r-x#LF#mask::rwx#LF#other::r-x#LF#default:user::rwx#LF#default:user:charlie:r-x#LF#default:group::r-x#LF#default:mask::r-x#LF#default:other::r-x#LF##LF## file: /dir1/dir2#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#user:charlie:rwx#LF#group::r-x#LF#mask::rwx#LF#other::r-x#LF#default:user::rwx#LF#default:user:charlie:r-x#LF#default:group::r-x#LF#default:mask::r-x#LF#default:other::r-x#LF##LF## file: /dir1/dir2/file2#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#user:charlie:rwx#LF#group::r-x#LF#mask::rwx#LF#other::r-x#LF##LF## file: /dir1/file1#LF## owner: USERNAME#LF## group: supergroup#LF#user::rwx#LF#user:charlie:rwx#LF#group::r-x#LF#mask::rwx#LF#other::r-x#LF##LF#</expected-output>-->
+<!--        </comparator>-->
+<!--      </comparators>-->
+<!--    </test>-->
+<!--    <test>-->
+<!--      <description>copyFromLocal: copying file into a directory with a default ACL</description>-->
+<!--      <test-commands>-->
+<!--        <command>-fs NAMENODE -mkdir /dir1</command>-->
+<!--        <command>-fs NAMENODE -setfacl -m default:user:charlie:rwx /dir1</command>-->
+<!--        <command>-fs NAMENODE -copyFromLocal CLITEST_DATA/data1k /dir1/data1k</command>-->
+<!--        <command>-fs NAMENODE -getfacl /dir1/data1k</command>-->
+<!--      </test-commands>-->
+<!--      <cleanup-commands>-->
+<!--        <command>-fs NAMENODE -rm -R /dir1</command>-->
+<!--      </cleanup-commands>-->
+<!--      <comparators>-->
+<!--        <comparator>-->
+<!--          <type>RegexpComparator</type>-->
+<!--          <expected-output>^# file: /dir1/data1k$</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>RegexpComparator</type>-->
+<!--          <expected-output>^# owner: USERNAME$</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>RegexpComparator</type>-->
+<!--          <expected-output>^# group: supergroup$</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>RegexpComparator</type>-->
+<!--          <expected-output>^user::rw-$</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>RegexpComparator</type>-->
+<!--          <expected-output>^user:charlie:rwx\t#effective:r&#45;&#45;$</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>RegexpComparator</type>-->
+<!--          <expected-output>^group::r-x\t#effective:r&#45;&#45;$</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>RegexpComparator</type>-->
+<!--          <expected-output>^mask::r&#45;&#45;$</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>RegexpComparator</type>-->
+<!--          <expected-output>^other::r&#45;&#45;$</expected-output>-->
+<!--        </comparator>-->
+<!--        <comparator>-->
+<!--          <type>RegexpAcrossOutputComparator</type>-->
+<!--          <expected-output>.*(?!default).*</expected-output>-->
+<!--        </comparator>-->
+<!--      </comparators>-->
+<!--    </test>-->
+  </tests>
+</configuration>