From patchwork Mon Aug 14 22:38:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arjan Adriaanse X-Patchwork-Id: 52843 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5740727BBEA; Mon, 14 Aug 2023 23:39:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B774027BBE2 for ; Mon, 14 Aug 2023 23:39:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qVgDg-000182-CY; Mon, 14 Aug 2023 18:39:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qVgDI-00015q-Ty for guix-patches@gnu.org; Mon, 14 Aug 2023 18:39:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qVgDI-0001UO-41 for guix-patches@gnu.org; Mon, 14 Aug 2023 18:39:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qVgDG-0005GR-Iu; Mon, 14 Aug 2023 18:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65298] [PATCH emacs-team] gnu: notmuch: Fix tests with Emacs 29 Resent-From: Arjan Adriaanse Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 14 Aug 2023 22:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65298 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65298@debbugs.gnu.org Cc: Arjan Adriaanse , andrew@trop.in, liliana.prikler@gmail.com X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: andrew@trop.in, liliana.prikler@gmail.com Received: via spool by submit@debbugs.gnu.org id=B.169205271020195 (code B ref -1); Mon, 14 Aug 2023 22:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 Aug 2023 22:38:30 +0000 Received: from localhost ([127.0.0.1]:34564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVgCk-0005Fe-3K for submit@debbugs.gnu.org; Mon, 14 Aug 2023 18:38:30 -0400 Received: from lists.gnu.org ([2001:470:142::17]:47298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVgCf-0005FN-GZ for submit@debbugs.gnu.org; Mon, 14 Aug 2023 18:38:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qVgCZ-00014I-Df for guix-patches@gnu.org; Mon, 14 Aug 2023 18:38:19 -0400 Received: from dane.soverin.net ([2a10:de80:1:4091:b9e9:2219:0:1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qVgCW-0001SK-Hd for guix-patches@gnu.org; Mon, 14 Aug 2023 18:38:19 -0400 Received: from smtp.freedom.nl (c04smtp-lb01.int.sover.in [10.10.4.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dane.soverin.net (Postfix) with ESMTPS id 4RPq6r2kR0zyhb; Mon, 14 Aug 2023 22:38:12 +0000 (UTC) Received: from smtp.freedom.nl (smtp.freedom.nl [10.10.4.107]) by freedom.nl (Postfix) with ESMTPSA id 4RPq6q5BPPz6D; Mon, 14 Aug 2023 22:38:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=adriaan.se; s=soverin; t=1692052692; bh=h3W5s2r1WqpqQryGI80oNvtLsvthxGG+H2FWZwtnHlo=; h=From:To:Cc:Subject:Date:From; b=e3hIiMV2XOn3h2WJSUSBtfRduuwW/ua0RGaSO7vP4jahdvsxrj00xeJ1mFT6iRTwp rYGObldALfqQrklOG1U7fbeT3KOKUmjr/3vdfh6DOxIHuUR/AB/sxmDXRAw+CjIs+4 /Mny7HBqJ42uFcljYHFH/sm2sOVu9GmXs4/1Wh5LSpN07PbZWcgiK0WwEYrxU/VTiL U5ngiEPXo9VOrYDmxLnLlBNgYHBOLjtEOHp8hMWp9kAj85PVd/teWTlEJMS7Rwh4Pn 0sQWxc3KJMLrgAdEcpaiz+yDgVE7JdRKUdkpteA7S9/O905glj8hUC4pU51OGV8tB6 3Zbk0U/GPifxA== X-Soverin-Authenticated: true From: Arjan Adriaanse Date: Tue, 15 Aug 2023 00:38:25 +0200 Message-ID: <2d028a2e7676f2d9a7f6dbc276cc663245bf212a.1692052705.git.arjan@adriaan.se> MIME-Version: 1.0 X-CMAE-Score: 0 X-CMAE-Analysis: v=2.4 cv=GuiEuG5C c=1 sm=1 tr=0 ts=64daacd4 a=IkcTkHD0fZMA:10 a=LpNgXrTXAAAA:8 a=4TAfC9WaAAAA:8 a=7343-z1_AAAA:8 a=j_ZzigakAAAA:8 a=n81SEgkYAAAA:8 a=xNf9USuDAAAA:8 a=Cuw_ylJHAAAA:8 a=eVVwxJLPKjchrb4hKKMA:9 a=QEXdDO2ut3YA:10 a=0SjVuBzb9bsA:10 a=XUadCtVcnfMA:10 a=Ihbe4j7NukMA:10 a=LqOpv0_-CX5VL_7kjZO3:22 a=kepM0YLh5QP-lMCCCLxQ:22 a=TIilloDGjzTra_O4aUnR:22 a=YmXaM2wpsgz2wiIRKnhl:22 a=j2tC6wxoEfoNJoJgT8s8:22 a=SEwjQc04WA-l_NiBhQ7s:22 a=A4raP29GkWnQc1z04csR:22 X-Cloudmark-Reporter: zgG3Xlg9GQy3IRhsa0XWbyHpcyE= Received-SPF: none client-ip=2a10:de80:1:4091:b9e9:2219:0:1; envelope-from=arjan@adriaan.se; helo=dane.soverin.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/mail.scm (notmuch): Add patch. * gnu/packages/patches/notmuch-emacs-test-output.patch: Add file. --- gnu/packages/mail.scm | 6 +- .../patches/notmuch-emacs-test-output.patch | 89 +++++++++++++++++++ 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/notmuch-emacs-test-output.patch base-commit: 51deacd8604b59aa434e944c73aecefd5183d13e diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index a6f571e723..fb1ba35d21 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -52,6 +52,7 @@ ;;; Copyright © 2022 jgart ;;; Copyright © 2022 ( ;;; Copyright © 2023 Timo Wilken +;;; Copyright © 2023 Arjan Adriaanse ;;; ;;; This file is part of GNU Guix. ;;; @@ -1383,7 +1384,10 @@ (define-public notmuch (uri (string-append "https://notmuchmail.org/releases/notmuch-" version ".tar.xz")) (sha256 - (base32 "1xl64xh0ijfkx265lcj9cqv1wkzha8gsn9jn4fw4xgvqigr6sxhf")))) + (base32 "1xl64xh0ijfkx265lcj9cqv1wkzha8gsn9jn4fw4xgvqigr6sxhf")) + (patches + ;; Output for some tests varies slightly in Emacs 29. + (search-patches "notmuch-emacs-test-output.patch")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/patches/notmuch-emacs-test-output.patch b/gnu/packages/patches/notmuch-emacs-test-output.patch new file mode 100644 index 0000000000..3c6d472d6b --- /dev/null +++ b/gnu/packages/patches/notmuch-emacs-test-output.patch @@ -0,0 +1,89 @@ +From e9e779ead4d703ad423e46c23abd0c9afd7d5ed2 Mon Sep 17 00:00:00 2001 +From: Arjan Adriaanse +Date: Tue, 15 Aug 2023 00:00:05 +0200 +Subject: [PATCH] test: fix expected output for Emacs 29 + +--- + test/T453-emacs-reply.sh | 1 - + test/T454-emacs-dont-reply-names.sh | 9 +++------ + .../notmuch-reply-duplicate-4 | 1 - + 3 files changed, 3 insertions(+), 8 deletions(-) + +diff --git a/test/T453-emacs-reply.sh b/test/T453-emacs-reply.sh +index 0a27d066..de400b85 100755 +--- a/test/T453-emacs-reply.sh ++++ b/test/T453-emacs-reply.sh +@@ -17,7 +17,6 @@ cat < EXPECTED + From: Notmuch Test Suite + To: Antoine Beaupré + Subject: Re: bug: "no top level messages" crash on Zen email loops +-In-Reply-To: <874llc2bkp.fsf@curie.anarc.at> + Fcc: MAIL_DIR/sent + --text follows this line-- + Antoine Beaupré writes: +diff --git a/test/T454-emacs-dont-reply-names.sh b/test/T454-emacs-dont-reply-names.sh +index 3a770177..9ed4f18b 100755 +--- a/test/T454-emacs-dont-reply-names.sh ++++ b/test/T454-emacs-dont-reply-names.sh +@@ -17,13 +17,12 @@ test_emacs '(let ((message-dont-reply-to-names "notmuchmail\\|noreply\\|harvard" + (test-visible-output "OUTPUT-FULL.raw"))' + + notmuch_dir_sanitize < OUTPUT-FULL.raw > OUTPUT-FULL +-head -6 OUTPUT-FULL > OUTPUT ++head -5 OUTPUT-FULL > OUTPUT + + cat < EXPECTED + From: Notmuch Test Suite + To: Mikhail Gusarov + Subject: Re: [notmuch] Working with Maildir storage? +-In-Reply-To: <20091117203301.GV3165@dottiness.seas.harvard.edu> + Fcc: MAIL_DIR/sent + --text follows this line-- + EOF +@@ -38,14 +37,13 @@ test_emacs '(let ((message-dont-reply-to-names + (test-visible-output "OUTPUT-FULL-PRED.raw"))' + + notmuch_dir_sanitize < OUTPUT-FULL-PRED.raw > OUTPUT-FULL-PRED +-head -7 OUTPUT-FULL-PRED > OUTPUT-PRED ++head -6 OUTPUT-FULL-PRED > OUTPUT-PRED + + cat < EXPECTED-PRED + From: Notmuch Test Suite + To: Lars Kellogg-Stedman + Cc: notmuch@notmuchmail.org + Subject: Re: [notmuch] Working with Maildir storage? +-In-Reply-To: <20091117203301.GV3165@dottiness.seas.harvard.edu> + Fcc: MAIL_DIR/sent + --text follows this line-- + EOF +@@ -59,14 +57,13 @@ test_emacs '(let ((message-dont-reply-to-names nil)) + (test-visible-output "OUTPUT-FULL-NIL.raw"))' + + notmuch_dir_sanitize < OUTPUT-FULL-NIL.raw > OUTPUT-FULL-NIL +-head -7 OUTPUT-FULL-NIL > OUTPUT-NIL ++head -6 OUTPUT-FULL-NIL > OUTPUT-NIL + + cat < EXPECTED-NIL + From: Notmuch Test Suite + To: Lars Kellogg-Stedman , Mikhail Gusarov + Cc: notmuch@notmuchmail.org + Subject: Re: [notmuch] Working with Maildir storage? +-In-Reply-To: <20091117203301.GV3165@dottiness.seas.harvard.edu> + Fcc: MAIL_DIR/sent + --text follows this line-- + EOF +diff --git a/test/emacs-reply.expected-output/notmuch-reply-duplicate-4 b/test/emacs-reply.expected-output/notmuch-reply-duplicate-4 +index 836f77b1..44b8c7a6 100644 +--- a/test/emacs-reply.expected-output/notmuch-reply-duplicate-4 ++++ b/test/emacs-reply.expected-output/notmuch-reply-duplicate-4 +@@ -1,7 +1,6 @@ + From: Notmuch Test Suite + To: Sean Whitton , 916811@bugs.debian.org, 916805@bugs.debian.org, 916807@bugs.debian.org, 916808@bugs.debian.org, 916809@bugs.debian.org, 916811@bugs.debian.org, 916867@bugs.debian.org, 916869@bugs.debian.org, 916872@bugs.debian.org, 916875@bugs.debian.org, 916876@bugs.debian.org + Subject: Re: [Pkg-emacsen-addons] Bug#916811: Increase severity to 'serious' +-In-Reply-To: <87r2ecrr6x.fsf@zephyr.silentflame.com> + Fcc: MAIL_DIR/sent + --text follows this line-- + Sean Whitton writes: +-- +2.41.0 +