X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=run-tests.sh;h=2df25af45d1e5baecf6902aec5634a605a713a73;hb=3149daa9c8f443bdb9dc086316c130046ec852cf;hp=e077c7a46e141585487f9c13b4442f99c25c27d8;hpb=65361c54cb58e897697655c68991eed9f05ee8ff;p=apply-default-acl.git

diff --git a/run-tests.sh b/run-tests.sh
index e077c7a..2df25af 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -818,8 +818,7 @@ EXPECTED="1"
 compare
 
 
-# The previous test should "succeed" if we use --recursive. This is
-# buggy, but it's documented.
+# The previous test should fail, even if we use --recursive.
 TESTNUM=35
 TARGET="${TESTDIR}/bar"
 touch "${TESTDIR}/foo"
@@ -827,7 +826,7 @@ ln -s foo "${TARGET}"
 setfacl --default --modify user:${USERS[0]}:rw "${TESTDIR}"
 "${BIN}" --recursive "${TARGET}"
 ACTUAL="$?"
-EXPECTED="0"
+EXPECTED="1"
 compare
 
 
@@ -854,15 +853,14 @@ EXPECTED="1"
 compare
 
 
-# And test the buggy behavior again; the previous test should return
-# success (ignoring the failure) when --recursive is used.
+# The failure should prevail when using --recursive, too.
 TESTNUM=38
 mkdir "${TESTDIR}/foo"
 ln -s foo "${TESTDIR}/bar"
 mkdir "${TESTDIR}/baz"
 "${BIN}" --recursive "${TESTDIR}"
 ACTUAL="$?"
-EXPECTED="0"
+EXPECTED="1"
 compare
 
 
@@ -899,3 +897,17 @@ EXPECTED=$( getfacl --omit-header "${TARGET}" )
 "${BIN}" --recursive "${TARGET}"
 ACTUAL=$( getfacl --omit-header "${TARGET}" )
 compare
+
+
+# Make sure we descend into subdirectories that don't have default ACLs.
+TESTNUM=42
+TARGET="${TESTDIR}/foo/bar/baz"
+mkdir -p $(dirname "${TARGET}")
+touch "${TARGET}"
+touch "${TARGET}-direct"
+setfacl --default --modify user:${USERS[0]}:rw $(dirname "${TARGET}")
+"${BIN}" "${TARGET}-direct"
+EXPECTED=$( getfacl --omit-header "${TARGET}-direct" )
+"${BIN}" --recursive "${TESTDIR}"
+ACTUAL=$( getfacl --omit-header "${TARGET}" )
+compare