Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t/t9001-send-email.sh: fix '&&' chain in some tests
author
Antonio Ospite
<ospite@studenti.unina.it>
Tue, 4 Jan 2011 20:56:58 +0000
(21:56 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 4 Jan 2011 23:46:29 +0000
(15:46 -0800)
t/README recommends chaining test assertions.
Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t9001-send-email.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
db54c8e
)
diff --git
a/t/t9001-send-email.sh
b/t/t9001-send-email.sh
index 5e48318013a5bf0e4c0ab80f2e5cad6d96887e6a..2fb22d0fbc73b52764bacf8f9d3bc350abecc9ad 100755
(executable)
--- 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 &&
--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
'
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 &&
--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
'
! 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 \
--in-reply-to=" " \
--smtp-server="$(pwd)/fake.sendmail" \
$patches \
- 2>errors
+ 2>errors
&&
! grep "^In-Reply-To: < *>" msgtxt1
'
! grep "^In-Reply-To: < *>" msgtxt1
'
@@
-617,7
+617,7
@@
EOF
"
test_expect_success $PREREQ '--suppress-cc=sob' '
"
test_expect_success $PREREQ '--suppress-cc=sob' '
- git config --unset sendemail.cccmd
+ test_might_fail git config --unset sendemail.cccmd &&
test_suppression sob
'
test_suppression sob
'