[PATCH] test: set mail host in emacs_deliver

diff --git a/88/9d0c77f47728e328734828816d3a0a7ad94c95 b/88/9d0c77f47728e328734828816d3a0a7ad94c95
new file mode 100644 (file)
index 0000000..eca745c
--- /dev/null
+++ b/88/9d0c77f47728e328734828816d3a0a7ad94c95
@@ -0,0 +1,105 @@
+Return-Path: <markwalters1009@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id D83EF431FB6\r
+       for <notmuch@notmuchmail.org>; Sat, 12 Oct 2013 00:36:45 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 9Cvm1E8svkrB for <notmuch@notmuchmail.org>;\r
+       Sat, 12 Oct 2013 00:36:40 -0700 (PDT)\r
+Received: from mail-wg0-f44.google.com (mail-wg0-f44.google.com\r
+ [74.125.82.44])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ A2CF4431FAE   for <notmuch@notmuchmail.org>; Sat, 12 Oct 2013 00:36:40 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f44.google.com with SMTP id n12so4277879wgh.35\r
+       for <notmuch@notmuchmail.org>; Sat, 12 Oct 2013 00:36:38 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id;\r
+       bh=h6CFFOXwggYsr5rwZogvuEKSyPvQuhCwAtQio60Fcbw=;\r
+       b=NrQLVfJpnbNCx/SIqg3xVGkag+s75N+2ZyD7sSlnfvMUzk3kNccKFnQLa90hHgsQmq\r
+       lpOKVz1++7/cwRR841vrCH8ablw01BZ/x9bU57Q81K+xL7tQqxUcwNnyzD03pO1PLQkb\r
+       cBSLJrvQJm1x+J9k4gXIhTxRidiKbgG29LKVuNpKWF82kjSUIkSAvTpdYa+7S/4+6KTN\r
+       aSaXSt7Fj3kSoSCLu8eBr7VcqihxqeyNDq9pzQ2levJU3/YK/AFcx303L0HEjOIMbaqa\r
+       JLV1qsjCgpp0HoH6dqacqv/r7AxUNx5zshXJWE43/347T5U7CC6EkR6T23lE8H92R5qt\r
+       r4RQ==\r
+X-Received: by 10.194.123.8 with SMTP id lw8mr872432wjb.40.1381563396787;\r
+       Sat, 12 Oct 2013 00:36:36 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPSA id jf2sm12728394wic.2.1969.12.31.16.00.00\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 12 Oct 2013 00:36:36 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] test: set mail host in emacs_deliver\r
+Date: Sat, 12 Oct 2013 08:36:30 +0100\r
+Message-Id: <1381563390-19457-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 12 Oct 2013 07:36:46 -0000\r
+\r
+One test (reply to encrypted message in the crypto test) recently\r
+started failing on some systems. The failure I saw were two extra\r
+lines of the form\r
+<87d2nbc5xg.fsf@host.i-did-not-set--mail-host-address--so-tickle-me>\r
+\r
+The test pipes the output through\r
+\r
+grep -v -e '^In-Reply-To:' -e '^References:'\r
+\r
+which would normally these two ids but it does not, in this case,\r
+because they are so long they get put on a separate line in the output.\r
+\r
+To fix this we set mail-host-address for emacs deliver. example.com\r
+seems a sensible address to use. This is short enough that we don't\r
+get the line breaks above and the tests then all pass.\r
+---\r
+\r
+I don't know when this test started failing: I tried to bisect and it\r
+went back quite a long way on machines which I thought had been\r
+passing the tests. (It does look like things outside notmuch might\r
+make some differences though so maybe this is not surprising)\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+ test/test-lib.sh |    1 +\r
+ 1 files changed, 1 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index d3a8c58..2aa4dfc 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -445,6 +445,7 @@ emacs_deliver_message ()\r
+ \r
+     test_emacs \\r
+       "(let ((message-send-mail-function 'message-smtpmail-send-it)\r
++               (mail-host-address \"example.com\")\r
+              (smtpmail-smtp-server \"localhost\")\r
+              (smtpmail-smtp-service \"25025\"))\r
+          (notmuch-hello)\r
+-- \r
+1.7.9.1\r
+\r