summaryrefslogtreecommitdiff
path: root/t/t9001-send-email.sh
diff options
context:
space:
mode:
authorChristian Ludwig <chrissicool@googlemail.com>2018-01-12 10:37:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-01-12 18:39:20 (GMT)
commitec3b4b06f88e612f02dc7b289b7540389326b6f9 (patch)
tree70ed9a67163e326ee41e17a3495151b95848c5a3 /t/t9001-send-email.sh
parent27dea4683b608c5c0487dee74cbda13b62803b73 (diff)
downloadgit-ec3b4b06f88e612f02dc7b289b7540389326b6f9.zip
git-ec3b4b06f88e612f02dc7b289b7540389326b6f9.tar.gz
git-ec3b4b06f88e612f02dc7b289b7540389326b6f9.tar.bz2
t9001: use existing helper in send-email test
Use the wrapper function around the sed statement like everywhere else in the test. Unfortunately the wrapper function is defined pretty late. Move the wrapper to the top of the test file, so future users have it available right away. Signed-off-by: Christian Ludwig <chrissicool@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 3dc4a34..f756980 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 &&
@@ -293,10 +299,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
'
@@ -551,12 +554,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 \