test: Unify all tests to use the pass_if_equal function.

Previously some tests (dump/restore) were doing ad-hoc verification of
values and their own printing of PASS/FAIL, etc. This made it
impossible to count test pass/fail rates in a single place.

The only reason these tests were written that way was because the old
execute_expecting function only worked if one could directly test the
stdout output of a notmuch command. The recent switch to pass_if_equal
means that all tests can use it.
This commit is contained in:
Carl Worth 2010-04-15 15:09:21 -07:00
parent 6d16e5c7a3
commit 004ed3362f

View file

@ -583,34 +583,22 @@ printf "\nTesting \"notmuch dump\" and \"notmuch restore\":\n"
printf " Dumping all tags...\t\t\t\t" printf " Dumping all tags...\t\t\t\t"
$NOTMUCH dump dump.expected $NOTMUCH dump dump.expected
echo " PASS" pass_if_equal "$?" "0"
printf " Clearing all tags...\t\t\t\t" printf " Clearing all tags...\t\t\t\t"
sed -e 's/(\([^(]*\))$/()/' < dump.expected > clear.expected sed -e 's/(\([^(]*\))$/()/' < dump.expected > clear.expected
$NOTMUCH restore clear.expected $NOTMUCH restore clear.expected
$NOTMUCH dump clear.actual $NOTMUCH dump clear.actual
if diff clear.expected clear.actual > /dev/null; then pass_if_equal "$(< clear.actual)" "$(< clear.expected)"
echo " PASS"
else
echo " FAIL"
echo " Expected output: See file clear.expected"
echo " Actual output: See file clear.actual"
fi
printf " Restoring original tags...\t\t\t" printf " Restoring original tags...\t\t\t"
$NOTMUCH restore dump.expected $NOTMUCH restore dump.expected
$NOTMUCH dump dump.actual $NOTMUCH dump dump.actual
if diff dump.expected dump.actual > /dev/null; then pass_if_equal "$(< dump.actual)" "$(< dump.expected)"
echo " PASS"
else
echo " FAIL"
echo " Expected output: See file dump.expected"
echo " Actual output: See file dump.actual"
fi
printf " Restore with nothing to do...\t\t\t" printf " Restore with nothing to do...\t\t\t"
$NOTMUCH restore dump.expected $NOTMUCH restore dump.expected
echo " PASS" pass_if_equal "$?" "0"
printf "\nTesting threading when messages received out of order:\n" printf "\nTesting threading when messages received out of order:\n"
printf " Adding initial child message...\t\t" printf " Adding initial child message...\t\t"