From: Junio C Hamano <gitster@pobox•com>
To: Luis Henriques <henrix@camandro•org>
Cc: Eric Wong <normalperson@yhbt•net>, git@vger•kernel.org
Subject: Re: [PATCH] test/send-email: --[no-]xmailer tests
Date: Thu, 04 Dec 2014 12:09:43 -0800 [thread overview]
Message-ID: <xmqq4mtbtbw8.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20141204190845.GA4906@charon.olymp> (Luis Henriques's message of "Thu, 4 Dec 2014 19:11:30 +0000")
Luis Henriques <henrix@camandro•org> writes:
> Add tests for the --[no-]xmailer option.
>
> Signed-off-by: Luis Henriques <henrix@camandro•org>
Thanks. Let's squash this in, too. We care about command line
options taking precedence over configured default.
t/t9001-send-email.sh | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index bcd5bad..bb573ef 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1406,6 +1406,7 @@ test_expect_success $PREREQ 'sendemail.aliasfile=~/.mailrc' '
2>errors >out &&
grep "^!someone@example\.org!$" commandline1
'
+
do_xmailer_test() {
expected=$1
params=$2
@@ -1421,22 +1422,23 @@ do_xmailer_test() {
return $?
}
-test_expect_success $PREREQ '--xmailer uses X-Mailer header' '
- do_xmailer_test "1" "--xmailer"
-'
-
-test_expect_success $PREREQ '--no-xmailer supresses X-Mailer header' '
- do_xmailer_test "0" "--no-xmailer"
+test_expect_success $PREREQ '--[no-]xmailer without any configuration' '
+ do_xmailer_test 1 "--xmailer" &&
+ do_xmailer_test 0 "--no-xmailer"
'
-test_expect_success $PREREQ 'sendemail.xmailer=true uses X-Mailer header' '
- git config sendemail.xmailer true &&
- do_xmailer_test "1" ""
+test_expect_success $PREREQ '--[no-]xmailer with sendemail.xmailer=true' '
+ test_config sendemail.xmailer true &&
+ do_xmailer_test 1 "" &&
+ do_xmailer_test 0 "--no-xmailer" &&
+ do_xmailer_test 1 "--xmailer"
'
-test_expect_success $PREREQ 'sendemail.xmailer=false supresses X-Mailer header' '
- git config sendemail.xmailer false &&
- do_xmailer_test "0" ""
+test_expect_success $PREREQ '--[no-]xmailer with sendemail.xmailer=false' '
+ test_config sendemail.xmailer false &&
+ do_xmailer_test 0 "" &&
+ do_xmailer_test 0 "--no-xmailer" &&
+ do_xmailer_test 1 "--xmailer"
'
test_done
prev parent reply other threads:[~2014-12-04 20:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-04 19:11 [PATCH] test/send-email: --[no-]xmailer tests Luis Henriques
2014-12-04 20:09 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq4mtbtbw8.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=henrix@camandro$(echo .)org \
--cc=normalperson@yhbt$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox