Store the test users in a bash array.

Use separate exit codes for test failure and missing users.

diff --git a/run-tests.sh b/run-tests.sh
index b20ec79c9b2259b34f18722edee522c5e9f76c38..4cfea29007c13e091d0abd7af82b70b93f17f0d9 100755 (executable)
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -1,7 +1,31 @@
 #!/bin/bash
 
+#
+# Exit codes
+#
+
+# Exit with this when a test fails.
+EXIT_FAILURE=1
+
+# We use a few system users in the tests. If these users aren't
+# present, we exit with a different (non-EXIT_FAILURE).
+EXIT_MISSING_USERS=2
+
+# Define the users that we'll use in the tests below. We store the
+# names as variables to avoid repeating them everywhere.
+#
+# WARNING: These must be in alphabetical order; otherwise the getfacl
+# output will not match.
+#
+USERS=( bin daemon )
+
+# Check to see if the above users exist. If not, bail.
+for idx in $( seq 0 $((${#USERS[@]} - 1)) ); do
+    id ${USERS[idx]} >/dev/null 2>&1 || exit $EXIT_MISSING_USERS
+done
+
 # The program name.
-BIN=./src/apply-default-acl
+BIN=src/apply-default-acl
 
 # The directory where we'll do all the ACL manipulation.
 TESTDIR=test
@@ -27,7 +51,7 @@ compare() {
        echo '================'
        echo "${ACTUAL}"
        echo '================'
-       exit 1
+       exit $EXIT_FAILURE
     fi
 }
 
@@ -63,14 +87,14 @@ TESTNUM=2
 setfacl -d -m user::r--     "${TESTDIR}"
 setfacl -d -m group::r--    "${TESTDIR}"
 setfacl -d -m other::r--    "${TESTDIR}"
-setfacl -d -m user:bin:rwx "${TESTDIR}"
+setfacl -d -m user:${USERS[0]}:rwx "${TESTDIR}"
 touch "${TARGET}"
 chmod 777 "${TARGET}"
 $BIN "${TARGET}"
 
 EXPECTED=$(cat <<EOF
 user::r--
-user:bin:rwx
+user:${USERS[0]}:rwx
 group::r--
 mask::rwx
 other::r--
@@ -87,13 +111,13 @@ compare
 TESTNUM=3
 touch "${TARGET}"
 chmod 644 "${TARGET}"
-setfacl -d -m group:bin:rwx "${TESTDIR}"
+setfacl -d -m group:${USERS[0]}:rwx "${TESTDIR}"
 $BIN "${TARGET}"
 
 EXPECTED=$(cat <<EOF
 user::rw-
 group::r--
-group:bin:rwx  #effective:rw-
+group:${USERS[0]}:rwx  #effective:rw-
 mask::rw-
 other::r--
 
@@ -106,7 +130,7 @@ compare
 
 # Same test as before except with a directory.
 TESTNUM=4
-setfacl -d -m group:bin:rwx "${TESTDIR}"
+setfacl -d -m group:${USERS[0]}:rwx "${TESTDIR}"
 mkdir "${TARGET}"
 chmod 755 "${TARGET}"
 $BIN "${TARGET}"
@@ -114,12 +138,12 @@ $BIN "${TARGET}"
 EXPECTED=$(cat <<EOF
 user::rwx
 group::r-x
-group:bin:rwx
+group:${USERS[0]}:rwx
 mask::rwx
 other::r-x
 default:user::rwx
 default:group::r-x
-default:group:bin:rwx
+default:group:${USERS[0]}:rwx
 default:mask::rwx
 default:other::r-x
 
@@ -155,13 +179,13 @@ compare
 TESTNUM=6
 touch "${TARGET}"
 chmod 744 "${TARGET}"
-setfacl -d -m user:bin:rwx "${TESTDIR}"
+setfacl -d -m user:${USERS[0]}:rwx "${TESTDIR}"
 $BIN "${TARGET}"
 
 
 EXPECTED=$(cat <<EOF
 user::rwx
-user:bin:rwx
+user:${USERS[0]}:rwx
 group::r-x
 mask::rwx
 other::r-x
@@ -178,21 +202,21 @@ compare
 TESTNUM=7
 touch "${TARGET}"
 chmod 744 "${TARGET}"
-setfacl -m user:daemon:rw "${TARGET}"
+setfacl -m user:${USERS[1]}:rw "${TARGET}"
 # If we don't add 'x' to the mask here, nobody can execute the file.
 # setfacl will update the mask for us under most circumstances, but
 # note that we didn't create an entry with an 'x' bit using setfacl --
 # therefore, setfacl won't unmask 'x' for us.
 setfacl -m mask::rwx "${TARGET}"
-setfacl -d -m user:bin:rwx "${TESTDIR}"
-setfacl -d -m user:daemon:rwx "${TESTDIR}"
+setfacl -d -m user:${USERS[0]}:rwx "${TESTDIR}"
+setfacl -d -m user:${USERS[1]}:rwx "${TESTDIR}"
 $BIN "${TARGET}"
 
 
 EXPECTED=$(cat <<EOF
 user::rwx
-user:bin:rwx
-user:daemon:rwx
+user:${USERS[0]}:rwx
+user:${USERS[1]}:rwx
 group::r-x
 mask::rwx
 other::r-x
@@ -208,14 +232,14 @@ compare
 TESTNUM=8
 touch "${TARGET}"
 chmod 644 "${TARGET}"
-setfacl -m user:daemon:rw "${TARGET}"
-setfacl -d -m user:bin:rwx "${TESTDIR}"
+setfacl -m user:${USERS[1]}:rw "${TARGET}"
+setfacl -d -m user:${USERS[0]}:rwx "${TESTDIR}"
 $BIN "${TARGET}"
 
 
 EXPECTED=$(cat <<EOF
 user::rw-
-user:bin:rwx   #effective:rw-
+user:${USERS[0]}:rwx   #effective:rw-
 group::r--
 mask::rw-
 other::r--
@@ -253,14 +277,14 @@ TESTNUM=10
 TARGET="${TESTDIR}"/foo
 touch "${TARGET}"
 chmod 777 "${TARGET}"
-setfacl -m user:bin:rwx "${TESTDIR}"
-setfacl -d -m user:bin:rwx  "${TESTDIR}"
+setfacl -m user:${USERS[0]}:rwx "${TESTDIR}"
+setfacl -d -m user:${USERS[0]}:rwx  "${TESTDIR}"
 setfacl -d -m mask::rw-  "${TESTDIR}"
 $BIN "${TARGET}"
 
 EXPECTED=$(cat <<EOF
 user::rwx
-user:bin:rwx   #effective:rw-
+user:${USERS[0]}:rwx   #effective:rw-
 group::r-x     #effective:r--
 mask::rw-
 other::r-x
@@ -356,19 +380,19 @@ TESTNUM=14
 TARGET="${TESTDIR}"/baz
 mkdir "${TARGET}"
 chmod 644 "${TARGET}"
-setfacl -d -m user:bin:rwx "${TESTDIR}"
+setfacl -d -m user:${USERS[0]}:rwx "${TESTDIR}"
 
 $BIN "${TARGET}"
 $BIN "${TARGET}"
 
 EXPECTED=$(cat <<EOF
 user::rwx
-user:bin:rwx
+user:${USERS[0]}:rwx
 group::r-x
 mask::rwx
 other::r-x
 default:user::rwx
-default:user:bin:rwx
+default:user:${USERS[0]}:rwx
 default:group::r-x
 default:mask::rwx
 default:other::r-x
@@ -386,19 +410,19 @@ TESTNUM=15
 TARGET="${TESTDIR}"/baz
 mkdir "${TARGET}"
 chmod 755 "${TARGET}"
-setfacl -d -m user:bin:rwx "${TESTDIR}"
+setfacl -d -m user:${USERS[0]}:rwx "${TESTDIR}"
 
 $BIN "${TARGET}"
 $BIN "${TARGET}"
 
 EXPECTED=$(cat <<EOF
 user::rwx
-user:bin:rwx
+user:${USERS[0]}:rwx
 group::r-x
 mask::rwx
 other::r-x
 default:user::rwx
-default:user:bin:rwx
+default:user:${USERS[0]}:rwx
 default:group::r-x
 default:mask::rwx
 default:other::r-x
@@ -416,14 +440,14 @@ TESTNUM=16
 TARGET="${TESTDIR}"/foo
 touch "${TARGET}"
 chmod 644 "${TARGET}"
-setfacl -d -m user:bin:rwx "${TESTDIR}"
+setfacl -d -m user:${USERS[0]}:rwx "${TESTDIR}"
 
 $BIN "${TARGET}"
 $BIN "${TARGET}"
 
 EXPECTED=$(cat <<EOF
 user::rw-
-user:bin:rwx   #effective:rw-
+user:${USERS[0]}:rwx   #effective:rw-
 group::r--
 mask::rw-
 other::r--
@@ -439,12 +463,12 @@ TESTNUM=17
 TARGET="${TESTDIR}"/foo
 touch "${TARGET}"
 chmod 700 "${TARGET}"
-setfacl -d -m user:bin:rwx  "${TESTDIR}"
+setfacl -d -m user:${USERS[0]}:rwx  "${TESTDIR}"
 $BIN "${TARGET}"
 
 EXPECTED=$(cat <<EOF
 user::rwx
-user:bin:rwx
+user:${USERS[0]}:rwx
 group::r-x
 mask::rwx
 other::r-x
@@ -461,12 +485,12 @@ TESTNUM=18
 TARGET="${TESTDIR}"/foo
 touch "${TARGET}"
 chmod 670 "${TARGET}"
-setfacl -d -m user:bin:rwx  "${TESTDIR}"
+setfacl -d -m user:${USERS[0]}:rwx  "${TESTDIR}"
 $BIN "${TARGET}"
 
 EXPECTED=$(cat <<EOF
 user::rwx
-user:bin:rwx
+user:${USERS[0]}:rwx
 group::r-x
 mask::rwx
 other::r-x
@@ -483,12 +507,12 @@ TESTNUM=19
 TARGET="${TESTDIR}"/foo
 touch "${TARGET}"
 chmod 607 "${TARGET}"
-setfacl -d -m user:bin:rwx  "${TESTDIR}"
+setfacl -d -m user:${USERS[0]}:rwx  "${TESTDIR}"
 $BIN "${TARGET}"
 
 EXPECTED=$(cat <<EOF
 user::rwx
-user:bin:rwx
+user:${USERS[0]}:rwx
 group::r-x
 mask::rwx
 other::r-x
@@ -510,13 +534,13 @@ chmod 644 "${TARGET}"
 # The directory allows execute for user, group, and other, so the file
 # should actually inherit them regardless of its initial mode when the
 # --no-exec-mask flag is passed.
-setfacl -d -m user:bin:rwx "${TESTDIR}"
+setfacl -d -m user:${USERS[0]}:rwx "${TESTDIR}"
 
 $BIN --no-exec-mask "${TARGET}"
 
 EXPECTED=$(cat <<EOF
 user::rwx
-user:bin:rwx
+user:${USERS[0]}:rwx
 group::r-x
 mask::rwx
 other::r-x
@@ -536,13 +560,13 @@ TARGET="${PARENT_DIR}"/bar
 mkdir "${PARENT_DIR}"
 touch "${TARGET}"
 chmod 644 "${TARGET}"
-setfacl -d -m user:bin:rwx "${TESTDIR}"
+setfacl -d -m user:${USERS[0]}:rwx "${TESTDIR}"
 
 $BIN --recursive --no-exec-mask "${PARENT_DIR}"
 
 EXPECTED=$(cat <<EOF
 user::rwx
-user:bin:rwx
+user:${USERS[0]}:rwx
 group::r-x
 mask::rwx
 other::r-x