t9001-send-email: refactor header variable fields replacement
Create a function which replaces Date, Message-Id and X-Mailer lines generated by git-send-email by a specific string: Date:.*$ -> Date: DATE-STRING Message-Id:.*$ -> Message-Id: MESSAGE-ID-STRING X-Mailer:.*$ -> X-Mailer: X-MAILER-STRING Signed-off-by: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Remi Lespinet committed
Jun 30, 2015 at 14:16 UTC
d4cf11c2e948890c2daf27fba6727e3b814cfe3c
1 file changed
+7
-4
t/t9001-send-email.sh
+7
-4
@@ -522,6 +522,12 @@ Result: OK
522
EOF
523
"
524
525
+replace_variable_fields () {
526
+ sed -e "s/^\(Date:\).*/\1 DATE-STRING/" \
527
+ -e "s/^\(Message-Id:\).*/\1 MESSAGE-ID-STRING/" \
528
+ -e "s/^\(X-Mailer:\).*/\1 X-MAILER-STRING/"
529
+}
530
+
531
test_suppression () {
532
git send-email \
533
--dry-run \
@@ -529,10 +535,7 @@ test_suppression () {
535
--from="Example <from@example.com>" \
536
--to=to@example.com \
537
--smtp-server relay.example.com \
532
- $patches |
533
- sed -e "s/^\(Date:\).*/\1 DATE-STRING/" \
534
- -e "s/^\(Message-Id:\).*/\1 MESSAGE-ID-STRING/" \
535
- -e "s/^\(X-Mailer:\).*/\1 X-MAILER-STRING/" \
538
+ $patches | replace_variable_fields \
539
>actual-suppress-$1${2+"-$2"} &&
540
test_cmp expected-suppress-$1${2+"-$2"} actual-suppress-$1${2+"-$2"}
541
}