From unknown Mon Jun 23 18:34:01 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 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 + base-commit: 51deacd8604b59aa434e944c73aecefd5183d13e -- 2.41.0 From unknown Mon Jun 23 18:34:01 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65298] [PATCH emacs-team] gnu: notmuch: Fix tests with Emacs 29 Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 15 Aug 2023 03:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65298 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arjan Adriaanse , 65298@debbugs.gnu.org Cc: andrew@trop.in Received: via spool by 65298-submit@debbugs.gnu.org id=B65298.169207041615644 (code B ref 65298); Tue, 15 Aug 2023 03:34:01 +0000 Received: (at 65298) by debbugs.gnu.org; 15 Aug 2023 03:33:36 +0000 Received: from localhost ([127.0.0.1]:34717 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVkoJ-00044G-LG for submit@debbugs.gnu.org; Mon, 14 Aug 2023 23:33:35 -0400 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:60819) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVkoH-000443-9t for 65298@debbugs.gnu.org; Mon, 14 Aug 2023 23:33:33 -0400 Received: by mail-ej1-x644.google.com with SMTP id a640c23a62f3a-99bdeae1d0aso665591266b.1 for <65298@debbugs.gnu.org>; Mon, 14 Aug 2023 20:33:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692070407; x=1692675207; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=zM7E3wafUxAY+OkpJ5S3rIcjFz1IWuKpfQfRHoiSA8U=; b=ffPaP72ogu5+aiRxsnljrMmxhEkDL/NAk5TdHf3ngtqGLRsoF/4jomu4Ef1Qfj+ivc /X2gxgjVySxo1xnjUAmJ36jxUpK0T7LEtrPme1nVE2NXXcOhhEtu9aH0H+QAXg4CSnIB qOO8Fu2HQm1WfaZbbo37IQQ/rQ5r8wKr7tJXrxFHawbvEYuIO6wYJ+ZP5PVjZtQkRle7 MjOgTNcA3TZVHepZQnz6nYFEOrEa/1Rz+hOa3R5/Ng/7af7xEWG5KjZdlnygzBNEdn9x kd2fmN8zPKXr9YOOslJP0tGstmhCyV0c1plAo6Eqz40OUwyaRBaMv+RsTY5X1CR04fax eMvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692070407; x=1692675207; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=zM7E3wafUxAY+OkpJ5S3rIcjFz1IWuKpfQfRHoiSA8U=; b=V/Ye+rxjILLitlflz80hofpCPSn/KOWo59HmYyPnjLTX0axhA6sl9GJbbsozS73MaK jTrjuoG6GxaZF/3tm7sJgaF+7lzIfusxQF3Pt2N+V4atTD2HbEv6HX3X3QfALkvmRS6J Hx90cKSvJ8QgKyy4vS/AlblInq3KTE8V0soRAFVnRBqpTxRIu/Bqc2UgrIVQVOtppR/i me/4Tja+HpSzQGHB+Q+rKkqWyvYZ0zci+C9L8EV48CZ7Z0jTKYBpZEDPz4j1ou1f91t6 C3iXx/njzM8DFHZY0qMgIajwXrJZ3i3SB+aTqmsniwdxK9A9ULE2VtB8PqlLhj1W9YWw QQrQ== X-Gm-Message-State: AOJu0Yxhbt8UtuV1SI/2JZ11jbFhj5zg+sXLOwivXujmkiKOVkUc1Nj1 ti1Ps5yHl1jUIhSmTUw6bYM= X-Google-Smtp-Source: AGHT+IF/4nmqMtCa4ScxGxa9V6MzB6uidd8dGHs8Dm8EiwXeHmfWMGqNGexbow0TWWlFT5OhVkRA9Q== X-Received: by 2002:a17:907:2c42:b0:99b:c689:3f3d with SMTP id hf2-20020a1709072c4200b0099bc6893f3dmr9110865ejc.25.1692070407210; Mon, 14 Aug 2023 20:33:27 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q14-20020a17090622ce00b00992ca779f42sm6403074eja.97.2023.08.14.20.33.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Aug 2023 20:33:25 -0700 (PDT) Message-ID: <7fd5cb4f55a0b76e4d71980aa9bc6064e9d3b9dd.camel@gmail.com> From: Liliana Marie Prikler Date: Tue, 15 Aug 2023 05:33:24 +0200 In-Reply-To: <2d028a2e7676f2d9a7f6dbc276cc663245bf212a.1692052705.git.arjan@adriaan.se> References: <2d028a2e7676f2d9a7f6dbc276cc663245bf212a.1692052705.git.arjan@adriaan.se> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Dienstag, dem 15.08.2023 um 00:38 +0200 schrieb Arjan Adriaanse: > * gnu/packages/mail.scm (notmuch): Add patch. > * gnu/packages/patches/notmuch-emacs-test-output.patch: Add file. Also added the right line to gnu/local.mk, adapted the ChangeLog accordingly, and pushed. Thanks From unknown Mon Jun 23 18:34:01 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Arjan Adriaanse Subject: bug#65298: closed (Re: [bug#65298] [PATCH emacs-team] gnu: notmuch: Fix tests with Emacs 29) Message-ID: References: <4452c87fcb25ea76d5bf770e8911a05585523f66.camel@gmail.com> <2d028a2e7676f2d9a7f6dbc276cc663245bf212a.1692052705.git.arjan@adriaan.se> X-Gnu-PR-Message: they-closed 65298 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 65298@debbugs.gnu.org Date: Tue, 15 Aug 2023 03:35:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1692070503-15811-1" This is a multi-part message in MIME format... ------------=_1692070503-15811-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #65298: [PATCH emacs-team] gnu: notmuch: Fix tests with Emacs 29 which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 65298@debbugs.gnu.org. --=20 65298: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D65298 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1692070503-15811-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 65298-done) by debbugs.gnu.org; 15 Aug 2023 03:34:14 +0000 Received: from localhost ([127.0.0.1]:34721 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVkov-00045U-VN for submit@debbugs.gnu.org; Mon, 14 Aug 2023 23:34:14 -0400 Received: from mail-lf1-x143.google.com ([2a00:1450:4864:20::143]:52669) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVkou-00045H-GF for 65298-done@debbugs.gnu.org; Mon, 14 Aug 2023 23:34:13 -0400 Received: by mail-lf1-x143.google.com with SMTP id 2adb3069b0e04-4fe2de785e7so8004820e87.1 for <65298-done@debbugs.gnu.org>; Mon, 14 Aug 2023 20:34:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692070446; x=1692675246; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=J/LzixzvOSlJHDl7h1Eo1mIqQXmMwruNxSouAtIv7TE=; b=Bq+6ET5UnlV0alA9n10MPZvpujWnHXmz7ymr1xW2L8dWxmG395H/Gcf9cDikcDH9ZC MZJE3UNl4IiM7oToH3gNJlRS1FBqfl+DV5x6+a1q4ussSKkQ96zfOE9WUXf/kwjyPi9q iCpduX9zxtpfWIeszItxqPHV1TmI8DoKZK9IPoIJdmVy1e/g5BDPSxPJ0RJ31wUUbsG5 vc1X7Z2G8UPRA2+273PZFgjB3RLS8VsBlMlseFPJ96wVcN3NokqrrBP/vfYAEcyWSCrh mcw18koq87mrfB+EgLxvRty7pZXUCfXqu6FNvVbLjOavUMrrMcGCWzs9TmnWrANU7NlI CchA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692070446; x=1692675246; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=J/LzixzvOSlJHDl7h1Eo1mIqQXmMwruNxSouAtIv7TE=; b=UV73mzBJl5ziawrNYftQndF8MmDlFLGv4w4Xqb6/bLlZrmNqR1f5scApdLgLrEZUKJ CBhWhZA9IuKxa5LAaWvpSJiLFhd4Qj1EucZ7c/1MwzmnpgNKfZW6Xq8bJRpYMH9Nznxt REnim5uYjoLeop/kPgPXZDnPJGZ5f7Df1DKDc0fYOEXTFGODtYXxRJi+Zo3aSmMemqjS R3T/OcuzDreTFVmOvS582JRnTd/sdU7uKwerux4i1+iUBvgWbOSFiIHF7JJWsDjH1Usy 5ftQpRfVAXBBoa5WBpFsd1TXHVySw0wE6mLUcom0GpaDocgPo/NIYXtP2B/0UGFg21SK tINQ== X-Gm-Message-State: AOJu0Yxa0l8XhK9doEatW/StLAtUD0jH4ErQjTQM+6pgEHAbyJAfQJFB OWQGG4fSXrt+TD8lhJQ9RWA= X-Google-Smtp-Source: AGHT+IHwSBBvbjocnXWBNhLSo4qcHFq0p34o8m1q+c0cPiBeYT6mLqTlkrIa1UzBQGTpMfk2h+pmbA== X-Received: by 2002:a05:6512:708:b0:4fa:f79f:85a with SMTP id b8-20020a056512070800b004faf79f085amr6850936lfs.69.1692070446211; Mon, 14 Aug 2023 20:34:06 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id k15-20020a05640212cf00b00521f4ee396fsm6263723edx.12.2023.08.14.20.34.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Aug 2023 20:34:05 -0700 (PDT) Message-ID: <4452c87fcb25ea76d5bf770e8911a05585523f66.camel@gmail.com> Subject: Re: [bug#65298] [PATCH emacs-team] gnu: notmuch: Fix tests with Emacs 29 From: Liliana Marie Prikler To: Arjan Adriaanse , 65298-done@debbugs.gnu.org Date: Tue, 15 Aug 2023 05:34:04 +0200 In-Reply-To: <7fd5cb4f55a0b76e4d71980aa9bc6064e9d3b9dd.camel@gmail.com> References: <2d028a2e7676f2d9a7f6dbc276cc663245bf212a.1692052705.git.arjan@adriaan.se> <7fd5cb4f55a0b76e4d71980aa9bc6064e9d3b9dd.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65298-done Cc: andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Dienstag, dem 15.08.2023 um 05:33 +0200 schrieb Liliana Marie Prikler: > Am Dienstag, dem 15.08.2023 um 00:38 +0200 schrieb Arjan Adriaanse: > > * gnu/packages/mail.scm (notmuch): Add patch. > > * gnu/packages/patches/notmuch-emacs-test-output.patch: Add file. > Also added the right line to gnu/local.mk, adapted the ChangeLog > accordingly, and pushed. >=20 > Thanks And marking as done=E2=80=A6 ------------=_1692070503-15811-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 To: guix-patches@gnu.org Subject: [PATCH emacs-team] gnu: notmuch: Fix tests with Emacs 29 Date: Tue, 15 Aug 2023 00:38:25 +0200 Message-ID: <2d028a2e7676f2d9a7f6dbc276cc663245bf212a.1692052705.git.arjan@adriaan.se> MIME-Version: 1.0 X-Debbugs-Cc: andrew@trop.in, liliana.prikler@gmail.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: submit Cc: Arjan Adriaanse X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 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 + base-commit: 51deacd8604b59aa434e944c73aecefd5183d13e -- 2.41.0 ------------=_1692070503-15811-1--