mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-06-14 12:31:25 +00:00
; 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".
This commit is contained in:
parent
b01435306a
commit
f591d1c027
2 changed files with 5 additions and 4 deletions
|
|
@ -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 "<bob>")
|
||||
(funcall expect 10 "<bob>")
|
||||
(erc-d-t-absent-for 0.1 "<joe>")
|
||||
(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 "<joe>")
|
||||
(funcall expect 10 "<joe>")
|
||||
(erc-d-t-absent-for 0.1 "<bob>")
|
||||
(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)))
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue