From: Carl Worth <cworth@cworth.org>
Date: Sat, 11 Jun 2011 00:18:27 +0000 (-0700)
Subject: test: Fix from-guessing to actually span Received headers over multiple lines
X-Git-Tag: debian/0.6_254~40
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=b7db7ea42056b96578b329db5a184c9c408062c2;ds=sidebyside

test: Fix from-guessing to actually span Received headers over multiple lines

The intent was always to make these Received headers span multiple
lines. But the escapes were causing the shell to ignore the newlines,
so that the result instead was long Received headers on a single line
each.

Fixing the intent here doesn't actually change the test-suite results
at all.
---

diff --git a/test/from-guessing b/test/from-guessing
index e0f25b5c..8b69cf6c 100755
--- a/test/from-guessing
+++ b/test/from-guessing
@@ -59,8 +59,8 @@ test_begin_subtest "Magic from guessing (Received: .. for ..)"
 add_message '[from]="Sender <sender@example.com>"' \
              [to]=mailinglist@notmuchmail.org \
              [subject]=notmuch-reply-test \
-            "[header]=\"Received: from mail.example.com (mail.example.com [1.1.1.1])\
-        by mail.notmuchmail.org (some MTA) with ESMTP id 12345678\
+            "[header]=\"Received: from mail.example.com (mail.example.com [1.1.1.1])
+        by mail.notmuchmail.org (some MTA) with ESMTP id 12345678
         for <test_suite_other@notmuchmail.org>; Sat, 10 Apr 2010 07:54:51 -0400 (EDT)\"" \
             '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
             '[body]="from guessing test"'
@@ -79,8 +79,8 @@ test_begin_subtest "Magic from guessing (Received: domain)"
 add_message '[from]="Sender <sender@example.com>"' \
              [to]=mailinglist@notmuchmail.org \
              [subject]=notmuch-reply-test \
-            "[header]=\"Received: from mail.example.com (mail.example.com [1.1.1.1])\
-        by mail.otherdomain.org (some MTA) with ESMTP id 12345678\
+            "[header]=\"Received: from mail.example.com (mail.example.com [1.1.1.1])
+        by mail.otherdomain.org (some MTA) with ESMTP id 12345678
         Sat, 10 Apr 2010 07:54:51 -0400 (EDT)\"" \
             '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
             '[body]="from guessing test"'
@@ -178,8 +178,8 @@ test_begin_subtest "Magic from guessing (Received: .. for ..)"
 add_message '[from]="Sender <sender@example.com>"' \
              [to]=mailinglist@notmuchmail.org \
              [subject]=notmuch-reply-test \
-            "[header]=\"Received: from mail.example.com (mail.example.com [1.1.1.1])\
-        by mail.notmuchmail.org (some MTA) with ESMTP id 12345678\
+            "[header]=\"Received: from mail.example.com (mail.example.com [1.1.1.1])
+        by mail.notmuchmail.org (some MTA) with ESMTP id 12345678
         for <test_suite_other@notmuchmail.org>; Sat, 10 Apr 2010 07:54:51 -0400 (EDT)\"" \
             '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
             '[body]="from guessing test"'
@@ -198,8 +198,8 @@ test_begin_subtest "Magic from guessing (Received: domain)"
 add_message '[from]="Sender <sender@example.com>"' \
              [to]=mailinglist@notmuchmail.org \
              [subject]=notmuch-reply-test \
-            "[header]=\"Received: from mail.example.com (mail.example.com [1.1.1.1])\
-        by mail.otherdomain.org (some MTA) with ESMTP id 12345678\
+            "[header]=\"Received: from mail.example.com (mail.example.com [1.1.1.1])
+        by mail.otherdomain.org (some MTA) with ESMTP id 12345678
         Sat, 10 Apr 2010 07:54:51 -0400 (EDT)\"" \
             '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
             '[body]="from guessing test"'