t/t9001-send-email.sh: fix '&&' chain in some tests

Antonio Ospite · gitster · commit cc7e81674b9f · 2011-01-04T15:46:29.000-08:00
t/README recommends chaining test assertions.

Signed-off-by: Antonio Ospite &lt;ospite@studenti.unina.it&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
@@ -265,7 +265,7 @@ test_expect_success $PREREQ 'Author From: in message body' '
 		--to=nobody@example.com \
 		--smtp-server="$(pwd)/fake.sendmail" \
 		$patches &&
-	sed "1,/^\$/d" < msgtxt1 > msgbody1
+	sed "1,/^\$/d" < msgtxt1 > msgbody1 &&
 	grep "From: A <author@example.com>" msgbody1
 '
 
@@ -276,7 +276,7 @@ test_expect_success $PREREQ 'Author From: not in message body' '
 		--to=nobody@example.com \
 		--smtp-server="$(pwd)/fake.sendmail" \
 		$patches &&
-	sed "1,/^\$/d" < msgtxt1 > msgbody1
+	sed "1,/^\$/d" < msgtxt1 > msgbody1 &&
 	! grep "From: A <author@example.com>" msgbody1
 '
 
@@ -298,7 +298,7 @@ test_expect_success $PREREQ 'Invalid In-Reply-To' '
 		--in-reply-to=" " \
 		--smtp-server="$(pwd)/fake.sendmail" \
 		$patches \
-		2>errors
+		2>errors &&
 	! grep "^In-Reply-To: < *>" msgtxt1
 '
 
@@ -617,7 +617,7 @@ EOF
 "
 
 test_expect_success $PREREQ '--suppress-cc=sob' '
-	git config --unset sendemail.cccmd
+	test_might_fail git config --unset sendemail.cccmd &&
 	test_suppression sob
 '
 

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ test_expect_success $PREREQ 'Author From: in message body' '`
`265`	`265`	`[email protected] \`
`266`	`266`	`--smtp-server="$(pwd)/fake.sendmail" \`
`267`	`267`	`$patches &&`
`268`		`- sed "1,/^\$/d" < msgtxt1 > msgbody1`
	`268`	`+ sed "1,/^\$/d" < msgtxt1 > msgbody1 &&`
`269`	`269`	`grep "From: A <[email protected]>" msgbody1`
`270`	`270`	`'`
`271`	`271`
`@@ -276,7 +276,7 @@ test_expect_success $PREREQ 'Author From: not in message body' '`
`276`	`276`	`[email protected] \`
`277`	`277`	`--smtp-server="$(pwd)/fake.sendmail" \`
`278`	`278`	`$patches &&`
`279`		`- sed "1,/^\$/d" < msgtxt1 > msgbody1`
	`279`	`+ sed "1,/^\$/d" < msgtxt1 > msgbody1 &&`
`280`	`280`	`! grep "From: A <[email protected]>" msgbody1`
`281`	`281`	`'`
`282`	`282`
`@@ -298,7 +298,7 @@ test_expect_success $PREREQ 'Invalid In-Reply-To' '`
`298`	`298`	`--in-reply-to=" " \`
`299`	`299`	`--smtp-server="$(pwd)/fake.sendmail" \`
`300`	`300`	`$patches \`
`301`		`- 2>errors`
	`301`	`+ 2>errors &&`
`302`	`302`	`! grep "^In-Reply-To: < *>" msgtxt1`
`303`	`303`	`'`
`304`	`304`
`@@ -617,7 +617,7 @@ EOF`
`617`	`617`	`"`
`618`	`618`
`619`	`619`	`test_expect_success $PREREQ '--suppress-cc=sob' '`
`620`		`- git config --unset sendemail.cccmd`
	`620`	`+ test_might_fail git config --unset sendemail.cccmd &&`
`621`	`621`	`test_suppression sob`
`622`	`622`	`'`
`623`	`623`