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