From 4be2574851b96f6adff6b621a159c1afa710b1ee Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Sat, 1 Mar 2025 06:26:33 -0800 Subject: [PATCH] ; Use ert-skip instead of skip-when in erc-match test * test/lisp/erc/erc-match-tests.el (erc-add-entry-to-list): The local macro `skip-when' first appeared in Emacs 30, but ERC supports Emacs 27+ and runs its test suite on all supported versions. * test/lisp/erc/erc-scenarios-keep-place-indicator.el (erc-scenarios-keep-place-indicator--follow): Temporarily tag as :unstable in all CI environments. --- test/lisp/erc/erc-match-tests.el | 4 +++- test/lisp/erc/erc-scenarios-keep-place-indicator.el | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/lisp/erc/erc-match-tests.el b/test/lisp/erc/erc-match-tests.el index 7c960fc7f0a..09a5394fb3c 100644 --- a/test/lisp/erc/erc-match-tests.el +++ b/test/lisp/erc/erc-match-tests.el @@ -29,7 +29,9 @@ (ert-deftest erc-add-entry-to-list () ;; These tests currently freeze in Android. - (skip-when (featurep 'android)) + (when (featurep 'android) + (ert-skip "Freezes on Android as of 31.0.50")) + (let ((erc-pals '("z")) (erc-match-quote-when-adding 'ask)) diff --git a/test/lisp/erc/erc-scenarios-keep-place-indicator.el b/test/lisp/erc/erc-scenarios-keep-place-indicator.el index e89560ae772..cb82e3ff84a 100644 --- a/test/lisp/erc/erc-scenarios-keep-place-indicator.el +++ b/test/lisp/erc/erc-scenarios-keep-place-indicator.el @@ -31,7 +31,7 @@ ;; away, the indicator is updated if it's earlier in the buffer. (ert-deftest erc-scenarios-keep-place-indicator--follow () :tags `(:expensive-test - ,@(and (getenv "EMACS_EMBA_CI") '(:unstable)) + ,@(and (getenv "CI") '(:unstable)) ,@(and (getenv "ERC_TESTS_GRAPHICAL") '(:erc--graphical))) (when (version< emacs-version "29") (ert-skip "Times out")) ;; XXX verify that this continues to be the case ^.