On Wed, Nov 28, 2012 at 01:25:35PM -0500, Jeff King wrote: > Here are the cleanups and refactorings split out from my > jk/send-email-sender-prompt series. They can go right on master and are > independent of Felipe's fc/send-email-no-sender-prompt topic. > [...] > Dropped were: > [...] > - send-email prompting change; obsoleted by Felipe's patch Here is one more patch pulling out the extra tests from my final commit. It needs to go on top of the merge of Felipe's series and the one I just sent. The former because of the new prompting behavior, and the latter because of the AUTOIDENT prerequisites. If it's simpler, my whole series can just go on top of Felipe's patch (or vice versa). -- >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..27edfa8 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" \ + $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