mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 13:13:44 +01:00
test/parseconf: Always show the result file name on failure
Obviously correct fixes on already reviewed code.
This commit is contained in:
parent
3763dd9987
commit
233b96d83a
3
changes/ticket32213_parseconf
Normal file
3
changes/ticket32213_parseconf
Normal file
@ -0,0 +1,3 @@
|
||||
o Testing:
|
||||
- Improve the consistency of test_parseconf.sh output, and run all the
|
||||
tests, even if one fails. Closes ticket 32213.
|
@ -189,7 +189,7 @@ for dir in "${EXAMPLEDIR}"/*; do
|
||||
--dump-config short \
|
||||
${CMDLINE} \
|
||||
| "${FILTER}" > "${DATA_DIR}/output.${testname}" \
|
||||
|| die "FAIL: Tor exited."
|
||||
|| die "FAIL: $EXPECTED: Tor reported an error."
|
||||
|
||||
if cmp "$EXPECTED" "${DATA_DIR}/output.${testname}">/dev/null ; then
|
||||
# Check round-trip.
|
||||
@ -198,11 +198,12 @@ for dir in "${EXAMPLEDIR}"/*; do
|
||||
--dump-config short \
|
||||
| "${FILTER}" \
|
||||
> "${DATA_DIR}/output_2.${testname}" \
|
||||
|| die "FAIL: Tor exited on round-trip."
|
||||
|| die \
|
||||
"FAIL: $EXPECTED: Tor reported an error on round-trip."
|
||||
|
||||
if ! cmp "${DATA_DIR}/output.${testname}" \
|
||||
"${DATA_DIR}/output_2.${testname}"; then
|
||||
echo "FAIL: did not match on round-trip." >&2
|
||||
echo "FAIL: $EXPECTED did not match on round-trip." >&2
|
||||
FINAL_EXIT=$EXITCODE
|
||||
fi
|
||||
|
||||
@ -216,7 +217,7 @@ for dir in "${EXAMPLEDIR}"/*; do
|
||||
--verify-config \
|
||||
${CMDLINE} || true
|
||||
fi
|
||||
echo "FAIL: did not match." >&2
|
||||
echo "FAIL: $EXPECTED did not match." >&2
|
||||
diff -u "$EXPECTED" "${DATA_DIR}/output.${testname}" >&2 \
|
||||
|| true
|
||||
FINAL_EXIT=$EXITCODE
|
||||
@ -236,14 +237,14 @@ for dir in "${EXAMPLEDIR}"/*; do
|
||||
--defaults-torrc "${DEFAULTS}" \
|
||||
${CMDLINE} \
|
||||
> "${DATA_DIR}/output.${testname}" \
|
||||
&& die "FAIL: Tor did not report an error."
|
||||
&& die "FAIL: $ERROR: Tor did not report an error."
|
||||
|
||||
expect_err="$(cat $ERROR)"
|
||||
if grep "${expect_err}" "${DATA_DIR}/output.${testname}" >/dev/null; then
|
||||
echo "OK"
|
||||
else
|
||||
echo "FAIL" >&2
|
||||
echo "Expected error: ${expect_err}" >&2
|
||||
echo "Expected $ERROR: ${expect_err}" >&2
|
||||
echo "Tor said:" >&2
|
||||
cat "${DATA_DIR}/output.${testname}" >&2
|
||||
FINAL_EXIT=$EXITCODE
|
||||
|
Loading…
Reference in New Issue
Block a user