test: minor aesthetic, slightly improve test logging
Conforming tests should use SKIP/FAIL/OK, so let existing tests follow that better. Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
15
test/api.sh
15
test/api.sh
@@ -7,11 +7,11 @@ setup
|
||||
|
||||
export MSG="no-openlog-apitest"
|
||||
|
||||
echo "= Phase 1 - simple syslog(), no openlog() ==============="
|
||||
print "Phase 1 - simple syslog(), no openlog()"
|
||||
./api
|
||||
grep "api: ${MSG}" ${LOG}
|
||||
|
||||
echo "= Phase 2 - syslog() with openlog() & custom facility ==="
|
||||
print "Phase 2 - syslog() with openlog() & custom facility"
|
||||
cat <<EOF >${CONFD}/console.conf
|
||||
console.* -${LOGCONS}
|
||||
EOF
|
||||
@@ -20,11 +20,12 @@ reload
|
||||
./api -i foo
|
||||
grep "foo: ${MSG}" ${LOGCONS}
|
||||
|
||||
echo "= Phase 3 - Verify setlogmask() filters out LOG_INFO ===="
|
||||
print "Phase 3 - Verify setlogmask() filters out LOG_INFO"
|
||||
./api -i xyzzy -l
|
||||
grep "xyzzy: ${MSG}" ${LOGCONS} || true
|
||||
grep "xyzzy: ${MSG}" "${LOGCONS}" && FAIL "Filtering w/ setlogmask() broken"
|
||||
echo "Filtering w/ setlogmask() Works fine"
|
||||
|
||||
echo "= Phase 4 - Verify RFC5424 API with syslogp() ==========="
|
||||
print "Phase 4 - Verify RFC5424 API with syslogp()"
|
||||
cat <<EOF >${CONFD}/v1.conf
|
||||
ftp.* -${LOGV1} ;RFC5424
|
||||
EOF
|
||||
@@ -35,7 +36,9 @@ sleep 2
|
||||
ps fax |grep -A2 syslogd
|
||||
grep "troglobit - MSGID - ${MSG}" ${LOGV1} || (echo "== ${LOGV1}"; tail -10 ${LOGV1}; echo "== ${LOG}"; tail -10 ${LOG}; cat ${CONFD}/v1.conf; FAIL "Cannot find troglobit")
|
||||
|
||||
echo "= Phase 4 - Verify RFC5424 API with logger(1) ==========="
|
||||
print "Phase 4 - Verify RFC5424 API with logger(1)"
|
||||
../src/logger -p ftp.notice -u ${SOCK} -m "MSDSD" -d '[exampleSDID@32473 iut="3" eventSource="Application" eventID="1011"]' "waldo"
|
||||
sleep 2
|
||||
grep "exampleSDID@32473" ${LOGV1} || (echo "== ${LOGV1}"; tail -10 ${LOGV1}; FAIL "Cannot find exampleSDID@32473")
|
||||
|
||||
OK
|
||||
|
Reference in New Issue
Block a user