From: Mark Walters Date: Tue, 13 May 2014 12:16:52 +0000 (+0100) Subject: Re: [PATCH v3 7/9] test: Update the test output to accord with the reply changes X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a1a24cd70cb03df0947917c0c01aafb78b737568;p=notmuch-archives.git Re: [PATCH v3 7/9] test: Update the test output to accord with the reply changes --- diff --git a/0b/5749d0d006db4c7cd0c86857de7138f5dd4251 b/0b/5749d0d006db4c7cd0c86857de7138f5dd4251 new file mode 100644 index 000000000..bd6e0869c --- /dev/null +++ b/0b/5749d0d006db4c7cd0c86857de7138f5dd4251 @@ -0,0 +1,154 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 517B4431FC2 + for ; Tue, 13 May 2014 05:17:03 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id aFFTMqPlxuWk for ; + Tue, 13 May 2014 05:16:55 -0700 (PDT) +Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com + [209.85.212.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 70E4C431FBD + for ; Tue, 13 May 2014 05:16:55 -0700 (PDT) +Received: by mail-wi0-f173.google.com with SMTP id bs8so6115019wib.12 + for ; Tue, 13 May 2014 05:16:54 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:subject:in-reply-to:references:user-agent:date:message-id + :mime-version:content-type; + bh=agOutuO4LEkd8vEQLt8lrsuTWDuHdqohJo1M5eQaeKA=; + b=LhbcRADP9FrpacrlCtoCx+8SSxChVWKR09qH/Fn9EFK3P5SlnV8vMelK9GE5a0qinc + LMFBVXFftFaY4K6vCPQ5cXDtut2kYlG2gPZ8En4mQkJrr44LZ6N1a0wM/mFV78TGyBqc + b6d1W90UZWG92s5OPoTjn4HEq9AzErpf0jT2aEmlpt2MJRKrMsPu/s+Km4qDfNBV7AxR + T4D6fAfBY0GgjPHdVhh1e667KlaV7mZKo+6rfXdmvlAUkWCqoI812frd5nKFrLZ6yPHC + Oe1Yg7Ag8CDxviJZQLVAWMlpo5hRGqn0/fz6uV3AqmyI8CsKuDKjOycuudkshutry6yl + Bm0A== +X-Received: by 10.194.88.230 with SMTP id bj6mr604618wjb.85.1399983414082; + Tue, 13 May 2014 05:16:54 -0700 (PDT) +Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162]) + by mx.google.com with ESMTPSA id + pj5sm21624701wic.20.2014.05.13.05.16.53 for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Tue, 13 May 2014 05:16:53 -0700 (PDT) +From: Mark Walters +To: David Edmondson , notmuch@notmuchmail.org +Subject: Re: [PATCH v3 7/9] test: Update the test output to accord with the + reply changes +In-Reply-To: <1399897769-26809-8-git-send-email-dme@dme.org> +References: <87sixdujkv.fsf@qmul.ac.uk> + <1399897769-26809-1-git-send-email-dme@dme.org> + <1399897769-26809-8-git-send-email-dme@dme.org> +User-Agent: Notmuch/0.15.2+615~g78e3a93 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Tue, 13 May 2014 13:16:52 +0100 +Message-ID: <87vbt9j2kr.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +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: Tue, 13 May 2014 12:17:04 -0000 + +On Mon, 12 May 2014, David Edmondson wrote: +> Replying to a message with multiple parts will now typically include +> content from several parts (whereas previously only the first part was +> used). Update the expected output from the emacs reply tests +> accordingly. + +I will reply here rather than to id:cunr43y56wy.fsf@hotblack-desiato.hh.sledj.net + +My point was that the change in this test is not because we are now +looking beyond the first part. It is because a part with content-type +application/octet-stream (which we didn't include in replies in the old +scheme, and wouldn't generally in the new scheme) is redesignated by +notmuch-show as a content-type text/x-diff, and thus displayed in the +buffer. Hence the new code includes it in the reply. + +You can see this more clearly in patch 9/9 when this part gets a header button + ++> [ 0001-Deal-with-situation-where-sysconf-_SC_GETPW_R_SIZE_M.patch: application/octet-stream (as text/x-diff) ] + +Anyway, my point is that this is a *good* thing: the change is not a +large intrusive thing of showing lots more parts (as this commit message +sort of suggests) but a small change of it now correctly including a +part which got sent with the wrong content-type. + +Best wishes + +Mark + + + +> --- +> test/T310-emacs.sh | 32 ++++++++++++++++++++++++++++++++ +> 1 file changed, 32 insertions(+) +> +> diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh +> index ac966e5..95bb67e 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 +> -- +> 2.0.0.rc0 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch