--- /dev/null
+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 arlo.cworth.org (Postfix) with ESMTP id 2176E6DE1ABD\r
+ for <notmuch@notmuchmail.org>; Sun, 14 Feb 2016 10:40:39 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.252\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.252 tagged_above=-999 required=5 tests=[AWL=0.318,\r
+ DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7,\r
+ RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id F5Ro50kCSfYh for <notmuch@notmuchmail.org>;\r
+ Sun, 14 Feb 2016 10:40:36 -0800 (PST)\r
+Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com\r
+ [74.125.82.66]) by arlo.cworth.org (Postfix) with ESMTPS id D74596DE1A2F for\r
+ <notmuch@notmuchmail.org>; Sun, 14 Feb 2016 10:40:25 -0800 (PST)\r
+Received: by mail-wm0-f66.google.com with SMTP id c200so12198702wme.0\r
+ for <notmuch@notmuchmail.org>; Sun, 14 Feb 2016 10:40:25 -0800 (PST)\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:in-reply-to:references;\r
+ bh=t6Z+I/U2kV6EPFXiti1hnP6pfo6O2iMbWv/rZONfxE0=;\r
+ b=IZ7233ITgZ1Mr0WNkNcRczRBZUB6yeNVsRes99PvddR3aHIQtH7YC+e9pKQeYAg/Ii\r
+ vAna35V2TsoSS7byf80k5pZW6dHrf3mqQ+FfEjlbBpZlgaROlDcgbOzLkHoYGiWulIof\r
+ WpWtUmAJR+xPvTe/lFz5MJrJLzFgdxwYcjjSDt7iDXfsZKk9YfoEOPgKn4Tl/pcR+O3p\r
+ 1g6g9iA9geLrIAsUHuqnaGtI0KInnAZBGeIRUV4hQNbjWq8WdAZOTaZg6QWq8gMjbs1K\r
+ 9JAl0MdlKFGMu+bSaE2GpWUoEMnX3HiFbLCyDy7F8s1eu80guE24/xqELgeLGP1rDmNC\r
+ /K9Q==\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:cc:subject:date:message-id:in-reply-to\r
+ :references;\r
+ bh=t6Z+I/U2kV6EPFXiti1hnP6pfo6O2iMbWv/rZONfxE0=;\r
+ b=Isx0OJ61nj/BgPSBsrYXxIuWhNstbk3FaaX8uj9MxqkIqk5Sr7mznFD83r4yvdYnno\r
+ tdRX3mu0NG09LJVjpMrVb7SITG3dFNZ/fIcEi93QpnO5Q1/I2BdUZPpyicPeDHFQiF6z\r
+ Mpy86tkXkMcjBLK1KUIwCZ9ia6J1m4rzZ0zKhw7Sf1b1Rg2syaas7QVbnry9IZSfqJXB\r
+ WXL5SPX8ETtkjR9pKbTV38QTbFN3XPzidjNegIvz/iaT0fWuNMfSfrczdm8IcPpyjD8Z\r
+ EbotipYjUoUvhSgocyqh8fLNKMGhxiqS5H7ne76RKtYx2AQphWj6Hk82sE+Ev5EsxZii\r
+ gupw==\r
+X-Gm-Message-State:\r
+ AG10YOQGqAdHtw0xa6NUy6+Rbki0GQpywY2xyrVvsV7mz7jBZEtrYNV2oZHC+y1LG4gQNw==\r
+X-Received: by 10.28.136.139 with SMTP id k133mr8781952wmd.103.1455475224572; \r
+ Sun, 14 Feb 2016 10:40:24 -0800 (PST)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by smtp.gmail.com with ESMTPSA id ka4sm21737310wjc.47.2016.02.14.10.40.23\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sun, 14 Feb 2016 10:40:24 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v5 7/7] test: fix the tests for the new reply code\r
+Date: Sun, 14 Feb 2016 18:39:59 +0000\r
+Message-Id: <1455475199-32622-8-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1455475199-32622-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1455475199-32622-1-git-send-email-markwalters1009@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 14 Feb 2016 18:40:39 -0000\r
+\r
+This sets the part-insertion code to never insert part headers (as we\r
+didn't before).\r
+\r
+With that change there is only one failing test: this test has a text\r
+part (an email message) listed as application/octet-stream. Notmuch\r
+show displays this part, but the reply code omitted it as it had type\r
+application/octet-stream. The new code correctly includes it. Thus\r
+update the expected output to match.\r
+---\r
+ test/T310-emacs.sh | 32 ++++++++++++++++++++++++++++++++\r
+ test/test-lib.el | 4 ++++\r
+ 2 files changed, 36 insertions(+)\r
+\r
+diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh\r
+index 61bc369..22ca71c 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
+diff --git a/test/test-lib.el b/test/test-lib.el\r
+index 596a705..02e020c 100644\r
+--- a/test/test-lib.el\r
++++ b/test/test-lib.el\r
+@@ -184,6 +184,10 @@ nothing."\r
+ (setq notmuch-tag-deleted-formats\r
+ '((".*" nil)))\r
+ \r
++;; For historical reasonse we don't print part headers when replying\r
++;; in the tests suite\r
++(setq notmuch-mua-reply-insert-header-p-function 'notmuch-show-reply-insert-header-p-never)\r
++\r
+ ;; force a common html renderer, to avoid test variations between\r
+ ;; environments\r
+ \r
+-- \r
+2.1.4\r
+\r