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

diff --git a/5e/0c618b4b7cbac1a974a4932dc9bfe297967b41 b/5e/0c618b4b7cbac1a974a4932dc9bfe297967b41
new file mode 100644 (file)
index 0000000..b1de301
--- /dev/null
+++ b/5e/0c618b4b7cbac1a974a4932dc9bfe297967b41
@@ -0,0 +1,163 @@
+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 arlo.cworth.org (Postfix) with ESMTP id A29636DE1B5B\r
+ for <notmuch@notmuchmail.org>; Tue,  9 Feb 2016 12:34:38 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.095\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.095 tagged_above=-999 required=5\r
+ tests=[AWL=-0.028, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,\r
+ RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01,\r
+ RCVD_IN_MSPIKE_WL=-0.01, SPF_NEUTRAL=0.652, UNPARSEABLE_RELAY=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 e5-X8JSSN370 for <notmuch@notmuchmail.org>;\r
+ Tue,  9 Feb 2016 12:34:36 -0800 (PST)\r
+Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com\r
+ [74.125.82.67]) by arlo.cworth.org (Postfix) with ESMTPS id F0DED6DE1778 for\r
+ <notmuch@notmuchmail.org>; Tue,  9 Feb 2016 12:34:35 -0800 (PST)\r
+Received: by mail-wm0-f67.google.com with SMTP id c200so16093wme.0\r
+ for <notmuch@notmuchmail.org>; Tue, 09 Feb 2016 12:34:35 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=dme-org.20150623.gappssmtp.com; s=20150623;\r
+ h=to:subject:in-reply-to:references:from:date:message-id:mime-version\r
+ :content-type; bh=MIC+FKc3gmAiaDnTTzmw2UZcGbtB+AIDuappfz/Ptsc=;\r
+ b=aRBoQE173RSTSkkLEv5LtSW6+kPsQCuq3SGUcs4G4H7Y69YxXwu51oXA+iRskkD2VR\r
+ 4i0LEBdwppjddx9D9jd0nN8+ZlRl+rQYLfTzZqzT/6UqFo3F3NH4T5z7GqS4wltXpDlY\r
+ 8wDEa/7b6R4OO0QWvQ8ogso3/hRnWwdBJqDYTaThjGrpOzJ8ACRN3RhUCM45r7g26PK2\r
+ JoVs2NKY0DnpOGx8LMUKyjbF9amR+rl1V/VmRc76uQB/YSGhNsiFDKI9vKyLupABu90v\r
+ YllxX6CnHNVsMwEIccyNwWCc3ds1QhQ5oyNDjluC2h6Xx7pnlJRbj9wnfzh6DcwSLPk0\r
+ RftA==\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:to:subject:in-reply-to:references:from:date\r
+ :message-id:mime-version:content-type;\r
+ bh=MIC+FKc3gmAiaDnTTzmw2UZcGbtB+AIDuappfz/Ptsc=;\r
+ b=e7ku3d9rCIO67/NX4UYrBExP4blkK6oQpnXYBYEJU0mKIiBqcxT71+PM6EsK5s3x8w\r
+ ZGU1TErA0X8u0lOU6bCrOfi4/RIu6pYCgtuCaP5aEmvJxRof63QFcEsUd366WhNQveuG\r
+ WuH/kQwAJEY+4y01D2PqRWS/5fnTfMuSflGj+hgEKJKYCu01h8dws1F8n5ccx5qvr2cM\r
+ Q7N3lm/sUamWafFa46vxX2IlYOtvR1nAec5FA2nbSmgMdrv1x2Gdx5IA4o8XYqTZYMRp\r
+ mOxT2yQzmCLsvlFlGQucRZ70kCNQ0D6qiLGLrInD62WCslHCyu1+9bk7dzwXfJyV9lhG\r
+ l42g==\r
+X-Gm-Message-State:\r
+ AG10YOT0OS9Q6sEQB/hn1hxq4WpZ41LLhDhIBmigNYGUgigFtGIvPXqFLbFpEHNmoS7dag==\r
+X-Received: by 10.194.23.232 with SMTP id p8mr41650543wjf.80.1455050074646;\r
+ Tue, 09 Feb 2016 12:34:34 -0800 (PST)\r
+Received: from disaster-area.hh.sledj.net\r
+ ([2a01:348:1a2:1:ea39:35ff:fe2c:a227])\r
+ by smtp.gmail.com with ESMTPSA id ka4sm36360361wjc.47.2016.02.09.12.34.33\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Tue, 09 Feb 2016 12:34:33 -0800 (PST)\r
+Received: from localhost (disaster-area.hh.sledj.net [local])\r
+ by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 740f338b;\r
+ Tue, 9 Feb 2016 20:34:32 +0000 (UTC)\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v4 7/7] test: fix the tests for the new reply code\r
+In-Reply-To: <1446894276-7814-8-git-send-email-markwalters1009@gmail.com>\r
+References: <1446894276-7814-1-git-send-email-markwalters1009@gmail.com>\r
+ <1446894276-7814-8-git-send-email-markwalters1009@gmail.com>\r
+From: David Edmondson <dme@dme.org>\r
+Date: Tue, 09 Feb 2016 20:34:32 +0000\r
+Message-ID: <m2wpqd39nr.fsf@dme.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Tue, 09 Feb 2016 20:34:38 -0000\r
+\r
+On Sat, Nov 07 2015, Mark Walters wrote:\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
+Looks fine.\r
+\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> https://notmuchmail.org/mailman/listinfo/notmuch\r