[PATCH 3/6] t/send-email: test suppress-cc=self on cccmd

From

MTMichael S. Tsirkin <mst@redhat.com>

Date

May 26, 2013, 14:41 UTC

Message-ID

<1369579187-27573-4-git-send-email-mst@redhat.com>

In-Reply-To

<1369579187-27573-1-git-send-email-mst@redhat.com>

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