X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=run-tests.sh;h=ad50c796d2d4467c0bc2a85998088a32101f6857;hb=95e752b65a9ce49d707c16a521f141ef2f0c4a3b;hp=3ac659fcdce364a534f2b128a337de113cc114da;hpb=6727b9e8ed3807cd565127f87fa6faa33c4b5ee4;p=apply-default-acl.git

diff --git a/run-tests.sh b/run-tests.sh
index 3ac659f..ad50c79 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
 
@@ -869,3 +864,13 @@ mkdir "${TESTDIR}/baz"
 ACTUAL="$?"
 EXPECTED="0"
 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