From f591d1c02745af9ce8cf4ed7dc4ada05ca4f822b Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Wed, 29 Oct 2025 22:43:12 -0700 Subject: [PATCH] ; Skip erc-keep-place-indicator test on Emacs 27 * test/lisp/erc/erc-scenarios-base-reuse-buffers.el (erc-scenarios-common--base-reuse-buffers-channel-buffers): Extend some timeouts. * test/lisp/erc/erc-scenarios-keep-place-indicator.el (erc-scenarios-keep-place-indicator--follow): Prefer `ert-skip' here instead of an :unstable tag because ERC's tests can run locally on some systems with "SELECTOR=t". --- test/lisp/erc/erc-scenarios-base-reuse-buffers.el | 6 +++--- test/lisp/erc/erc-scenarios-keep-place-indicator.el | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/lisp/erc/erc-scenarios-base-reuse-buffers.el b/test/lisp/erc/erc-scenarios-base-reuse-buffers.el index 860cd79be11..d9d8bdaa4de 100644 --- a/test/lisp/erc/erc-scenarios-base-reuse-buffers.el +++ b/test/lisp/erc/erc-scenarios-base-reuse-buffers.el @@ -107,21 +107,21 @@ Adapted from scenario clash-of-chans/uniquify described in Bug#48598: (ert-info ("#chan@foonet is exclusive and not contaminated") (with-current-buffer "#chan/127.0.0.1" - (funcall expect 1 "") + (funcall expect 10 "") (erc-d-t-absent-for 0.1 "") (funcall expect 1 "strength to climb") (should (eq erc-server-process server-process-foo)))) (ert-info ("#chan@barnet is exclusive and not contaminated") (with-current-buffer "#chan/127.0.0.1<2>" - (funcall expect 1 "") + (funcall expect 10 "") (erc-d-t-absent-for 0.1 "") (funcall expect 1 "the loudest noise") (should (eq erc-server-process server-process-bar)))) (ert-info ("Part #chan@foonet") (with-current-buffer "#chan/127.0.0.1" - (erc-d-t-search-for 1 "shake my sword") + (erc-d-t-search-for 10 "shake my sword") (erc-cmd-PART "#chan") (funcall expect 3 "You have left channel #chan") (should-not (erc-get-channel-user (erc-current-nick))) diff --git a/test/lisp/erc/erc-scenarios-keep-place-indicator.el b/test/lisp/erc/erc-scenarios-keep-place-indicator.el index 2e0babfd2ae..7ff668f0eda 100644 --- a/test/lisp/erc/erc-scenarios-keep-place-indicator.el +++ b/test/lisp/erc/erc-scenarios-keep-place-indicator.el @@ -35,7 +35,8 @@ ,@(and (getenv "ERC_TESTS_GRAPHICAL") '(:erc--graphical))) ;; ERC's tests also run in external CI that exports this variable. - (when (getenv "CI") + ;; Skip on 27 because `erc-scrolltobottom-all' currently requires 28+. + (when (or (getenv "CI") (< emacs-major-version 28)) (ert-skip "Times out intermittently")) (should-not erc-scrolltobottom-all)