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