From 16e1141315328240d6a8f54704bea6ccaaf7127d Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sun, 14 Feb 2016 18:39:59 +0000 Subject: [PATCH] [PATCH v5 7/7] test: fix the tests for the new reply code --- f9/9f98d8bd4a4a6f5948895603ffe195df34864b | 148 ++++++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 f9/9f98d8bd4a4a6f5948895603ffe195df34864b diff --git a/f9/9f98d8bd4a4a6f5948895603ffe195df34864b b/f9/9f98d8bd4a4a6f5948895603ffe195df34864b new file mode 100644 index 000000000..08dc578ee --- /dev/null +++ b/f9/9f98d8bd4a4a6f5948895603ffe195df34864b @@ -0,0 +1,148 @@ +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 2176E6DE1ABD + for ; Sun, 14 Feb 2016 10:40:39 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.252 +X-Spam-Level: +X-Spam-Status: No, score=-0.252 tagged_above=-999 required=5 tests=[AWL=0.318, + 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_DNSWL_LOW=-0.7, + 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 F5Ro50kCSfYh for ; + Sun, 14 Feb 2016 10:40:36 -0800 (PST) +Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com + [74.125.82.66]) by arlo.cworth.org (Postfix) with ESMTPS id D74596DE1A2F for + ; Sun, 14 Feb 2016 10:40:25 -0800 (PST) +Received: by mail-wm0-f66.google.com with SMTP id c200so12198702wme.0 + for ; Sun, 14 Feb 2016 10:40:25 -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=t6Z+I/U2kV6EPFXiti1hnP6pfo6O2iMbWv/rZONfxE0=; + b=IZ7233ITgZ1Mr0WNkNcRczRBZUB6yeNVsRes99PvddR3aHIQtH7YC+e9pKQeYAg/Ii + vAna35V2TsoSS7byf80k5pZW6dHrf3mqQ+FfEjlbBpZlgaROlDcgbOzLkHoYGiWulIof + WpWtUmAJR+xPvTe/lFz5MJrJLzFgdxwYcjjSDt7iDXfsZKk9YfoEOPgKn4Tl/pcR+O3p + 1g6g9iA9geLrIAsUHuqnaGtI0KInnAZBGeIRUV4hQNbjWq8WdAZOTaZg6QWq8gMjbs1K + 9JAl0MdlKFGMu+bSaE2GpWUoEMnX3HiFbLCyDy7F8s1eu80guE24/xqELgeLGP1rDmNC + /K9Q== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references; + bh=t6Z+I/U2kV6EPFXiti1hnP6pfo6O2iMbWv/rZONfxE0=; + b=Isx0OJ61nj/BgPSBsrYXxIuWhNstbk3FaaX8uj9MxqkIqk5Sr7mznFD83r4yvdYnno + tdRX3mu0NG09LJVjpMrVb7SITG3dFNZ/fIcEi93QpnO5Q1/I2BdUZPpyicPeDHFQiF6z + Mpy86tkXkMcjBLK1KUIwCZ9ia6J1m4rzZ0zKhw7Sf1b1Rg2syaas7QVbnry9IZSfqJXB + WXL5SPX8ETtkjR9pKbTV38QTbFN3XPzidjNegIvz/iaT0fWuNMfSfrczdm8IcPpyjD8Z + EbotipYjUoUvhSgocyqh8fLNKMGhxiqS5H7ne76RKtYx2AQphWj6Hk82sE+Ev5EsxZii + gupw== +X-Gm-Message-State: + AG10YOQGqAdHtw0xa6NUy6+Rbki0GQpywY2xyrVvsV7mz7jBZEtrYNV2oZHC+y1LG4gQNw== +X-Received: by 10.28.136.139 with SMTP id k133mr8781952wmd.103.1455475224572; + Sun, 14 Feb 2016 10:40:24 -0800 (PST) +Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162]) + by smtp.gmail.com with ESMTPSA id ka4sm21737310wjc.47.2016.02.14.10.40.23 + (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Sun, 14 Feb 2016 10:40:24 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v5 7/7] test: fix the tests for the new reply code +Date: Sun, 14 Feb 2016 18:39:59 +0000 +Message-Id: <1455475199-32622-8-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 2.1.4 +In-Reply-To: <1455475199-32622-1-git-send-email-markwalters1009@gmail.com> +References: <1455475199-32622-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: Sun, 14 Feb 2016 18:40:39 -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 596a705..02e020c 100644 +--- a/test/test-lib.el ++++ b/test/test-lib.el +@@ -184,6 +184,10 @@ nothing." + (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