From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 7DAA56DE0164 for ; Sat, 2 Sep 2017 12:49:17 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0.488 X-Spam-Level: X-Spam-Status: No, score=0.488 tagged_above=-999 required=5 tests=[AWL=-0.164, SPF_NEUTRAL=0.652] 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 C3OSc3pU0cI0 for ; Sat, 2 Sep 2017 12:49:12 -0700 (PDT) Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) by arlo.cworth.org (Postfix) with ESMTP id 8E4816DE0314 for ; Sat, 2 Sep 2017 12:49:12 -0700 (PDT) Received: from guru.guru-group.fi (localhost [IPv6:::1]) by guru.guru-group.fi (Postfix) with ESMTP id E473E1000DF; Sat, 2 Sep 2017 22:48:56 +0300 (EEST) From: Tomi Ollila To: David Bremner , Vladimir Panteleev , notmuch@notmuchmail.org Subject: Re: [PATCH] test/crypto: remove headers more robustly In-Reply-To: <20170902001119.15318-1-david@tethera.net> References: <20170817175145.3204-7-notmuch@thecybershadow.net> <20170902001119.15318-1-david@tethera.net> User-Agent: Notmuch/0.25+52~ga6cef81 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) X-Face: HhBM'cA~ MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.23 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, 02 Sep 2017 19:49:17 -0000 On Fri, Sep 01 2017, David Bremner wrote: > In [1], Vladimir Panteleev observed that the In-Reply-To and > References headers could be wrapped in the 'default' output format of > notmuch-reply, depending on the version of Emacs creating the > message. In my own experiments notmuch-reply sometimes wraps headers > with only one message-id if that message-id is long enough. However it > happens, this causes the previous approach using grep to fail. we could (also) make emacs think it has wider than 80 characters to fit on one line... > Since I found the proposed unwrapping shell fragment in [1] a bit hard > to follow, I decided to write a little python script instead. There was nothing hard in that shell construct ;), but I also thought some alternative solutions (one in awk and one in perl) How 'bout drop_email_headers () { $NOTMUCH_PYTHON -c 'import email, sys msg = email.message_from_file(sys.stdin) for hdr in sys.argv: msg.pop(hdr, None) print(msg.as_string(False))' } and then ... | drop_email_headers In-Reply-To References > > [1] id:20170817175145.3204-7-notmuch@thecybershadow.net > --- > test/T350-crypto.sh | 2 +- > test/test-lib.sh | 11 +++++++++++ > 2 files changed, 12 insertions(+), 1 deletion(-) > > diff --git a/test/T350-crypto.sh b/test/T350-crypto.sh > index 7dab39a2..fd950952 100755 > --- a/test/T350-crypto.sh > +++ b/test/T350-crypto.sh > @@ -394,7 +394,7 @@ test_expect_equal_json \ > > test_begin_subtest "reply to encrypted message" > output=$(notmuch reply --decrypt subject:"test encrypted message 002" \ > - | grep -v -e '^In-Reply-To:' -e '^References:') > + | notmuch_reply_sanitize_refs) > expected='From: Notmuch Test Suite > Subject: Re: test encrypted message 002 > > diff --git a/test/test-lib.sh b/test/test-lib.sh > index d2b2a47f..4716f649 100644 > --- a/test/test-lib.sh > +++ b/test/test-lib.sh > @@ -507,6 +507,17 @@ NOTMUCH_DUMP_TAGS () > notmuch dump --include=tags "${@}" | sed '/^#/d' | sort > } > > +notmuch_reply_sanitize_refs () > +{ > + $NOTMUCH_PYTHON -c " > +import email,sys > +msg=email.message_from_file(sys.stdin) > +del msg['in-reply-to'] > +del msg['references'] > +print(msg.as_string(False)) > +" > +} > + > notmuch_search_sanitize () > { > perl -pe 's/("?thread"?: ?)("?)................("?)/\1\2XXX\3/' > -- > 2.14.1 > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > https://notmuchmail.org/mailman/listinfo/notmuch