GNU bug report logs - #65298
[PATCH emacs-team] gnu: notmuch: Fix tests with Emacs 29

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 65298 in the body.
You can then email your comments to 65298 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Arjan Adriaanse <arjan <at> adriaan.se>
To: guix-patches <at> gnu.org
Cc: Arjan Adriaanse <arjan <at> adriaan.se>
Subject: [PATCH emacs-team] gnu: notmuch: Fix tests with Emacs 29
Date: Tue, 15 Aug 2023 00:38:25 +0200

* 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 <jgart <at> dismail.de>
 ;;; Copyright © 2022 ( <paren <at> disroot.org>
 ;;; Copyright © 2023 Timo Wilken <guix <at> twilken.net>
+;;; Copyright © 2023 Arjan Adriaanse <arjan <at> adriaan.se>
 ;;;
 ;;; 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 <arjan <at> adriaan.se>
+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 <<EOF > EXPECTED
+ From: Notmuch Test Suite <test_suite <at> notmuchmail.org>
+ To: Antoine Beaupré <anarcat <at> orangeseeds.org>
+ Subject: Re: bug: "no top level messages" crash on Zen email loops
+-In-Reply-To: <874llc2bkp.fsf <at> curie.anarc.at>
+ Fcc: MAIL_DIR/sent
+ --text follows this line--
+ Antoine Beaupré <anarcat <at> orangeseeds.org> 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 <<EOF > EXPECTED
+ From: Notmuch Test Suite <test_suite <at> notmuchmail.org>
+ To: Mikhail Gusarov <dottedmag <at> dottedmag.net>
+ Subject: Re: [notmuch] Working with Maildir storage?
+-In-Reply-To: <20091117203301.GV3165 <at> 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 <<EOF > EXPECTED-PRED
+ From: Notmuch Test Suite <test_suite <at> notmuchmail.org>
+ To: Lars Kellogg-Stedman <lars <at> seas.harvard.edu>
+ Cc: notmuch <at> notmuchmail.org
+ Subject: Re: [notmuch] Working with Maildir storage?
+-In-Reply-To: <20091117203301.GV3165 <at> 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 <<EOF > EXPECTED-NIL
+ From: Notmuch Test Suite <test_suite <at> notmuchmail.org>
+ To: Lars Kellogg-Stedman <lars <at> seas.harvard.edu>, Mikhail Gusarov <dottedmag <at> dottedmag.net>
+ Cc: notmuch <at> notmuchmail.org
+ Subject: Re: [notmuch] Working with Maildir storage?
+-In-Reply-To: <20091117203301.GV3165 <at> 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 <test_suite <at> notmuchmail.org>
+ To: Sean Whitton <spwhitton <at> spwhitton.name>, 916811 <at> bugs.debian.org, 916805 <at> bugs.debian.org, 916807 <at> bugs.debian.org, 916808 <at> bugs.debian.org, 916809 <at> bugs.debian.org, 916811 <at> bugs.debian.org, 916867 <at> bugs.debian.org, 916869 <at> bugs.debian.org, 916872 <at> bugs.debian.org, 916875 <at> bugs.debian.org, 916876 <at> bugs.debian.org
+ Subject: Re: [Pkg-emacsen-addons] Bug#916811: Increase severity to 'serious'
+-In-Reply-To: <87r2ecrr6x.fsf <at> zephyr.silentflame.com>
+ Fcc: MAIL_DIR/sent
+ --text follows this line--
+ Sean Whitton <spwhitton <at> spwhitton.name> writes:
+-- 
+2.41.0
+

base-commit: 51deacd8604b59aa434e944c73aecefd5183d13e
-- 
2.41.0

Message #8 received at 65298 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Arjan Adriaanse <arjan <at> adriaan.se>, 65298 <at> debbugs.gnu.org
Cc: andrew <at> trop.in
Subject: Re: [bug#65298] [PATCH emacs-team] gnu: notmuch: Fix tests with
 Emacs 29
Date: Tue, 15 Aug 2023 05:33:24 +0200

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

Message #13 received at 65298-done <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Arjan Adriaanse <arjan <at> adriaan.se>, 65298-done <at> debbugs.gnu.org
Cc: andrew <at> trop.in
Subject: Re: [bug#65298] [PATCH emacs-team] gnu: notmuch: Fix tests with
 Emacs 29
Date: Tue, 15 Aug 2023 05:34:04 +0200

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.
> 
> Thanks
And marking as done…

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.