nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

test/parseconf: Consistenly use FAIL

Browse Source 
Obviously correct fixes on already reviewed code.
This commit is contained in:
teor 2019-11-04 11:15:41 +10:00
parent 03618e0d68
commit 1dd6717db5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/test_parseconf.sh
View File

@ -187,7 +187,7 @@ for dir in "${EXAMPLEDIR}"/*; do
--dump-config short \
${CMDLINE} \
| "${FILTER}" > "${DATA_DIR}/output.${testname}" \
|| die "Failure: Tor exited."
|| die "FAIL: Tor exited."
if cmp "$EXPECTED" "${DATA_DIR}/output.${testname}">/dev/null ; then
# Check round-trip.
@ -196,11 +196,11 @@ for dir in "${EXAMPLEDIR}"/*; do
--dump-config short \
| "${FILTER}" \
> "${DATA_DIR}/output_2.${testname}" \
|| die "Failure: Tor exited on round-trip."
|| die "FAIL: Tor exited on round-trip."
if ! cmp "${DATA_DIR}/output.${testname}" \
"${DATA_DIR}/output_2.${testname}"; then
echo "Failure: did not match on round-trip." >&2
echo "FAIL: did not match on round-trip." >&2
exit $EXITCODE
fi
@ -214,7 +214,7 @@ for dir in "${EXAMPLEDIR}"/*; do
--verify-config \
${CMDLINE} || true
fi
echo "Failure: did not match." >&2
echo "FAIL: did not match." >&2
diff -u "$EXPECTED" "${DATA_DIR}/output.${testname}" >&2 \
|| true
exit $EXITCODE
@ -234,7 +234,7 @@ for dir in "${EXAMPLEDIR}"/*; do
--defaults-torrc "${DEFAULTS}" \
${CMDLINE} \
> "${DATA_DIR}/output.${testname}" \
&& die "Failure: Tor did not report an error."
&& die "FAIL: Tor did not report an error."
expect_err="$(cat $ERROR)"
if grep "${expect_err}" "${DATA_DIR}/output.${testname}" >/dev/null; then