{"thread":{"id":"47599","subject":"[PATCH] tests: Deduplicate code in send-email test","startedAt":"2018-01-12T10:37:49Z","lastAt":"2018-01-12T10:37:49Z","messageCount":1,"participants":["Christian Ludwig"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"336495","messageId":"20180112103724.27002-1-chrissicool@gmail.com","threadId":"47599","inReplyTo":null,"subject":"[PATCH] tests: Deduplicate code in send-email test","fromName":"Christian Ludwig","fromEmail":"chrissicool@googlemail.com","sentAt":"2018-01-12T10:37:24Z","receivedAt":"2018-01-12T10:37:49Z","isPatch":true,"sender":{"key":"chrissicool@gmail.com","avatar":"https://avatars.githubusercontent.com/u/232590?v=4"},"body":"Use the wrapper function around the sed statement like everywhere else\nin the test. Unfortunately the wrapper function is defined pretty late.\n\nMove the wrapper to the top of the test file, so future users have it\navailable right away.\n\nSigned-off-by: Christian Ludwig <chrissicool@gmail.com>\n---\n t/t9001-send-email.sh | 17 +++++++----------\n 1 file changed, 7 insertions(+), 10 deletions(-)\n\ndiff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh\nindex 4d261c2a9..81869d891 100755\n--- a/t/t9001-send-email.sh\n+++ b/t/t9001-send-email.sh\n@@ -6,6 +6,12 @@ test_description='git send-email'\n # May be altered later in the test\n PREREQ=\"PERL\"\n \n+replace_variable_fields () {\n+\tsed\t-e \"s/^\\(Date:\\).*/\\1 DATE-STRING/\" \\\n+\t\t-e \"s/^\\(Message-Id:\\).*/\\1 MESSAGE-ID-STRING/\" \\\n+\t\t-e \"s/^\\(X-Mailer:\\).*/\\1 X-MAILER-STRING/\"\n+}\n+\n test_expect_success $PREREQ 'prepare reference tree' '\n \techo \"1A quick brown fox jumps over the\" >file &&\n \techo \"lazy dog\" >>file &&\n@@ -296,10 +302,7 @@ test_expect_success $PREREQ 'Show all headers' '\n \t\t--bcc=bcc@example.com \\\n \t\t--in-reply-to=\"<unique-message-id@example.com>\" \\\n \t\t--smtp-server relay.example.com \\\n-\t\t$patches |\n-\tsed\t-e \"s/^\\(Date:\\).*/\\1 DATE-STRING/\" \\\n-\t\t-e \"s/^\\(Message-Id:\\).*/\\1 MESSAGE-ID-STRING/\" \\\n-\t\t-e \"s/^\\(X-Mailer:\\).*/\\1 X-MAILER-STRING/\" \\\n+\t\t$patches | replace_variable_fields \\\n \t\t>actual-show-all-headers &&\n \ttest_cmp expected-show-all-headers actual-show-all-headers\n '\n@@ -554,12 +557,6 @@ Result: OK\n EOF\n \"\n \n-replace_variable_fields () {\n-\tsed\t-e \"s/^\\(Date:\\).*/\\1 DATE-STRING/\" \\\n-\t\t-e \"s/^\\(Message-Id:\\).*/\\1 MESSAGE-ID-STRING/\" \\\n-\t\t-e \"s/^\\(X-Mailer:\\).*/\\1 X-MAILER-STRING/\"\n-}\n-\n test_suppression () {\n \tgit send-email \\\n \t\t--dry-run \\\n-- \n2.15.1\n\n"}]}