summaryrefslogtreecommitdiff
path: root/t/t9001-send-email.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-02-13 21:39:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-13 21:39:07 (GMT)
commitf5536f1ce200e7e58642846dcf3d4f4122c3a604 (patch)
tree4fba74168b4ea05e9eae310e0d308a93364c4f55 /t/t9001-send-email.sh
parent867622398f7e7a8a7c6e7a5418e7cbdcffc44d02 (diff)
parentec3b4b06f88e612f02dc7b289b7540389326b6f9 (diff)
downloadgit-f5536f1ce200e7e58642846dcf3d4f4122c3a604.zip
git-f5536f1ce200e7e58642846dcf3d4f4122c3a604.tar.gz
git-f5536f1ce200e7e58642846dcf3d4f4122c3a604.tar.bz2
Merge branch 'cl/t9001-cleanup'
Test clean-up. * cl/t9001-cleanup: t9001: use existing helper in send-email test
Diffstat (limited to 't/t9001-send-email.sh')
-rwxr-xr-xt/t9001-send-email.sh17
1 files changed, 7 insertions, 10 deletions
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index a06e5d7..19601fb 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -6,6 +6,12 @@ test_description='git send-email'
# May be altered later in the test
PREREQ="PERL"
+replace_variable_fields () {
+ sed -e "s/^\(Date:\).*/\1 DATE-STRING/" \
+ -e "s/^\(Message-Id:\).*/\1 MESSAGE-ID-STRING/" \
+ -e "s/^\(X-Mailer:\).*/\1 X-MAILER-STRING/"
+}
+
test_expect_success $PREREQ 'prepare reference tree' '
echo "1A quick brown fox jumps over the" >file &&
echo "lazy dog" >>file &&
@@ -315,10 +321,7 @@ test_expect_success $PREREQ 'Show all headers' '
--bcc=bcc@example.com \
--in-reply-to="<unique-message-id@example.com>" \
--smtp-server relay.example.com \
- $patches |
- sed -e "s/^\(Date:\).*/\1 DATE-STRING/" \
- -e "s/^\(Message-Id:\).*/\1 MESSAGE-ID-STRING/" \
- -e "s/^\(X-Mailer:\).*/\1 X-MAILER-STRING/" \
+ $patches | replace_variable_fields \
>actual-show-all-headers &&
test_cmp expected-show-all-headers actual-show-all-headers
'
@@ -573,12 +576,6 @@ Result: OK
EOF
"
-replace_variable_fields () {
- sed -e "s/^\(Date:\).*/\1 DATE-STRING/" \
- -e "s/^\(Message-Id:\).*/\1 MESSAGE-ID-STRING/" \
- -e "s/^\(X-Mailer:\).*/\1 X-MAILER-STRING/"
-}
-
test_suppression () {
git send-email \
--dry-run \