* test/lisp/erc/erc-scenarios-base-association-nick.el: New file. * test/lisp/erc/erc-scenarios-base-association-samenet.el: New file. * test/lisp/erc/erc-scenarios-base-association.el: New file. * test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el: New file. * test/lisp/erc/erc-scenarios-base-misc-regressions.el: New file. * test/lisp/erc/erc-scenarios-base-netid-bouncer-id.el: New file. * test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-base.el: New file. * test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-both.el: New file. * test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-id.el: New file. * test/lisp/erc/erc-scenarios-base-netid-bouncer.el: New file. * test/lisp/erc/erc-scenarios-base-netid-samenet.el: New file. * test/lisp/erc/erc-scenarios-base-reconnect.el: New file. * test/lisp/erc/erc-scenarios-base-renick.el: New file. * test/lisp/erc/erc-scenarios-base-reuse-buffers.el: New file. * test/lisp/erc/erc-scenarios-base-unstable.el: New file. * test/lisp/erc/erc-scenarios-base-upstream-recon-soju.el: New file. * test/lisp/erc/erc-scenarios-base-upstream-recon-znc.el: New file. * test/lisp/erc/erc-scenarios-misc.el: New file. * test/lisp/erc/erc-scenarios-services-misc.el: New file. * test/lisp/erc/resources/base/assoc/bouncer-history/barnet.eld: New file. * test/lisp/erc/resources/base/assoc/bouncer-history/foonet.eld: New file. * test/lisp/erc/resources/base/assoc/bumped/again.eld: New file. * test/lisp/erc/resources/base/assoc/bumped/foisted.eld: New file. * test/lisp/erc/resources/base/assoc/bumped/refoisted.eld: New file. * test/lisp/erc/resources/base/assoc/bumped/renicked.eld: New file. * test/lisp/erc/resources/base/assoc/multi-net/barnet.eld: New file. * test/lisp/erc/resources/base/assoc/multi-net/foonet.eld: New file. * test/lisp/erc/resources/base/assoc/reconplay/again.eld: New file. * test/lisp/erc/resources/base/assoc/reconplay/foonet.eld: New file. * test/lisp/erc/resources/base/assoc/samenet/chester.eld: New file. * test/lisp/erc/resources/base/assoc/samenet/tester.eld: New file. * test/lisp/erc/resources/base/assoc/samenet/tester2.eld: New file. * test/lisp/erc/resources/base/channel-buffer-revival/foonet.eld: New file. * test/lisp/erc/resources/base/flood/soju.eld: New file. * test/lisp/erc/resources/base/gapless-connect/barnet.eld: New file. * test/lisp/erc/resources/base/gapless-connect/foonet.eld: New file. * test/lisp/erc/resources/base/gapless-connect/pass-stub.eld: New file. * test/lisp/erc/resources/base/netid/bouncer/barnet-again.eld: New file. * test/lisp/erc/resources/base/netid/bouncer/barnet-drop.eld: New file. * test/lisp/erc/resources/base/netid/bouncer/barnet.eld: New file. * test/lisp/erc/resources/base/netid/bouncer/foonet-again.eld: New file. * test/lisp/erc/resources/base/netid/bouncer/foonet-drop.eld: New file. * test/lisp/erc/resources/base/netid/bouncer/foonet.eld: New file. * test/lisp/erc/resources/base/netid/bouncer/stub-again.eld: New file. * test/lisp/erc/resources/base/netid/samenet/chester.eld: New file. * test/lisp/erc/resources/base/netid/samenet/tester.eld: New file. * test/lisp/erc/resources/base/reconnect/aborted-dupe.eld: New file. * test/lisp/erc/resources/base/reconnect/aborted.eld: New file. * test/lisp/erc/resources/base/reconnect/options-again.eld: New file. * test/lisp/erc/resources/base/reconnect/options.eld: New file. * test/lisp/erc/resources/base/reconnect/timer-last.eld: New file. * test/lisp/erc/resources/base/reconnect/timer.eld: New file. * test/lisp/erc/resources/base/renick/queries/bouncer-barnet.eld: New file. * test/lisp/erc/resources/base/renick/queries/bouncer-foonet.eld: New file. * test/lisp/erc/resources/base/renick/queries/solo.eld: New file. * test/lisp/erc/resources/base/renick/self/auto.eld: New file. * test/lisp/erc/resources/base/renick/self/manual.eld: New file. * test/lisp/erc/resources/base/renick/self/qual-chester.eld: New file. * test/lisp/erc/resources/base/renick/self/qual-tester.eld: New file. * test/lisp/erc/resources/base/reuse-buffers/server/barnet.eld: New file. * test/lisp/erc/resources/base/reuse-buffers/server/foonet.eld: New file. * test/lisp/erc/resources/base/upstream-reconnect/soju-barnet.eld: New file. * test/lisp/erc/resources/base/upstream-reconnect/soju-foonet.eld: New file. * test/lisp/erc/resources/base/upstream-reconnect/znc-barnet.eld: New file. * test/lisp/erc/resources/base/upstream-reconnect/znc-foonet.eld: New file. * test/lisp/erc/resources/erc-scenarios-common.el: New file. * test/lisp/erc/resources/networks/announced-missing/foonet.eld: New file. * test/lisp/erc/resources/services/password/libera.eld: New file. Add test cases for locking down fundamental client behavior, much of it involving the relationship between buffers and connections. Also add accompanying resources subdir containing canned dialog scripts and common code needed by various tests. For test cases demoing the problematic behavior originally described in the initial report, see update #4 on the bug tracker thread for bug#48598. Most reside in a file named test/lisp/erc/erc-scenarios-48598.el introduced by the patch "Add user-oriented test scenarios for ERC".
192 lines
7.9 KiB
EmacsLisp
192 lines
7.9 KiB
EmacsLisp
;;; erc-scenarios-base-association.el --- base assoc scenarios -*- lexical-binding: t -*-
|
|
|
|
;; Copyright (C) 2022 Free Software Foundation, Inc.
|
|
;;
|
|
;; This file is part of GNU Emacs.
|
|
;;
|
|
;; This program 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.
|
|
;;
|
|
;; This program 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 this program. If not, see
|
|
;; <https://www.gnu.org/licenses/>.
|
|
|
|
(require 'ert-x)
|
|
(eval-and-compile
|
|
(let ((load-path (cons (ert-resource-directory) load-path)))
|
|
(require 'erc-scenarios-common)))
|
|
|
|
(declare-function erc-network-name "erc-networks")
|
|
(declare-function erc-network "erc-networks")
|
|
(defvar erc-autojoin-channels-alist)
|
|
(defvar erc-network)
|
|
|
|
;; Two networks, same channel name, no confusion (no bouncer). Some
|
|
;; of this draws from bug#47522 "foil-in-server-buf". It shows that
|
|
;; disambiguation-related changes added for bug#48598 are not specific
|
|
;; to bouncers.
|
|
|
|
(defun erc-scenarios-common--base-association-multi-net (second-join)
|
|
(erc-scenarios-common-with-cleanup
|
|
((erc-scenarios-common-dialog "base/assoc/multi-net")
|
|
(erc-server-flood-penalty 0.1)
|
|
(dumb-server-foonet-buffer (get-buffer-create "*server-foonet*"))
|
|
(dumb-server-barnet-buffer (get-buffer-create "*server-barnet*"))
|
|
(dumb-server-foonet (erc-d-run "localhost" t "server-foonet" 'foonet))
|
|
(dumb-server-barnet (erc-d-run "localhost" t "server-barnet" 'barnet))
|
|
(expect (erc-d-t-make-expecter)))
|
|
|
|
(ert-info ("Connect to foonet, join #chan")
|
|
(with-current-buffer
|
|
(erc :server "127.0.0.1"
|
|
:port (process-contact dumb-server-foonet :service)
|
|
:nick "tester"
|
|
:password "changeme"
|
|
:full-name "tester")
|
|
(funcall expect 3 "debug mode")
|
|
(erc-cmd-JOIN "#chan")))
|
|
|
|
(erc-d-t-wait-for 2 (get-buffer "#chan"))
|
|
|
|
(ert-info ("Connect to barnet, join #chan")
|
|
(with-current-buffer
|
|
(erc :server "127.0.0.1"
|
|
:port (process-contact dumb-server-barnet :service)
|
|
:nick "tester"
|
|
:password "changeme"
|
|
:full-name "tester")
|
|
(funcall expect 5 "debug mode")))
|
|
|
|
(funcall second-join)
|
|
|
|
(erc-d-t-wait-for 3 (get-buffer "#chan@barnet"))
|
|
|
|
(erc-d-t-wait-for 2 "Buf #chan now #chan@foonet"
|
|
(and (get-buffer "#chan@foonet") (not (get-buffer "#chan"))))
|
|
|
|
(ert-info ("All #chan@foonet output consumed")
|
|
(with-current-buffer "#chan@foonet"
|
|
(funcall expect 3 "bob")
|
|
(funcall expect 3 "was created on")
|
|
(funcall expect 3 "prosperous")))
|
|
|
|
(ert-info ("All #chan@barnet output consumed")
|
|
(with-current-buffer "#chan@barnet"
|
|
(funcall expect 3 "mike")
|
|
(funcall expect 3 "was created on")
|
|
(funcall expect 20 "ingenuous")))))
|
|
|
|
(ert-deftest erc-scenarios-base-association-multi-net--baseline ()
|
|
:tags '(:expensive-test)
|
|
(erc-scenarios-common--base-association-multi-net
|
|
(lambda () (with-current-buffer "barnet" (erc-cmd-JOIN "#chan")))))
|
|
|
|
;; The /join command only targets the current buffer's process. This
|
|
;; recasts scenario bug#48598 "ambiguous-join" (which was based on
|
|
;; bug#47522) to show that issuing superfluous /join commands
|
|
;; (apparently fairly common) is benign.
|
|
|
|
(ert-deftest erc-scenarios-base-association-multi-net--ambiguous-join ()
|
|
:tags '(:expensive-test)
|
|
(erc-scenarios-common--base-association-multi-net
|
|
(lambda ()
|
|
(ert-info ("Nonsensical JOIN attempts silently dropped.")
|
|
(with-current-buffer "foonet" (erc-cmd-JOIN "#chan"))
|
|
(sit-for 0.1)
|
|
(with-current-buffer "#chan" (erc-cmd-JOIN "#chan"))
|
|
(sit-for 0.1)
|
|
(erc-d-t-wait-for 2 (get-buffer "#chan"))
|
|
(erc-d-t-wait-for 1 "Only one #chan buffer exists"
|
|
(should (equal (erc-scenarios-common-buflist "#chan")
|
|
(list (get-buffer "#chan")))))
|
|
(with-current-buffer "*server-barnet*"
|
|
(erc-d-t-absent-for 0.1 "JOIN"))
|
|
(with-current-buffer "barnet" (erc-cmd-JOIN "#chan"))))))
|
|
|
|
;; Playback for same channel on two networks routed correctly.
|
|
;; Originally from Bug#48598: 28.0.50; buffer-naming collisions
|
|
;; involving bouncers in ERC.
|
|
|
|
(ert-deftest erc-scenarios-base-association-bouncer-history ()
|
|
:tags '(:expensive-test)
|
|
(erc-scenarios-common-with-cleanup
|
|
((erc-scenarios-common-dialog "base/assoc/bouncer-history")
|
|
(erc-d-t-cleanup-sleep-secs 1)
|
|
(dumb-server (erc-d-run "localhost" t 'foonet 'barnet))
|
|
(port (process-contact dumb-server :service))
|
|
(erc-server-flood-penalty 0.5)
|
|
(expect (erc-d-t-make-expecter))
|
|
erc-autojoin-channels-alist
|
|
erc-server-buffer-foo erc-server-process-foo
|
|
erc-server-buffer-bar erc-server-process-bar)
|
|
|
|
(ert-info ("Connect to foonet")
|
|
(with-current-buffer
|
|
(setq erc-server-buffer-foo (erc :server "127.0.0.1"
|
|
:port port
|
|
:nick "tester"
|
|
:password "foonet:changeme"
|
|
:full-name "tester"))
|
|
(setq erc-server-process-foo erc-server-process)
|
|
(should (string= (buffer-name) (format "127.0.0.1:%d" port)))
|
|
(funcall expect 5 "foonet")))
|
|
|
|
(erc-d-t-wait-for 5 (get-buffer "#chan"))
|
|
|
|
(ert-info ("Connect to barnet")
|
|
(with-current-buffer
|
|
(setq erc-server-buffer-bar (erc :server "127.0.0.1"
|
|
:port port
|
|
:nick "tester"
|
|
:password "barnet:changeme"
|
|
:full-name "tester"))
|
|
(setq erc-server-process-bar erc-server-process)
|
|
(erc-d-t-wait-for 5 "Temporary name assigned"
|
|
(string= (buffer-name) (format "127.0.0.1:%d" port)))
|
|
(funcall expect 5 "barnet")))
|
|
|
|
(ert-info ("Server buffers are unique")
|
|
(should-not (eq erc-server-buffer-foo erc-server-buffer-bar)))
|
|
|
|
(ert-info ("Networks correctly determined and adopted as buffer names")
|
|
(with-current-buffer erc-server-buffer-foo
|
|
(erc-d-t-wait-for 3 "network name foonet becomes buffer name"
|
|
(and (eq (erc-network) 'foonet) (string= (buffer-name) "foonet"))))
|
|
(with-current-buffer erc-server-buffer-bar
|
|
(erc-d-t-wait-for 3 "network name barnet becomes buffer name"
|
|
(and (eq (erc-network) 'barnet) (string= (buffer-name) "barnet")))))
|
|
|
|
(erc-d-t-wait-for 5 (get-buffer "#chan@barnet"))
|
|
|
|
(ert-info ("Two channel buffers created, original #chan renamed")
|
|
(should (= 4 (length (erc-buffer-list))))
|
|
(should (equal (list (get-buffer "#chan@barnet")
|
|
(get-buffer "#chan@foonet"))
|
|
(erc-scenarios-common-buflist "#chan"))))
|
|
|
|
(ert-info ("#chan@foonet is exclusive, no cross-contamination")
|
|
(with-current-buffer "#chan@foonet"
|
|
(erc-d-t-search-for 1 "<bob>")
|
|
(erc-d-t-absent-for 0.1 "<joe>")
|
|
(should (eq erc-server-process erc-server-process-foo))))
|
|
|
|
(ert-info ("#chan@barnet is exclusive, no cross-contamination")
|
|
(with-current-buffer "#chan@barnet"
|
|
(erc-d-t-search-for 1 "<joe>")
|
|
(erc-d-t-absent-for 0.1 "<bob>")
|
|
(should (eq erc-server-process erc-server-process-bar))))
|
|
|
|
(ert-info ("All output sent")
|
|
(with-current-buffer "#chan@foonet"
|
|
(erc-d-t-search-for 10 "please your lordship"))
|
|
(with-current-buffer "#chan@barnet"
|
|
(erc-d-t-search-for 10 "I'll bid adieu")))))
|
|
|
|
;;; erc-scenarios-base-association.el ends here
|