[PATCH v4 7/7] test: fix the tests for the new reply code

diff --git a/e3/6dee9886a4ef24cd8efc2c5d9373da51291503 b/e3/6dee9886a4ef24cd8efc2c5d9373da51291503
new file mode 100644 (file)
index 0000000..457c404
--- /dev/null
+++ b/e3/6dee9886a4ef24cd8efc2c5d9373da51291503
@@ -0,0 +1,135 @@
+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 E09CD6DE1B80\r
+ for <notmuch@notmuchmail.org>; Sat,  7 Nov 2015 03:05:08 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.203\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.203 tagged_above=-999 required=5 tests=[AWL=0.073, \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,\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 AliDpH9aCRzH for <notmuch@notmuchmail.org>;\r
+ Sat,  7 Nov 2015 03:05:06 -0800 (PST)\r
+Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com\r
+ [74.125.82.52]) by arlo.cworth.org (Postfix) with ESMTPS id 4124C6DE1638 for\r
+ <notmuch@notmuchmail.org>; Sat,  7 Nov 2015 03:04:57 -0800 (PST)\r
+Received: by wmec201 with SMTP id c201so37048241wme.0\r
+ for <notmuch@notmuchmail.org>; Sat, 07 Nov 2015 03:04:55 -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=G9JYWo5r7rCTdCKsEIOIOmy0A2CoNcDIhPyZgZhDoVs=;\r
+ b=L32oO9Cw3z6IGdLoJD4xW+xd24tRQ8ln/pdBDnejSSA83hwSpSoNsfP/iKzq+dFkhb\r
+ jGadxqIsrK4qTWlz2yzz7AISm7k2Pam/jehUwI3BlQfXXpWVd7tNLIUlgN/ShK9Ignoq\r
+ PCy4x3Pg0RroAYUR0yQvlzEZni/IyCby93vC/PKxGh4YDM7mFbGzbE84zvA3ZwHSZMIx\r
+ 57CwQNeWB5k7YUmtQh2UzCPFMySttWzPMG8UDkrpz8YmMDQYtvwdklQZ1GgAQDb7F29m\r
+ ow8AlDrkhpvfD8l9AW7JSNryb8BDzgGf1kU5cDvK2NGM0yXFeXbVS+EPKqyueDqyZ1lp\r
+ VqzA==\r
+X-Received: by 10.28.19.198 with SMTP id 189mr15525345wmt.103.1446894295641;\r
+ Sat, 07 Nov 2015 03:04:55 -0800 (PST)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by smtp.gmail.com with ESMTPSA id os9sm4560963wjc.26.2015.11.07.03.04.54\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sat, 07 Nov 2015 03:04:54 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 7/7] test: fix the tests for the new reply code\r
+Date: Sat,  7 Nov 2015 11:04:36 +0000\r
+Message-Id: <1446894276-7814-8-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1446894276-7814-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1446894276-7814-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: Sat, 07 Nov 2015 11:05:09 -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 04c8d63..6e1689a 100644\r
+--- a/test/test-lib.el\r
++++ b/test/test-lib.el\r
+@@ -184,6 +184,10 @@ (defmacro notmuch-test-progn (&rest body)\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