On Wed, Nov 28, 2012 at 10:55:02AM -0800, Junio C Hamano wrote: > > +test_expect_success $PREREQ,AUTOIDENT 'implicit ident is allowed' ' > > + clean_fake_sendmail && > > + (sane_unset GIT_AUTHOR_NAME && > > + sane_unset GIT_AUTHOR_EMAIL && > > + sane_unset GIT_COMMITTER_NAME && > > + sane_unset GIT_COMMITTER_EMAIL && > > + GIT_SEND_EMAIL_NOTTY=1 git send-email \ > > + --smtp-server="$(pwd)/fake.sendmail" \ > > + --to=to@xxxxxxxxxxx \ > > + $patches \ > > + </dev/null 2>errors > > + ) > > +' > > + > > +test_expect_success $PREREQ,!AUTOIDENT 'broken implicit ident aborts send-email' ' > > + clean_fake_sendmail && > > + (sane_unset GIT_AUTHOR_NAME && > > + sane_unset GIT_AUTHOR_EMAIL && > > + sane_unset GIT_COMMITTER_NAME && > > + sane_unset GIT_COMMITTER_EMAIL && > > + GIT_SEND_EMAIL_NOTTY=1 && export GIT_SEND_EMAIL_NOTTY && > > + test_must_fail git send-email \ > > + --smtp-server="$(pwd)/fake.sendmail" \ > > + $patches </dev/null 2>errors && > > + test_i18ngrep "tell me who you are" errors > > + ) > > +' > > The difference between these two tests should solely come from > AUTOIDENT and nothing else, so it would be better to see their > command line arguments to match; the former is with --to and the > latter is without in this patch but I do not think you meant them to > differ that way. Yeah, that makes sense. The top one originally was testing that we still prompted in the autoident case, and so had some echos piped into send-email. I simplified it to use --to, but I agree it is even better to show that the commands are identical. Here's a cleaned up version that makes it more obvious the commands are the same (it also fixes a few minor whitespace problems on the indentation, which you can see from the quoting above). -- >8 -- Subject: [PATCH] t9001: check send-email behavior with implicit sender We allow send-email to use an implicitly-defined identity for the sender (because there is still a confirmation step), but we abort when we cannot generate such an identity. Let's make sure that we test this. Signed-off-by: Jeff King <peff@xxxxxxxx> --- t/t9001-send-email.sh | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index c5d66cf..97d6f4c 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -201,6 +201,34 @@ test_expect_success $PREREQ 'Prompting works' ' grep "^To: to@xxxxxxxxxxx\$" msgtxt1 ' +test_expect_success $PREREQ,AUTOIDENT 'implicit ident is allowed' ' + clean_fake_sendmail && + (sane_unset GIT_AUTHOR_NAME && + sane_unset GIT_AUTHOR_EMAIL && + sane_unset GIT_COMMITTER_NAME && + sane_unset GIT_COMMITTER_EMAIL && + GIT_SEND_EMAIL_NOTTY=1 git send-email \ + --smtp-server="$(pwd)/fake.sendmail" \ + --to=to@xxxxxxxxxxx \ + $patches </dev/null 2>errors + ) +' + +test_expect_success $PREREQ,!AUTOIDENT 'broken implicit ident aborts send-email' ' + clean_fake_sendmail && + (sane_unset GIT_AUTHOR_NAME && + sane_unset GIT_AUTHOR_EMAIL && + sane_unset GIT_COMMITTER_NAME && + sane_unset GIT_COMMITTER_EMAIL && + GIT_SEND_EMAIL_NOTTY=1 && export GIT_SEND_EMAIL_NOTTY && + test_must_fail git send-email \ + --smtp-server="$(pwd)/fake.sendmail" \ + --to=to@xxxxxxxxxxx \ + $patches </dev/null 2>errors && + test_i18ngrep "tell me who you are" errors + ) +' + test_expect_success $PREREQ 'tocmd works' ' clean_fake_sendmail && cp $patches tocmd.patch && -- 1.8.0.207.gdf2154c -- 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