mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-05 22:20:24 -08:00
c0cb59578b
* lisp/erc/erc-backend.el (erc-server--reconnect-opened) (erc--server-reconnect-opened): Rename former to latter. Restore original buffer-local value of session connector for Emacs 29 and below. (erc--server-reconnect-timeout-check) (erc--server-reconnect-timeout-scale-function): Change from buffer-local to normal variables, which they should have been originally. (erc--recon-probe-reschedule): Ensure `erc-server-reconnect-timeout' is always non-nil to avoid seeing format specifier in admin message. Use current buffer when `proc' argument is nil. Perform cleanup when `proc' and `erc-server-process' differ. (erc-server-delayed-check-reconnect-reuse-process-p): New variable. (erc--recon-probe-sentinel): Run `erc--server-reconnect-opened' immediately because sending a speculative PING doesn't work on all servers and proxies, most crucially on ZNC, which replies with an error only after an extended timeout. (erc--recon-probe-filter): Remove unused function. (erc--recon-probe-check) Rework to not use fixed periodic timer, change second parameter to a Lisp time object. (erc-server-delayed-check-reconnect): Use realistic name when reusing process so that the session's process isn't "*erc-connectivity-check*". Set filter to `ignore'. Always run `erc--recon-probe-sentinel' when status is `open' or something other than `connect', but don't bother spawning a `erc--recon-probe-check' task as well because any problems creating the process should already be known. Handle quits during connect functions that perform blocking I/O, such as `socks-open-network-stream'. (erc-schedule-reconnect): Don't bother setting filter to nil. * test/lisp/erc/erc-scenarios-base-auto-recon.el (erc-scenarios-base-auto-recon-unavailable) (erc-scenarios-base-auto-recon-check/no-reuse): Rename former to latter. (erc-scenarios-base-auto-recon-no-proto) (erc-scenarios-base-auto-recon-check/reuse): Rename former to latter and rewrite not to expect a PING. * test/lisp/erc/resources/erc-d/erc-d.el (erc-d--forget-process): New function. (erc-d--process-sentinel): Stop serving when all dialogs have been exhausted. (Bug#62044)
143 lines
6 KiB
EmacsLisp
143 lines
6 KiB
EmacsLisp
;;; erc-scenarios-base-auto-recon.el --- auto-recon scenarios -*- lexical-binding: t -*-
|
|
|
|
;; Copyright (C) 2023-2025 Free Software Foundation, Inc.
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Code:
|
|
|
|
(require 'ert-x)
|
|
(eval-and-compile
|
|
(let ((load-path (cons (ert-resource-directory) load-path)))
|
|
(require 'erc-scenarios-common)))
|
|
|
|
;; This tests `erc-server-delayed-check-reconnect', which is called by
|
|
;; `erc-server-prefer-check-reconnect' (the default value of
|
|
;; `erc-server-reconnect-function' as of ERC 5.6.1).
|
|
|
|
(defun erc-scenarios-base-auto-recon--get-unused-port ()
|
|
(let ((server (make-network-process :name "*erc-scenarios-base-auto-recon*"
|
|
:host "localhost"
|
|
:service t
|
|
:server t)))
|
|
(delete-process server)
|
|
(process-contact server :service)))
|
|
|
|
;; This demos one possible flavor of intermittent service.
|
|
;; It may end up needing to be marked :unstable.
|
|
|
|
(ert-deftest erc-scenarios-base-auto-recon-check/no-reuse ()
|
|
:tags '(:expensive-test)
|
|
(erc-scenarios-common-with-cleanup
|
|
((erc-server-flood-penalty 0.1)
|
|
(port (erc-scenarios-base-auto-recon--get-unused-port))
|
|
(erc--server-reconnect-timeout-scale-function (lambda (_) 1))
|
|
(erc-server-auto-reconnect t)
|
|
(expect (erc-d-t-make-expecter))
|
|
(erc-scenarios-common-dialog "base/reconnect")
|
|
(erc-server-delayed-check-reconnect-reuse-process-p nil)
|
|
(dumb-server nil))
|
|
|
|
(ert-info ("Dialing fails: nobody home")
|
|
(with-current-buffer (erc :server "127.0.0.1"
|
|
:port port
|
|
:nick "tester"
|
|
:full-name "tester")
|
|
(erc-d-t-wait-for 10 (not (erc-server-process-alive)))
|
|
(erc-d-t-wait-for 10 erc--server-reconnect-timer)
|
|
(funcall expect 10 "Opening connection")
|
|
(funcall expect 10 "failed")
|
|
|
|
(ert-info ("Reconnect function freezes attempts at 1")
|
|
(funcall expect 10 '(: "reconnecting" (+ nonl) "attempt 1/2"))
|
|
(funcall expect 10 "nobody home")
|
|
(funcall expect 10 '(: "reconnecting" (+ nonl) "attempt 1/2"))
|
|
(funcall expect 10 "nobody home"))))
|
|
|
|
(ert-info ("Service appears")
|
|
(setq dumb-server (erc-d-run "localhost" port
|
|
'just-eof 'unexpected-disconnect))
|
|
(with-current-buffer (format "127.0.0.1:%d" port)
|
|
(funcall expect 10 "server is in debug mode")
|
|
(should (equal (buffer-name) "FooNet"))))
|
|
|
|
(ert-info ("Service interrupted, reconnect starts again")
|
|
(with-current-buffer "FooNet"
|
|
(funcall expect 10 "failed")
|
|
(funcall expect 10 '(: "reconnecting" (+ nonl) "attempt 1/2"))))
|
|
|
|
(ert-info ("Service restored")
|
|
(delete-process dumb-server)
|
|
(setq dumb-server (erc-d-run "localhost" port
|
|
'just-eof 'unexpected-disconnect))
|
|
(with-current-buffer "FooNet"
|
|
(funcall expect 10 "server is in debug mode")))
|
|
|
|
(ert-info ("Service interrupted a third time, reconnect starts yet again")
|
|
(with-current-buffer "FooNet"
|
|
(funcall expect 10 "failed")
|
|
(funcall expect 10 '(: "reconnecting" (+ nonl) "attempt 1/2"))
|
|
(erc-cmd-RECONNECT "cancel")
|
|
(funcall expect 10 "canceled")))))
|
|
|
|
;; Here, a listener accepts but doesn't respond to any messages.
|
|
|
|
(ert-deftest erc-scenarios-base-auto-recon-check/reuse ()
|
|
:tags '(:expensive-test)
|
|
(should erc-server-delayed-check-reconnect-reuse-process-p)
|
|
(erc-scenarios-common-with-cleanup
|
|
((erc-server-flood-penalty 0.1)
|
|
(erc-scenarios-common-dialog "base/reconnect")
|
|
(dumb-server (erc-d-run "localhost" t 'unexpected-disconnect))
|
|
(port (process-contact dumb-server :service))
|
|
(erc--server-reconnect-timeout-scale-function (lambda (_) 1))
|
|
(erc--server-reconnect-timeout-check 0.5)
|
|
(erc-server-auto-reconnect t)
|
|
(expect (erc-d-t-make-expecter)))
|
|
|
|
(ert-info ("Session succeeds but cut short")
|
|
(with-current-buffer (erc :server "127.0.0.1"
|
|
:port port
|
|
:nick "tester"
|
|
:full-name "tester")
|
|
(funcall expect 10 "server is in debug mode")
|
|
(should (equal (buffer-name) "FooNet"))
|
|
(erc-d-t-wait-for 10 erc--server-reconnect-timer)
|
|
(funcall expect 10 "failed")
|
|
|
|
(ert-info ("Reconnect function freezes attempts at 1")
|
|
(funcall expect 10 '(: "reconnecting" (+ nonl) "attempt 1/2"))
|
|
(funcall expect 10 "Timed out while dialing")
|
|
(funcall expect 10 "Nobody home")
|
|
(funcall expect 10 '(: "reconnecting" (+ nonl) "attempt 1/2"))
|
|
(funcall expect 10 "Timed out while dialing")
|
|
(funcall expect 10 "Nobody home"))))
|
|
|
|
(ert-info ("Service restored")
|
|
(delete-process dumb-server)
|
|
(setq dumb-server (erc-d-run "localhost" port
|
|
'unexpected-disconnect))
|
|
(with-current-buffer "FooNet"
|
|
(funcall expect 30 "server is in debug mode")))
|
|
|
|
(ert-info ("Service interrupted again, reconnect starts again")
|
|
(with-current-buffer "FooNet"
|
|
(funcall expect 10 "failed")
|
|
(funcall expect 10 '(: "reconnecting" (+ nonl) "attempt 1/2"))
|
|
(erc-cmd-RECONNECT "cancel")
|
|
(funcall expect 10 "canceled")))))
|
|
|
|
;;; erc-scenarios-base-auto-recon.el ends here
|