From 2554dd1aa8ddbaa043cbd12da0ec7084a1413f37 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Fri, 17 May 2019 21:55:41 +0200 Subject: [PATCH] send-email: remove cargo-culted multi-patch pattern in tests MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change test code added in f434c083a0 ("send-email: add --no-cc, --no-to, and --no-bcc", 2010-03-07) which blindly copied a pattern from an earlier test added in 32ae83194b ("add a test for git-send-email for non-threaded mails", 2009-06-12) where the "$patches" variable was supplied more than once. As it turns out we didn't need more than one "$patches" for the test added in 32ae83194b either. The only tests that actually needed this sort of invocation were the tests added in 54aae5e1a0 ("t9001: send-email interation with --in-reply-to and --chain-reply-to", 2010-10-19). Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- t/t9001-send-email.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index c67be97e30..461bb5b307 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -1176,7 +1176,7 @@ test_expect_success $PREREQ 'no in-reply-to and no threading' ' --from="Example " \ --to=nobody@example.com \ --no-thread \ - $patches $patches >stdout && + $patches >stdout && ! grep "In-Reply-To: " stdout ' @@ -1196,7 +1196,7 @@ test_expect_success $PREREQ 'sendemail.to works' ' git send-email \ --dry-run \ --from="Example " \ - $patches $patches >stdout && + $patches >stdout && grep "To: Somebody " stdout ' @@ -1206,7 +1206,7 @@ test_expect_success $PREREQ '--no-to overrides sendemail.to' ' --from="Example " \ --no-to \ --to=nobody@example.com \ - $patches $patches >stdout && + $patches >stdout && grep "To: nobody@example.com" stdout && ! grep "To: Somebody " stdout ' @@ -1217,7 +1217,7 @@ test_expect_success $PREREQ 'sendemail.cc works' ' --dry-run \ --from="Example " \ --to=nobody@example.com \ - $patches $patches >stdout && + $patches >stdout && grep "Cc: Somebody " stdout ' @@ -1228,7 +1228,7 @@ test_expect_success $PREREQ '--no-cc overrides sendemail.cc' ' --no-cc \ --cc=bodies@example.com \ --to=nobody@example.com \ - $patches $patches >stdout && + $patches >stdout && grep "Cc: bodies@example.com" stdout && ! grep "Cc: Somebody " stdout ' @@ -1240,7 +1240,7 @@ test_expect_success $PREREQ 'sendemail.bcc works' ' --from="Example " \ --to=nobody@example.com \ --smtp-server relay.example.com \ - $patches $patches >stdout && + $patches >stdout && grep "RCPT TO:" stdout ' @@ -1252,7 +1252,7 @@ test_expect_success $PREREQ '--no-bcc overrides sendemail.bcc' ' --bcc=bodies@example.com \ --to=nobody@example.com \ --smtp-server relay.example.com \ - $patches $patches >stdout && + $patches >stdout && grep "RCPT TO:" stdout && ! grep "RCPT TO:" stdout ' -- 2.43.2