git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: git@vger.kernel.org
Subject: [PATCH 3/6] t/send-email: test suppress-cc=self on cccmd
Date: Sun, 26 May 2013 17:41:01 +0300	[thread overview]
Message-ID: <1369579187-27573-4-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1369579187-27573-1-git-send-email-mst@redhat.com>

Check that suppress-cc=self works when applied
to output of cccmd.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 t/t9001-send-email.sh | 50 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 36ecf73..8aa55f8 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -179,37 +179,53 @@ test_suppress_self () {
 			echo sed -n -e s/^cccmd--//p \"\$1\"
 		} > cccmd-sed &&
 		chmod +x cccmd-sed &&
-		git commit --amend --author="$1 <$2>" -F - << EOF && \
-		clean_fake_sendmail && \
-		echo suppress-self-$3.patch > /dev/tty && \
-		git format-patch --stdout -1 >suppress-self-$3.patch && \
-		git send-email --from="$1 <$2>" \
+		git commit --amend --author="$1 <$2>" -F - && 
+		clean_fake_sendmail && 
+		git format-patch --stdout -1 >suppress-self-$3.patch && 
+		git send-email --from="$1 <$2>"  \
 		--to=nobody@example.com \
 		--cc-cmd=./cccmd-sed \
 		--suppress-cc=self \
 		--smtp-server="$(pwd)/fake.sendmail" \
-		suppress-self-$3.patch && \
-		mv msgtxt1 msgtxt1-$3 && \
-		sed -e '/^$/q' msgtxt1-$3 > msghdr1-$3 && \
-		rm -f expected-no-cc-$3 && \
-		touch expected-no-cc-$3 && \
-		grep '^Cc:' msghdr1-$3 > actual-no-cc-$3 && \
-		test_cmp expected-no-cc-$3 actual-no-cc-$3
-test suppress-cc.self $3 with name $1 email $2
+		suppress-self-$3.patch && 
+		mv msgtxt1 msgtxt1-$3 && 
+		sed -e '/^$/q' msgtxt1-$3 > msghdr1-$3 && 
+		rm -f expected-no-cc-$3 && 
+		touch expected-no-cc-$3 && 
+		(grep '^Cc:' msghdr1-$3 > actual-no-cc-$3;
+		 test_cmp expected-no-cc-$3 actual-no-cc-$3)
+}
+
+test_suppress_self_unquoted () {
+test_suppress_self "$1" "$2" "unquoted-$3" << EOF
+		test suppress-cc.self unquoted-$3 with name $1 email $2
+unquoted-$3
+
+cccmd--$1 <$2>
+
+Cc: $1 <$2>
+Signed-off-by: $1 <$2>
+EOF
+}
+
+test_suppress_self_quoted () {
+test_suppress_self "$1" "$2" "quoted-$3" << EOF
+test suppress-cc.self quoted-$3 with name $1 email $2
 
-$3
+quoted-$3
 
 cccmd--"$1" <$2>
 
-Cc: "$1" <$2>
 Cc: $1 <$2>
-Signed-off-by: "$1" <$2>
+Cc: "$1" <$2>
 Signed-off-by: $1 <$2>
+Signed-off-by: "$1" <$2>
 EOF
 }
 
+
 test_expect_success $PREREQ 'self name is suppressed' "
-	test_suppress_self 'A U Thor' 'author@redhat.com' 'self_name_suppressed'
+	test_suppress_self_unquoted 'A U Thor' 'author@redhat.com' 'self_name_suppressed'
 "
 
 test_expect_success $PREREQ 'Show all headers' '
-- 
MST

  parent reply	other threads:[~2013-05-26 14:40 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-26 14:40 [PATCH 0/6] git send-email suppress-cc=self fixes Michael S. Tsirkin
2013-05-26 14:40 ` [PATCH 1/6] t/send-email.sh: add test for suppress self Michael S. Tsirkin
2013-05-29 20:28   ` Junio C Hamano
2013-05-29 21:44     ` Michael S. Tsirkin
2013-05-29 22:46       ` Junio C Hamano
2013-05-29 22:59         ` Junio C Hamano
2013-05-30  4:51           ` Michael S. Tsirkin
2013-05-26 14:40 ` [PATCH 2/6] send-email: fix suppress-cc=self on cccmd Michael S. Tsirkin
2013-05-26 14:41 ` Michael S. Tsirkin [this message]
2013-05-26 14:41 ` [PATCH 4/6] send-email: make --suppress-cc=self sanitize input Michael S. Tsirkin
2013-05-26 14:41 ` [PATCH 5/6] t/send-email: add test with quoted sender Michael S. Tsirkin
2013-05-26 14:41 ` [PATCH 6/6] t/send-email: test suppress-cc=self with non-ascii Michael S. Tsirkin

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1369579187-27573-4-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).