diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:13 -0700 |
| commit | b1bdf46bb886417e13c067bc1f263f2755accd29 (patch) | |
| tree | 86e9f7fdb4908d31b82fa13e573a601fa394c219 | |
| parent | 6ef449ea77e1ed83056d62dd5cd8b43caff25cb2 (diff) | |
| parent | ec3b4b06f88e612f02dc7b289b7540389326b6f9 (diff) | |
| download | git-b1bdf46bb886417e13c067bc1f263f2755accd29.tar.gz | |
Merge branch 'cl/t9001-cleanup' into maint
Test clean-up.
* cl/t9001-cleanup:
t9001: use existing helper in send-email test
| -rwxr-xr-x | t/t9001-send-email.sh | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 4d261c2a9c..81869d8913 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 && @@ -296,10 +302,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 ' @@ -554,12 +557,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 \ |