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 s/ganeti.scm?id=706f25f24dab13dff69e7977b5d84269c1dfa293'>services: ganeti: OS variants can be a directory....* gnu/services/ganeti.scm (<ganeti-os>)[extension]: Default to #f. (ganeti-os->directory): Only add extension if set. Support a file-like object for VARIANTS. * doc/guix.texi (Virtualization Services): Document this change and add example. Update Ganeti URLs while at it. Marius Bakke 2021-11-30services: Accept <inferior-package>s in lieu of <package>s....* gnu/services/authentication.scm (fprintd-configuration) (nslcd-configuration): Substitute file-like objects for package ones. * gnu/services/cgit.scm (cgit-configuration, opaque-cgit-configuration): Likewise. * gnu/services/cups.scm (package-list?, cups-configuration): Likewise. * gnu/services/dns.scm (verify-knot-configuration) (ddclient-configuration): Likewise. * gnu/services/docker.scm (docker-configuration): Likewise. * gnu/services/file-sharing.scm (transmission-daemon-configuration): Likewise. * gnu/services/getmail.scm (getmail-configuration): Likewise. * gnu/services/mail.scm (dovecot-configuration) (opaque-dovecot-configuration): Likewise. * gnu/services/messaging.scm (prosody-configuration) (opaque-prosody-configuration): Likewise. * gnu/services/monitoring.scm (zabbix-server-configuration) (zabbix-agent-configuration): Likewise. * gnu/services/networking.scm (opendht-configuration): Likewise. * gnu/services/pm.scm (tlp-configuration): Likewise. * gnu/services/telephony.scm (jami-configuration): Likewise. * gnu/services/virtualization.scm (libvirt-configuration) (qemu-guest-agent-configuration): Likewise. * gnu/services/vpn.scm (openvpn-client-configuration): Likewise. Tobias Geerinckx-Rice 2021-10-11services: ganeti: Don't start the metadata daemon automatically....* gnu/services/ganeti.scm (ganeti-metad-service)[auto-start?]: New field. Marius Bakke