X-Git-Url: http://gitweb.michael.orlitzky.com/?p=apply-default-acl.git;a=blobdiff_plain;f=run-tests.sh;h=07ad496584faa680cde5992e2fde03dee698e628;hp=d87c678b811e90ce23bf32514914dbd0c0901460;hb=450699ecf86f3bebab00ca162349270730026d7f;hpb=95356899dfc03215a775868b77d4d1bcb5613027

diff --git a/run-tests.sh b/run-tests.sh
index d87c678..07ad496 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -671,14 +671,16 @@ compare
 # If we call apply-default-acl on a single file that does not exist,
 # we get the expected error.
 TESTNUM=25
-ACTUAL=$( ${BIN} test/nonexistent 2>&1 )
-EXPECTED="${BIN}: test/nonexistent: No such file or directory"
+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 )
-EXPECTED="${BIN}: test/nonexistent: No such file or directory"
+ACTUAL=$( "${BIN}" --recursive test/nonexistent 2>&1 )
+ACTUAL="${ACTUAL#*: }"
+EXPECTED="test/nonexistent: No such file or directory"
 compare
 
 # If we call apply-default-acl on more than one file, it should report any
@@ -687,8 +689,9 @@ TESTNUM=27
 DUMMY1="${TESTDIR}/dummy1"
 DUMMY2="${TESTDIR}/dummy2"
 touch "${DUMMY1}" "${DUMMY2}"
-ACTUAL=$( ${BIN} "${DUMMY1}" test/nonexistent "${DUMMY2}" 2>&1 )
-EXPECTED="${BIN}: test/nonexistent: No such file or directory"
+ACTUAL=$( "${BIN}" "${DUMMY1}" test/nonexistent "${DUMMY2}" 2>&1 )
+ACTUAL="${ACTUAL#*: }"
+EXPECTED="test/nonexistent: No such file or directory"
 compare
 
 
@@ -760,7 +763,7 @@ LINK2TARGET="${TESTDIR}/baz"
 mkdir -p $(dirname "${TARGET}")
 touch "${TARGET}"
 ln -s foo "${TESTDIR}/baz"
-setfacl --default --modify user:${USERS[0]}:rw "${TESTDIR}/foo"
+setfacl --default --modify user:${USERS[0]}:rw $(dirname "${TARGET}")
 pushd "${TESTDIR}/baz" > /dev/null
 "${BIN}" bar
 popd > /dev/null
@@ -775,3 +778,91 @@ other::r--
 EOF
 )
 compare
+
+
+# Ensure that symlinks in non-terminal path components are not followed.
+TESTNUM=32
+TARGET="${TESTDIR}/foo/bar/baz"
+LINK2FOO="${TESTDIR}/quux"
+mkdir -p $(dirname "${TARGET}")
+touch "${TARGET}"
+ln -s foo "${LINK2FOO}"
+setfacl --default --modify user:${USERS[0]}:rw $(dirname "${TARGET}")
+"${BIN}" "${LINK2FOO}/bar/baz"
+ACTUAL=$( getfacl --omit-header "${TARGET}" )
+EXPECTED=$(cat <<EOF
+user::rw-
+group::r--
+other::r--
+
+EOF
+)
+compare
+
+
+# Test that our exit code succeeds on a single, normal path.
+TESTNUM=33
+TARGET="${TESTDIR}/foo"
+touch "${TARGET}"
+setfacl --default --modify user:${USERS[0]}:rw "${TESTDIR}"
+"${BIN}" "${TARGET}"
+ACTUAL="$?"
+EXPECTED="0"
+compare
+
+
+# Test that our exit code fails on a symlink.
+TESTNUM=34
+TARGET="${TESTDIR}/bar"
+touch "${TESTDIR}/foo"
+ln -s foo "${TARGET}"
+setfacl --default --modify user:${USERS[0]}:rw "${TESTDIR}"
+"${BIN}" "${TARGET}"
+ACTUAL="$?"
+EXPECTED="1"
+compare
+
+
+# The previous test should "succeed" if we use --recursive. This is
+# buggy, but it's documented.
+TESTNUM=35
+TARGET="${TESTDIR}/bar"
+touch "${TESTDIR}/foo"
+ln -s foo "${TARGET}"
+setfacl --default --modify user:${USERS[0]}:rw "${TESTDIR}"
+"${BIN}" --recursive "${TARGET}"
+ACTUAL="$?"
+EXPECTED="0"
+compare
+
+
+# Test the return value for nonexistent paths.
+TESTNUM=36
+TARGET="${TESTDIR}/foo"
+"${BIN}" "${TARGET}" &>/dev/null
+ACTUAL="$?"
+EXPECTED="1"
+compare
+
+
+# Test that one "failure" exit code overrides two "successes"
+TESTNUM=37
+mkdir "${TESTDIR}/foo"
+ln -s foo "${TESTDIR}/bar"
+mkdir "${TESTDIR}/baz"
+"${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.
+TESTNUM=38
+mkdir "${TESTDIR}/foo"
+ln -s foo "${TESTDIR}/bar"
+mkdir "${TESTDIR}/baz"
+"${BIN}" --recursive "${TESTDIR}"
+ACTUAL="$?"
+EXPECTED="0"
+compare