Several new tests of sendmail aliases parsing will be added in a
subsequent patch, so factor out functionality common to all of them
into a new helper function.
Signed-off-by: Eric Sunshine <sunshine@xxxxxxxxxxxxxx>
---
t/t9001-send-email.sh | 47 +++++++++++++++++++++++++++++------------------
1 file changed, 29 insertions(+), 18 deletions(-)
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index a3663da..1012fa3 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1549,10 +1549,35 @@ test_expect_success $PREREQ 'sendemail.aliasfile=~/.mailrc' '
grep "^!someone@example\.org!$" commandline1
'
-test_expect_success $PREREQ 'sendemail.aliasfiletype=sendmail' '
- clean_fake_sendmail && rm -fr outdir &&
- git format-patch -1 -o outdir &&
- cat >>.tmp-email-aliases <<-\EOF &&
+test_sendmail_aliases () {
+ msg="$1" && shift &&
+ expect="$@" &&
+ cat >.tmp-email-aliases &&
+
+ test_expect_success $PREREQ "$msg" '
+ clean_fake_sendmail && rm -fr outdir &&
+ git format-patch -1 -o outdir &&
+ git config --replace-all sendemail.aliasesfile \
+ "$(pwd)/.tmp-email-aliases" &&
+ git config sendemail.aliasfiletype sendmail &&
+ git send-email \
+ --from="Example <nobody@xxxxxxxxxxx>" \
+ --to=alice --to=bcgrp \
+ --smtp-server="$(pwd)/fake.sendmail" \
+ outdir/0001-*.patch \
+ 2>errors >out &&
+ for i in $expect
+ do
+ grep "^!$i!$" commandline1 || return 1
+ done
+ '
+}
+
+test_sendmail_aliases 'sendemail.aliasfiletype=sendmail' \
+ 'awol@example\.com' \
+ 'bob@example\.com' \
+ 'chloe@example\.com' \
+ 'o@example\.com' <<-\EOF
alice: Alice W Land <awol@xxxxxxxxxxx>
bob: Robert Bobbyton <bob@xxxxxxxxxxx>
# this is a comment
@@ -1561,20 +1586,6 @@ test_expect_success $PREREQ 'sendemail.aliasfiletype=sendmail' '
abgroup: alice, bob
bcgrp: bob, chloe, Other <o@xxxxxxxxxxx>
EOF
- git config --replace-all sendemail.aliasesfile \
- "$(pwd)/.tmp-email-aliases" &&
- git config sendemail.aliasfiletype sendmail &&
- git send-email \
- --from="Example <nobody@xxxxxxxxxxx>" \
- --to=alice --to=bcgrp \
- --smtp-server="$(pwd)/fake.sendmail" \
- outdir/0001-*.patch \
- 2>errors >out &&
- grep "^!awol@example\.com!$" commandline1 &&
- grep "^!bob@example\.com!$" commandline1 &&
- grep "^!chloe@example\.com!$" commandline1 &&
- grep "^!o@example\.com!$" commandline1
-'
do_xmailer_test () {
expected=$1 params=$2 &&
--
2.4.2.538.g5f4350e
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html