From 7b879c916d418898ae5f0792fefd1d01e96d15d7 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 7 Nov 2015 11:04:36 +0000 Subject: [PATCH] [PATCH v4 7/7] test: fix the tests for the new reply code --- e3/6dee9886a4ef24cd8efc2c5d9373da51291503 | 135 ++++++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 e3/6dee9886a4ef24cd8efc2c5d9373da51291503 diff --git a/e3/6dee9886a4ef24cd8efc2c5d9373da51291503 b/e3/6dee9886a4ef24cd8efc2c5d9373da51291503 new file mode 100644 index 000000000..457c404db --- /dev/null +++ b/e3/6dee9886a4ef24cd8efc2c5d9373da51291503 @@ -0,0 +1,135 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id E09CD6DE1B80 + for ; Sat, 7 Nov 2015 03:05:08 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0.203 +X-Spam-Level: +X-Spam-Status: No, score=0.203 tagged_above=-999 required=5 tests=[AWL=0.073, + DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, + RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001] + autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id AliDpH9aCRzH for ; + Sat, 7 Nov 2015 03:05:06 -0800 (PST) +Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com + [74.125.82.52]) by arlo.cworth.org (Postfix) with ESMTPS id 4124C6DE1638 for + ; Sat, 7 Nov 2015 03:04:57 -0800 (PST) +Received: by wmec201 with SMTP id c201so37048241wme.0 + for ; Sat, 07 Nov 2015 03:04:55 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:in-reply-to:references; + bh=G9JYWo5r7rCTdCKsEIOIOmy0A2CoNcDIhPyZgZhDoVs=; + b=L32oO9Cw3z6IGdLoJD4xW+xd24tRQ8ln/pdBDnejSSA83hwSpSoNsfP/iKzq+dFkhb + jGadxqIsrK4qTWlz2yzz7AISm7k2Pam/jehUwI3BlQfXXpWVd7tNLIUlgN/ShK9Ignoq + PCy4x3Pg0RroAYUR0yQvlzEZni/IyCby93vC/PKxGh4YDM7mFbGzbE84zvA3ZwHSZMIx + 57CwQNeWB5k7YUmtQh2UzCPFMySttWzPMG8UDkrpz8YmMDQYtvwdklQZ1GgAQDb7F29m + ow8AlDrkhpvfD8l9AW7JSNryb8BDzgGf1kU5cDvK2NGM0yXFeXbVS+EPKqyueDqyZ1lp + VqzA== +X-Received: by 10.28.19.198 with SMTP id 189mr15525345wmt.103.1446894295641; + Sat, 07 Nov 2015 03:04:55 -0800 (PST) +Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162]) + by smtp.gmail.com with ESMTPSA id os9sm4560963wjc.26.2015.11.07.03.04.54 + (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Sat, 07 Nov 2015 03:04:54 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v4 7/7] test: fix the tests for the new reply code +Date: Sat, 7 Nov 2015 11:04:36 +0000 +Message-Id: <1446894276-7814-8-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 2.1.4 +In-Reply-To: <1446894276-7814-1-git-send-email-markwalters1009@gmail.com> +References: <1446894276-7814-1-git-send-email-markwalters1009@gmail.com> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +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, 07 Nov 2015 11:05:09 -0000 + +This sets the part-insertion code to never insert part headers (as we +didn't before). + +With that change there is only one failing test: this test has a text +part (an email message) listed as application/octet-stream. Notmuch +show displays this part, but the reply code omitted it as it had type +application/octet-stream. The new code correctly includes it. Thus +update the expected output to match. +--- + test/T310-emacs.sh | 32 ++++++++++++++++++++++++++++++++ + test/test-lib.el | 4 ++++ + 2 files changed, 36 insertions(+) + +diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh +index 61bc369..22ca71c 100755 +--- a/test/T310-emacs.sh ++++ b/test/T310-emacs.sh +@@ -473,6 +473,38 @@ Alex Botero-Lowry writes: + > and http://mail-index.netbsd.org/pkgsrc-bugs/2006/06/07/msg016808.htmlspecifically + > uses 64 as the + > buffer size. ++> From e3bc4bbd7b9d0d086816ab5f8f2d6ffea1dd3ea4 Mon Sep 17 00:00:00 2001 ++> From: Alexander Botero-Lowry ++> Date: Tue, 17 Nov 2009 11:30:39 -0800 ++> Subject: [PATCH] Deal with situation where sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 ++> ++> --- ++> notmuch-config.c | 2 ++ ++> 1 files changed, 2 insertions(+), 0 deletions(-) ++> ++> diff --git a/notmuch-config.c b/notmuch-config.c ++> index 248149c..e7220d8 100644 ++> --- a/notmuch-config.c ++> +++ b/notmuch-config.c ++> @@ -77,6 +77,7 @@ static char * ++> get_name_from_passwd_file (void *ctx) ++> { ++> long pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX); ++> + if (pw_buf_size == -1) pw_buf_size = 64; ++> char *pw_buf = talloc_zero_size (ctx, pw_buf_size); ++> struct passwd passwd, *ignored; ++> char *name; ++> @@ -101,6 +102,7 @@ static char * ++> get_username_from_passwd_file (void *ctx) ++> { ++> long pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX); ++> + if (pw_buf_size == -1) pw_buf_size = 64; ++> char *pw_buf = talloc_zero_size (ctx, pw_buf_size); ++> struct passwd passwd, *ignored; ++> char *name; ++> -- ++> 1.6.5.2 ++> + > _______________________________________________ + > notmuch mailing list + > notmuch@notmuchmail.org +diff --git a/test/test-lib.el b/test/test-lib.el +index 04c8d63..6e1689a 100644 +--- a/test/test-lib.el ++++ b/test/test-lib.el +@@ -184,6 +184,10 @@ (defmacro notmuch-test-progn (&rest body) + (setq notmuch-tag-deleted-formats + '((".*" nil))) + ++;; For historical reasonse we don't print part headers when replying ++;; in the tests suite ++(setq notmuch-mua-reply-insert-header-p-function 'notmuch-show-reply-insert-header-p-never) ++ + ;; force a common html renderer, to avoid test variations between + ;; environments + +-- +2.1.4 + -- 2.26.2