[PATCH v3 7/9] test: Update the test output to accord with the reply changes

diff --git a/aa/e4861a32c3f8fcf7b750181dba1a4fd11288f5 b/aa/e4861a32c3f8fcf7b750181dba1a4fd11288f5
new file mode 100644 (file)
index 0000000..e11613e
--- /dev/null
+++ b/aa/e4861a32c3f8fcf7b750181dba1a4fd11288f5
@@ -0,0 +1,124 @@
+Return-Path: <dme@dme.org>\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 25603429E47\r
+       for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:30:01 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[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 FQ6WAbDDOCPa for <notmuch@notmuchmail.org>;\r
+       Mon, 12 May 2014 05:29:53 -0700 (PDT)\r
+Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com\r
+ [74.125.82.42])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ E35A0431FDD   for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:29:35 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f42.google.com with SMTP id y10so6634517wgg.1\r
+       for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:29:34 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\r
+       :references;\r
+       bh=eovorpLemshKjdVmS8WUHw9flNb3ENbFR0Vba0wbvhg=;\r
+       b=Nj5srhsAIbHdXoYJcoVv9dvvUt2jF85+E9+rI/zLi0x/A2YliR2cSoTk1JpI89C2SZ\r
+       RjCP+GERyhhOc3AN3GagfXSqmQo4wTuItRJquMyIpLrA0uvM6jxkGlMTg3vYEBVS7YOa\r
+       MaG0h/dEKGiTfAeMGDZjatjb10Q8Fk2d+D006xs0kC9tlddTY0CI7j8X2hB1lavn2BLp\r
+       XSxbh35fmIjYaq8kJVX2xxXHqVbDzvMuNVNs2jc+CprSYVgEo0Icy5rL5esHggOT0HNG\r
+       rFczKgvc0yyGJWZh9j2OQROH7XJVgyJXKR273PJ9LRa1rB9AOTKyADEcLASgJLON+6+1\r
+       HE8w==\r
+X-Gm-Message-State:\r
+ ALoCoQmiC4kBpAKKdToV/CyEJHusiP+FdUxSp89qXz6n96flmQnk/wEriNd2whmAK8l+Evf7sKZE\r
+X-Received: by 10.180.91.1 with SMTP id ca1mr15642443wib.32.1399897774729;\r
+       Mon, 12 May 2014 05:29:34 -0700 (PDT)\r
+Received: from hotblack-desiato.hh.sledj.net\r
+       ([2a01:348:1a2:1:a288:b4ff:fe8a:77d8])\r
+       by mx.google.com with ESMTPSA id\r
+       nb8sm15859883wic.18.2014.05.12.05.29.32 for <notmuch@notmuchmail.org>\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Mon, 12 May 2014 05:29:32 -0700 (PDT)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id 4805110B32E; Mon, 12 May 2014 13:29:29 +0100 (BST)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 7/9] test: Update the test output to accord with the reply\r
+       changes\r
+Date: Mon, 12 May 2014 13:29:27 +0100\r
+Message-Id: <1399897769-26809-8-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 2.0.0.rc0\r
+In-Reply-To: <1399897769-26809-1-git-send-email-dme@dme.org>\r
+References: <87sixdujkv.fsf@qmul.ac.uk>\r
+       <1399897769-26809-1-git-send-email-dme@dme.org>\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: Mon, 12 May 2014 12:30:01 -0000\r
+\r
+Replying to a message with multiple parts will now typically include\r
+content from several parts (whereas previously only the first part was\r
+used). Update the expected output from the emacs reply tests\r
+accordingly.\r
+---\r
+ test/T310-emacs.sh | 32 ++++++++++++++++++++++++++++++++\r
+ 1 file changed, 32 insertions(+)\r
+\r
+diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh\r
+index ac966e5..95bb67e 100755\r
+--- a/test/T310-emacs.sh\r
++++ b/test/T310-emacs.sh\r
+@@ -473,6 +473,38 @@ Alex Botero-Lowry <alex.boterolowry@gmail.com> writes:\r
+ > and http://mail-index.netbsd.org/pkgsrc-bugs/2006/06/07/msg016808.htmlspecifically\r
+ > uses 64 as the\r
+ > buffer size.\r
++> From e3bc4bbd7b9d0d086816ab5f8f2d6ffea1dd3ea4 Mon Sep 17 00:00:00 2001\r
++> From: Alexander Botero-Lowry <alex.boterolowry@gmail.com>\r
++> Date: Tue, 17 Nov 2009 11:30:39 -0800\r
++> Subject: [PATCH] Deal with situation where sysconf(_SC_GETPW_R_SIZE_MAX) returns -1\r
++>\r
++> ---\r
++>  notmuch-config.c |    2 ++\r
++>  1 files changed, 2 insertions(+), 0 deletions(-)\r
++>\r
++> diff --git a/notmuch-config.c b/notmuch-config.c\r
++> index 248149c..e7220d8 100644\r
++> --- a/notmuch-config.c\r
++> +++ b/notmuch-config.c\r
++> @@ -77,6 +77,7 @@ static char *\r
++>  get_name_from_passwd_file (void *ctx)\r
++>  {\r
++>      long pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX);\r
++> +    if (pw_buf_size == -1) pw_buf_size = 64;\r
++>      char *pw_buf = talloc_zero_size (ctx, pw_buf_size);\r
++>      struct passwd passwd, *ignored;\r
++>      char *name;\r
++> @@ -101,6 +102,7 @@ static char *\r
++>  get_username_from_passwd_file (void *ctx)\r
++>  {\r
++>      long pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX);\r
++> +    if (pw_buf_size == -1) pw_buf_size = 64;\r
++>      char *pw_buf = talloc_zero_size (ctx, pw_buf_size);\r
++>      struct passwd passwd, *ignored;\r
++>      char *name;\r
++> -- \r
++> 1.6.5.2\r
++>\r
+ > _______________________________________________\r
+ > notmuch mailing list\r
+ > notmuch@notmuchmail.org\r
+-- \r
+2.0.0.rc0\r
+\r