X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=run-tests.sh;h=78739322b5a5c6ad9cbec7879ae9e68f5cb5cb69;hb=d8b55a1ea987e0ac8915bd5b2597d85f2d81c85d;hp=07ad496584faa680cde5992e2fde03dee698e628;hpb=20baeb9ea1419fd13ca1e76a33d1bb65a73f9e7e;p=apply-default-acl.git

diff --git a/run-tests.sh b/run-tests.sh
index 07ad496..7873932 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -219,7 +219,6 @@ setfacl -d -m user:${USERS[0]}:rwx "${TESTDIR}"
 setfacl -d -m user:${USERS[1]}:rwx "${TESTDIR}"
 $BIN "${TARGET}"
 
-
 EXPECTED=$(cat <<EOF
 user::rwx
 user:${USERS[0]}:rwx
@@ -243,7 +242,6 @@ setfacl -m user:${USERS[1]}:rw "${TARGET}"
 setfacl -d -m user:${USERS[0]}:rwx "${TESTDIR}"
 $BIN "${TARGET}"
 
-
 EXPECTED=$(cat <<EOF
 user::rw-
 user:${USERS[0]}:rwx	#effective:rw-
@@ -672,14 +670,12 @@ compare
 # we get the expected error.
 TESTNUM=25
 ACTUAL=$( "${BIN}" test/nonexistent 2>&1 )
-ACTUAL="${ACTUAL#*: }"
 EXPECTED="test/nonexistent: No such file or directory"
 compare
 
 # Same as the previous test, but with --recursive.
 TESTNUM=26
 ACTUAL=$( "${BIN}" --recursive test/nonexistent 2>&1 )
-ACTUAL="${ACTUAL#*: }"
 EXPECTED="test/nonexistent: No such file or directory"
 compare
 
@@ -690,7 +686,6 @@ DUMMY1="${TESTDIR}/dummy1"
 DUMMY2="${TESTDIR}/dummy2"
 touch "${DUMMY1}" "${DUMMY2}"
 ACTUAL=$( "${BIN}" "${DUMMY1}" test/nonexistent "${DUMMY2}" 2>&1 )
-ACTUAL="${ACTUAL#*: }"
 EXPECTED="test/nonexistent: No such file or directory"
 compare
 
@@ -723,15 +718,9 @@ mkdir "${TESTDIR}/foo"
 LINK2TARGET="${TESTDIR}/foo/bar-sym"
 ln -s "../bar" "${LINK2TARGET}"
 setfacl --default --modify user:${USERS[0]}:rwx "${TESTDIR}/foo"
+EXPECTED=$(getfacl --omit-header "${TARGET}")
 "${BIN}" --recursive "${TESTDIR}/foo"
 ACTUAL=$( getfacl --omit-header "${TARGET}" )
-EXPECTED=$(cat <<EOF
-user::rw-
-group::r--
-other::r--
-
-EOF
-)
 compare
 
 
@@ -788,15 +777,9 @@ mkdir -p $(dirname "${TARGET}")
 touch "${TARGET}"
 ln -s foo "${LINK2FOO}"
 setfacl --default --modify user:${USERS[0]}:rw $(dirname "${TARGET}")
+EXPECTED=$(getfacl --omit-header "${TARGET}")
 "${BIN}" "${LINK2FOO}/bar/baz"
 ACTUAL=$( getfacl --omit-header "${TARGET}" )
-EXPECTED=$(cat <<EOF
-user::rw-
-group::r--
-other::r--
-
-EOF
-)
 compare
 
 
@@ -823,8 +806,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"
@@ -832,7 +814,7 @@ ln -s foo "${TARGET}"
 setfacl --default --modify user:${USERS[0]}:rw "${TESTDIR}"
 "${BIN}" --recursive "${TARGET}"
 ACTUAL="$?"
-EXPECTED="0"
+EXPECTED="1"
 compare
 
 
@@ -846,23 +828,88 @@ compare
 
 
 # Test that one "failure" exit code overrides two "successes"
+# We need a default ACL on ${TESTDIR} because otherwise we do
+# nothing, successfully, on the symlink path.
 TESTNUM=37
 mkdir "${TESTDIR}/foo"
 ln -s foo "${TESTDIR}/bar"
 mkdir "${TESTDIR}/baz"
+setfacl --default --modify user:${USERS[0]}:rw "${TESTDIR}"
 "${BIN}" "${TESTDIR}/foo" "${TESTDIR}/bar" "${TESTDIR}/baz"
 ACTUAL="$?"
 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
+
+
+# We should get "Not a directory" if we stick a trailing slash on the
+# end of the path to a file.
+TESTNUM=39
+TARGET="${TESTDIR}/foo"
+touch "${TARGET}"
+ACTUAL=$( "${BIN}" "${TARGET}/" 2>&1 )
+EXPECTED="${TARGET}/: Not a directory"
+compare
+
+
+# We should be a no-op on files contained in directories that have no
+# default ACL.
+TESTNUM=40
+TARGET="${TESTDIR}/foo"
+touch "${TARGET}"
+setfacl --modify user:${USERS[0]}:rw "${TARGET}"
+EXPECTED=$( getfacl --omit-header "${TARGET}" )
+"${BIN}" "${TARGET}"
+ACTUAL=$( getfacl --omit-header "${TARGET}" )
+compare
+
+
+# We should be a no-op on directories contained in directories that
+# have no default ACL (same as the previous test, but with a directory).
+TESTNUM=41
+TARGET="${TESTDIR}/foo"
+mkdir "${TARGET}"
+setfacl --modify user:${USERS[0]}:rw "${TARGET}"
+setfacl --default --modify user:${USERS[0]}:rw "${TARGET}"
+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
+
+
+# Ensure that we don't get "error" results for symlinks encountered
+# during a recursive traversal.
+TESTNUM=43
+TARGET="${TESTDIR}"
+mkdir "${TARGET}/foo"
+mkdir "${TARGET}/bar"
+ln -s "../foo" "${TARGET}/bar/baz"
+setfacl --default --modify user:${USERS[0]}:rw "${TARGET}"
+EXPECTED="1"
+"${BIN}" --recursive "${TARGET}"
+ACTUAL=$?
 compare