git-send-email: test full --validate output

Change the tests that grep substrings out of the output to use a full
test_cmp, in preparation for improving the output.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2021-04-06 16:00:35 +02:00 committed by Junio C Hamano
parent b362acf575
commit e585210e1b

View file

@ -422,8 +422,12 @@ test_expect_success $PREREQ 'reject long lines' '
--smtp-server="$(pwd)/fake.sendmail" \ --smtp-server="$(pwd)/fake.sendmail" \
--transfer-encoding=8bit \ --transfer-encoding=8bit \
$patches longline.patch \ $patches longline.patch \
2>errors && 2>actual &&
grep longline.patch errors cat >expect <<-\EOF &&
fatal: longline.patch: 35: patch contains a line longer than 998 characters
warning: no patches were sent
EOF
test_cmp expect actual
' '
test_expect_success $PREREQ 'no patch was sent' ' test_expect_success $PREREQ 'no patch was sent' '
@ -527,9 +531,13 @@ test_expect_success $PREREQ "--validate respects relative core.hooksPath path" '
--to=nobody@example.com \ --to=nobody@example.com \
--smtp-server="$(pwd)/fake.sendmail" \ --smtp-server="$(pwd)/fake.sendmail" \
--validate \ --validate \
longline.patch 2>err && longline.patch 2>actual &&
test_path_is_file my-hooks.ran && test_path_is_file my-hooks.ran &&
grep "rejected by sendemail-validate" err cat >expect <<-\EOF &&
fatal: longline.patch: rejected by sendemail-validate hook
warning: no patches were sent
EOF
test_cmp expect actual
' '
test_expect_success $PREREQ "--validate respects absolute core.hooksPath path" ' test_expect_success $PREREQ "--validate respects absolute core.hooksPath path" '
@ -540,9 +548,13 @@ test_expect_success $PREREQ "--validate respects absolute core.hooksPath path" '
--to=nobody@example.com \ --to=nobody@example.com \
--smtp-server="$(pwd)/fake.sendmail" \ --smtp-server="$(pwd)/fake.sendmail" \
--validate \ --validate \
longline.patch 2>err && longline.patch 2>actual &&
test_path_is_file my-hooks.ran && test_path_is_file my-hooks.ran &&
grep "rejected by sendemail-validate" err cat >expect <<-\EOF &&
fatal: longline.patch: rejected by sendemail-validate hook
warning: no patches were sent
EOF
test_cmp expect actual
' '
for enc in 7bit 8bit quoted-printable base64 for enc in 7bit 8bit quoted-printable base64