procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

; Don't assume snapshot exists in ERC test helper

Browse source 
* test/lisp/erc/erc-scenarios-base-association.el
(erc-scenarios-common--base-association-multi-net): Increase timeout.
* test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el
(erc-scenarios-common--base-compat-no-rename-bouncer): Increase timeout.
* test/lisp/erc/erc-scenarios-keep-place-indicator.el
(erc-scenarios-keep-place-indicator--follow): Skip in CI.
* test/lisp/erc/resources/erc-d/resources/incremental.eld: Increase
timeout.
* test/lisp/erc/resources/erc-tests-common.el
(erc-tests-common-snapshot-compare): Forgo inserting file if generating
snapshot interactively because it may not yet exist.
This commit is contained in:
F. Jason Park 2025-04-13 21:30:34 -07:00
parent c5b97b7b32
commit 8f18b398a5
5 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/lisp/erc/erc-scenarios-base-association.el
View file

@ -53,7 +53,7 @@
:nick "tester"
:password "changeme"
:full-name "tester")
(funcall expect 3 "debug mode")
(funcall expect 10 "debug mode")
(erc-cmd-JOIN "#chan")))
(erc-d-t-wait-for 2 (get-buffer "#chan"))

2
test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el
View file

@ -76,7 +76,7 @@
:full-name "tester"
:id nil))
(setq erc-server-process-bar erc-server-process)
(erc-d-t-wait-for 3 (eq (erc-network) 'barnet))
(erc-d-t-wait-for 10 (eq (erc-network) 'barnet))
(erc-d-t-wait-for 3 "Final buffer name determined"
(string= (buffer-name) (format "127.0.0.1:%d<2>" port)))
(funcall expect 5 "barnet")))

5
test/lisp/erc/erc-scenarios-keep-place-indicator.el
View file

@ -33,8 +33,9 @@
:tags `(:expensive-test
,@(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 ^.
(when (getenv "CI")
(ert-skip "Times out intermittently"))
(should-not erc-scrolltobottom-all)
(should-not erc-scrolltobottom-mode)

2
test/lisp/erc/resources/erc-d/resources/incremental.eld
View file

@ -17,7 +17,7 @@
(0.0 ":irc.foo.net 266 tester 3 3 :Current global users 3, max 3")
(0.0 ":irc.foo.net 422 tester :MOTD File is missing"))
((mode-user 1.2 "MODE tester +i")
((mode-user 3 "MODE tester +i")
(0.0 ":irc.foo.net 221 tester +Zi")
(0.0 ":irc.foo.net 306 tester :You have been marked as being away"))

16
test/lisp/erc/resources/erc-tests-common.el
View file

@ -291,18 +291,13 @@ string."
(got (erc--remove-text-properties
(buffer-substring (point-min) erc-insert-marker)))
(repr (funcall (or trans-fn #'identity) (prin1-to-string got)))
(xstr (read (with-temp-buffer
(insert-file-contents-literally expect-file)
(buffer-string)))))
;;
xstr)
(with-current-buffer (generate-new-buffer name)
(with-silent-modifications
(insert (setq got (read repr))))
(when buf-init-fn (funcall buf-init-fn))
(erc-mode))
(unless noninteractive
(with-current-buffer (generate-new-buffer (format "%s-xpt" name))
(insert xstr)
(erc-mode)))
;; LHS is a string, RHS is a symbol.
(if (string= erc-tests-common-snapshot-save-p
(ert-test-name (ert-running-test)))
@ -311,6 +306,13 @@ string."
(insert repr))
;; Limit writing snapshots to one test at a time.
(message "erc-tests-common-snapshot-compare: wrote %S" expect-file))
(setq xstr (read (with-temp-buffer
(insert-file-contents-literally expect-file)
(buffer-string))))
(unless noninteractive
(with-current-buffer (generate-new-buffer (format "%s-xpt" name))
(insert xstr)
(erc-mode)))
(if (file-exists-p expect-file)
;; Ensure string-valued properties, like timestamps, aren't
;; recursive (signals `max-lisp-eval-depth' exceeded).