From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: "J.P." Newsgroups: gmane.emacs.bugs,gmane.emacs.erc.general Subject: bug#48598: 28.0.50; buffer-naming collisions involving bouncers in ERC Date: Thu, 11 Nov 2021 07:15:41 -0800 Message-ID: <874k8i4tb6.fsf@neverwas.me> References: <875yzakzvi.fsf@neverwas.me> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="10308"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.60 (gnu/linux) Cc: emacs-erc@gnu.org To: 48598@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Nov 11 16:17:30 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mlBpP-0008Zx-Pg for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 11 Nov 2021 16:17:30 +0100 Original-Received: from localhost ([::1]:40470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mlBpO-00013k-OQ for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 11 Nov 2021 10:17:26 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:36546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlBp0-00012l-Sl for bug-gnu-emacs@gnu.org; Thu, 11 Nov 2021 10:17:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:58663) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mlBp0-0001iy-C4 for bug-gnu-emacs@gnu.org; Thu, 11 Nov 2021 10:17:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mlBp0-00077J-4b for bug-gnu-emacs@gnu.org; Thu, 11 Nov 2021 10:17:02 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: <875yzakzvi.fsf@neverwas.me> Resent-From: "J.P." Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 11 Nov 2021 15:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48598 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.163664378027291 (code B ref -1); Thu, 11 Nov 2021 15:17:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 11 Nov 2021 15:16:20 +0000 Original-Received: from localhost ([127.0.0.1]:41977 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlBoK-000767-Mb for submit@debbugs.gnu.org; Thu, 11 Nov 2021 10:16:20 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:40532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlBoI-00075x-Ux for submit@debbugs.gnu.org; Thu, 11 Nov 2021 10:16:19 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:36310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlBoI-0008DU-Oh for bug-gnu-emacs@gnu.org; Thu, 11 Nov 2021 10:16:18 -0500 Original-Received: from mail-108-mta56.mxroute.com ([136.175.108.56]:35347) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mlBnt-0001Nc-BS for bug-gnu-emacs@gnu.org; Thu, 11 Nov 2021 10:16:18 -0500 Original-Received: from filter004.mxroute.com ([149.28.56.236] filter004.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta56.mxroute.com (ZoneMTA) with ESMTPSA id 17d0f91b7ad0000b55.001 for (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256); Thu, 11 Nov 2021 15:15:47 +0000 X-Zone-Loop: eb911ea4c631f759c97296b13820043f47bfe3234b76 X-Originating-IP: [149.28.56.236] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=neverwas.me ; s=x; h=Content-Type:MIME-Version:Message-ID:Date:References:Subject:Cc:To: From:Sender:Reply-To:Content-Transfer-Encoding:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=/Lm1fn5MhUWSPZS8Qxihr3Ml/7CYX+KL492L2HGVO8k=; b=i s3DEeqZgZufMAYKw7RLmDtynxQQZISeb+793DhLkL3I+nqFeCgwoGZ1GO+CvrlcTJpW99Bcyrs91X FiYadsPXGKjXbzhSAfNFryJN0OFlOGWWLNr2EcQSNXoNDnEkogSaBmpKagFv26L1T4GrQu2ffVY1Y g3t/qu6JHGSid3pdkfI3oCJXM4HfwSDWF1kgBU4J/vj+Yki8qOL78aMIbQndu9+Wy7Gx1jUh6b6jE WKDgCldW1uR0c/vQO+h9wCEqWxrR6IfIdfNG9DLEM2B56EJGBIvsn+h5fjcj4afs3vcxTcrjY2P3X nnM0aBK7kFlWzXPlW8muS/xNsSx/SkmwQ==; X-AuthUser: masked@neverwas.me X-Zone-Spam-Resolution: no action X-Zone-Spam-Status: No, score=-0.1, required=15, tests=[ARC_NA=0, RCPT_COUNT_TWO=0, FROM_HAS_DN=0, NEURAL_HAM=0, HAS_ATTACHMENT=0, FROM_EQ_ENVFROM=0, MIME_TRACE=0, MIME_GOOD=-0.1, TO_DN_NONE=0, MID_RHS_MATCH_FROM=0, RCVD_COUNT_ZERO=0] Received-SPF: pass client-ip=136.175.108.56; envelope-from=jp@neverwas.me; helo=mail-108-mta56.mxroute.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, WEIRD_PORT=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:219647 gmane.emacs.erc.general:1654 Archived-At: --=-=-= Content-Type: text/plain Update #4 With the six-month anniversary of this bug around the corner, another progress report seemed appropriate. Administrative - I've cleared the /cc list for these updates because everyone on it is already subscribed to emacs-erc anyway - The version numbers for the fake ELPA packages introduced in update #3 have changed to something like 5.4.1.48598.20211024.5 - The repo path for the patches has changed as well [1], but the download URL and the packages.el endpoint are still good [2] - A checkpoint in the form of a random snapshot accompanies this post Session IDs Mentioned in update #2, the addition of an :id param for entry-point commands `erc' and `erc-tls' remains in place. However, the local variable `erc-session-id' previously used to store it is no more. Instead, a composite type called `erc--sid' (currently a struct) takes care of this, and a local variable called `erc--session' holds the instances [3]. At the moment, the base scheme for these sessions includes: 1. a timestamp indicating when the session was created 2. a human friendly ID, unique across all sessions And the default flavor [4] adds a couple more ingredients: 3. a sequence of components from which to construct 2 4. the length of the visible/active portion of 3 Server buffers The option `erc-rename-buffers' was implemented rather oddly and only operated on server buffers (which the doc string doesn't mention). Regardless, this bug's patch set moves to deprecate it and change its default value to t. But out of respect for tradition, the former default of nil will still be honored (provided an :id wasn't passed to `erc-open'). As for anyone unlucky enough to have accidentally set this to the old default permanently: I suppose they'll have to settle for a more reliable version of the old -based uniquification behavior (for as long as they ignore the deprecation warning, anyway). IOW, they too should be free of any buffer-association problems. Buffer targets The variable `erc-default-recipients' and its various helpers can't be relied upon to produce consistent behavior if we're to respect the existing API [5]. The aspects in question have been around almost a quarter century, and even though I'd wager no one's ever used them, we likely can't go about "fixing" them now. Instead, I've provided what are hopefully more consistent alternatives for use in newer code. I've held off on weaving them into existing code, but doing so would free us from continually checking whether targets are channels or queries. These "alternatives" are currently just a local variable called `erc--buffer-target' and a struct called `erc--target'. The former holds instances of the latter, which is composed of: 1. a string with the original name as received from the server 2. a casemapped symbol for quick `eq' testing 3. a boolean indicating whether this target is a channel 4. a boolean indicating whether this target is a local channel I didn't add any public getters or setters here either but certainly can if needed. We could also make 3 and (maybe) 4 distinct subtypes, but I don't see any clear advantage in doing so. Auth-source I've also attempted to unify auth-source lookups and make their results more predictable based on context. IMO, both the session parameters and the "type" of credentials sought (NickServ, certfp, PASS, etc.) really do matter and shouldn't be painted with the same brush. I'm not terribly enthused by my current approach, so please offer suggestions/alternatives/shade. Auto-join A recent commit improved the situation here for the better [6], but it also altered the default behavior, which at least one person on Libera has pointed out. (Actually, with regard to the behavior in question, the commit merely restored an earlier practice of favoring announced names over dialed ones.) Anyway, in the spirit of minimizing churn, it may be more prudent to fall back on *always* matching dialed servers. I've recently added a patch to that effect as the first in this series, but it (along with most everything else) needs proper vetting. Notes ~~~~~ [1] AFAIK, GitLab doesn't provide patch-file based interdiffing, so comparing iterations is a sad affair, but here's the updated path anyway: https://gitlab.com/jpneverwas/erc-tools/-/tree/master/bugs/48598/patches/wip (I also keep a standalone ERC repo with patches from another bug applied periodically. If doing the same for this bug would make staying abreast of changes easier, someone please say so.) [2] https://jpneverwas.gitlab.io/erc-tools/48598/patches.tar.gz [3] I've stuck with the term "session" to describe the kind of logical IRC connection that outlasts physical connections but (currently) dies along with Emacs. If someone has a better suggestion, I'm all ears. For the struct, I went with SID because it's shorter than ESID (effective) or LSID (logical), etc. Also, all new functions and variables (save for options) follow the internal double-hyphen convention. I figure we can always add getters/setters later as needed. [4] As things stand, a session can either be "assigned" by the user or "derived" from session parameters available for discovery by MOTD's end (the logical connection boundary). For the default "derived" variant, IDs are rendered as paths, presumably from some hierarchy whose first two levels are the network and the normalized nick. The length (4) can normally only be incremented. When it is, the id (2) is recomputed. The same goes for whenever the components (3) change, like in the case of a re-NICK. [5] I'm speaking specifically about the fact that this variable often holds more than one item and that these can be (but usually aren't) non-strings. These peculiar facets were present in the very first commit to the CVS repo back in 2001 and haven't changed since. https://gitlab.com/jpneverwas/og-erc/-/blame/master/erc.el#L4990 [6] https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=9bb8d90cdd --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Fall-back-on-dialed-server-names-in-erc-join.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Wed, 10 Nov 2021 23:42:42 -0800 Subject: [PATCH 01/28] Fall back on dialed server names in erc-join * lisp/erc/erc-join.el (erc-autojoin-server-match, erc-autojoin-current-server): as a fallback, always try the original server param passed to `erc-open' when matching against members of `erc-autojoin-channels-alist'. Similarly, when adding and removing items, only apply the `erc-autojoin-domain-only' truncation treatment to "announced" servers. --- lisp/erc/erc-join.el | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el index 2ed8622b85..1a6bdedc98 100644 --- a/lisp/erc/erc-join.el +++ b/lisp/erc/erc-join.el @@ -103,7 +103,11 @@ erc-autojoin-domain-only If non-nil, and a channel on the server a.b.c is joined, then only b.c is used as the server for `erc-autojoin-channels-alist'. This is important for networks that redirect you to other -servers, presumably in the same domain." +servers, presumably in the same domain. + +This treatment will only be applied to so-called \"announced names\", +like zirconium.libera.chat, but not to \"dialed\" hostnames, like +my.proxy.localdomain or my.vps.example.com." :type 'boolean) (defvar-local erc--autojoin-timer nil) @@ -127,9 +131,9 @@ erc-autojoin-server-match This should be a key from `erc-autojoin-channels-alist'." (or (eq candidate (erc-network)) (and (stringp candidate) - (string-match-p candidate - (or erc-server-announced-name - erc-session-server))))) + (or (and erc-server-announced-name ; unnecessary after #48598 + (string-match-p candidate erc-server-announced-name)) + (string-match-p candidate erc-session-server))))) (defun erc-autojoin-after-ident (_network _nick) "Autojoin channels in `erc-autojoin-channels-alist'. @@ -184,11 +188,12 @@ erc-autojoin-channels (defun erc-autojoin-current-server () "Compute the current server for lookup in `erc-autojoin-channels-alist'. Respects `erc-autojoin-domain-only'." - (let ((server (or erc-server-announced-name erc-session-server))) - (if (and erc-autojoin-domain-only - (string-match "[^.\n]+\\.\\([^.\n]+\\.[^.\n]+\\)$" server)) - (match-string 1 server) - server))) + (if (and erc-autojoin-domain-only + erc-server-announced-name + (string-match "[^.\n]+\\.\\([^.\n]+\\.[^.\n]+\\)$" + erc-server-announced-name)) + (match-string 1 erc-server-announced-name) + erc-session-server)) (defun erc-autojoin-add (proc parsed) "Add the channel being joined to `erc-autojoin-channels-alist'." -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-Don-t-set-erc-server-announced-name-unless-known.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Mon, 14 Jun 2021 23:40:45 -0700 Subject: [PATCH 02/28] Don't set erc-server-announced-name unless known * lisp/erc/erc.el (erc-open): whenever this function is called, the variable `erc-server-announced-name' may be set locally in the calling server buffer. However, if that buffer's dialed server matches that of the one being created, the announced name is copied over on faith. But there's no guarantee that the name will match the one ultimately emitted by the server during its introductory burst. Beyond potentially causing confusion in protocol logs, this behavior may complicate debugging efforts. Setting the variable to nil helps ensure a consistent environment when preparing buffer for all newly dialed connections. This commit also simplifies the setting of `erc-server-connected', which is always nil when connecting and vice-versa. --- lisp/erc/erc.el | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 3028568753..4a9d153553 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1993,11 +1993,7 @@ erc-open private key and the certificate. Returns the buffer for the given server or channel." - (let ((server-announced-name (when (and (boundp 'erc-session-server) - (string= server erc-session-server)) - erc-server-announced-name)) - (connected-p (unless connect erc-server-connected)) - (buffer (erc-get-buffer-create server port channel)) + (let ((buffer (erc-get-buffer-create server port channel)) (old-buffer (current-buffer)) old-point continued-session) @@ -2008,8 +2004,9 @@ erc-open (let ((old-recon-count erc-server-reconnect-count)) (erc-mode) (setq erc-server-reconnect-count old-recon-count)) - (setq erc-server-announced-name server-announced-name) - (setq erc-server-connected connected-p) + (when (setq erc-server-connected (not connect)) + (setq erc-server-announced-name (with-current-buffer old-buffer + erc-server-announced-name))) ;; connection parameters (setq erc-server-process process) (setq erc-insert-marker (make-marker)) -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0003-Require-erc-networks-in-erc.el.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Tue, 17 Aug 2021 01:50:29 -0700 Subject: [PATCH 03/28] Require erc-networks in erc.el * lisp/erc/erc.el: Require erc-networks.el, which ERC can't run without these days. To sidestep the circular dependency, require it last, just after erc-goodies, and insert a `declare-function' for `erc-network' before it's used. It may be preferable to move this and the counterpart for `erc-network-name' to the top of the file in a followup commit. Note requiring this library isn't the same as auto-enabling the module because the hooks still won't be registered. (erc-log-irc-protocol, erc-hide-current-message-p, erc-handle-irc-url): Remove `fboundp' guard logic from `erc-network-name' invocations but preserve meaning by interpreting `erc-network' being unset to mean module isn't loaded or authoritative network detection has failed. (erc-format-network): Likewise here because, ATM, this function always returns "" because the function `erc-network-name' always returns non-nil, perhaps from the fallback/failure sentinel "Unknown", perhaps from the printed form of nil. * lisp/erc/erc-networks.el (erc-network): Don't autoload erc-determine-network, which only runs once per session and for which third-party code has little use. OTOH, erc-network is de facto require'd by erc.el and is cumbersome to use when guarded everywhere by fboundp. --- lisp/erc/erc-networks.el | 3 +-- lisp/erc/erc.el | 14 ++++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el index 678c596760..6ec5bc74a8 100644 --- a/lisp/erc/erc-networks.el +++ b/lisp/erc/erc-networks.el @@ -733,7 +733,6 @@ erc-network ;; Functions: -;;;###autoload (defun erc-determine-network () "Return the name of the network or \"Unknown\" as a symbol. Use the server parameter NETWORK if provided, otherwise parse the @@ -753,7 +752,7 @@ erc-determine-network (defun erc-network () "Return the value of `erc-network' for the current server." - (erc-with-server-buffer erc-network)) + (or erc-network (erc-with-server-buffer erc-network))) (defun erc-network-name () "Return the name of the current network as a string." diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 4a9d153553..a06166b565 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1595,6 +1595,8 @@ erc-port-equal "Check whether ports A and B are equal." (= (erc-normalize-port a) (erc-normalize-port b))) +(declare-function 'erc-network "erc-networks") + (defun erc-generate-new-buffer-name (server port target) "Create a new buffer name based on the arguments." (when (numberp port) (setq port (number-to-string port))) @@ -2354,9 +2356,7 @@ erc-log-irc-protocol available at run time, starting with the network name, followed by the announced host name, and falling back to the dialed :." (when erc-debug-irc-protocol - (let ((esid (or (and (fboundp 'erc-network) - (erc-network) - (erc-network-name)) + (let ((esid (or (and (erc-network) (erc-network-name)) erc-server-announced-name (format "%s:%s" erc-session-server erc-session-port))) (ts (when erc-debug-irc-protocol-time-format @@ -2758,7 +2758,7 @@ erc-hide-current-message-p (let* ((command (erc-response.command parsed)) (sender (car (erc-parse-user (erc-response.sender parsed)))) (channel (car (erc-response.command-args parsed))) - (network (or (and (fboundp 'erc-network-name) (erc-network-name)) + (network (or (and (erc-network) (erc-network-name)) (erc-shorten-server-name (or erc-server-announced-name erc-session-server)))) @@ -6492,10 +6492,7 @@ erc-format-target-and/or-server (defun erc-format-network () "Return the name of the network we are currently on." - (let ((network (and (fboundp 'erc-network-name) (erc-network-name)))) - (if (and network (symbolp network)) - (symbol-name network) - ""))) + (erc-network-name)) (defun erc-format-target-and/or-network () "Return the network or the current target and network combined. @@ -7046,5 +7043,6 @@ erc-handle-irc-url ;; IMPORTANT: This require must appear _after_ the above (provide 'erc) to ;; avoid a recursive require error when byte-compiling the entire package. (require 'erc-goodies) +(require 'erc-networks) ;;; erc.el ends here -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-Update-ISUPPORT-handling-in-ERC.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Thu, 12 Aug 2021 03:10:31 -0700 Subject: [PATCH 04/28] Update ISUPPORT handling in ERC * lisp/erc/erc-backend (erc-server-parameters, erc-isupport-parameters): Add new variable to hold an alist of parsed erc-server-parameters in a more useful format. Deprecate erc-server-parameters. (erc-parse-isupport-value): Add helper function that parses an ISUPPORT value and returns the component parts with backslash-x hex escapes removed. (erc-server-005): Treat erc-server-response "command args" field as read-only. Prior to this, this field was set to nil after processing, which was unhelpful to other parts of the library. Also call above mentioned helper to parse values. And add some bookkeeping to handle negation. * test/lisp/erc/erc-tests.el: Add tests for the above mentioned changes in erc-backend.el. --- lisp/erc/erc-backend.el | 76 +++++++++++++++++++++++++++++++------- lisp/erc/erc-capab.el | 2 +- lisp/erc/erc.el | 12 +++--- test/lisp/erc/erc-tests.el | 68 ++++++++++++++++++++++++++++++++++ 4 files changed, 137 insertions(+), 21 deletions(-) diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index 69f63dfbc4..dedc041f51 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -178,6 +178,15 @@ erc-server-parameters TOPICLEN=160 - maximum allowed topic length WALLCHOPS - supports sending messages to all operators in a channel") +(make-obsolete-variable 'erc-server-parameters + 'erc-isupport-parameters "28.0.50") + +(defvar-local erc-isupport-parameters nil + "Alist of server ISUPPORT params with processed values. +Similar to the obsolete `erc-server-parameters', this is an alist of +key/value pairs. Except here, keys are symbols, and values are lists of +zero or more strings with hex escapes removed.") + ;;; Server and connection state (defvar erc-server-ping-timer-alist nil @@ -1581,6 +1590,38 @@ define-erc-response-handler ?U (nth 3 (erc-response.command-args parsed)) ?C (nth 4 (erc-response.command-args parsed))))) +(define-inline erc-parse-isupport-value (value) + "Return list of unescaped components from an \"ISUPPORT\" VALUE." + ;; https://tools.ietf.org/html/draft-brocklesby-irc-isupport-03#section-2 + ;; + ;; > The server SHOULD send "X", not "X="; this is the normalised form. + ;; + ;; Note: for now, assume the server will only send non-empty values, + ;; possibly with printable ASCII escapes. Though in practice, the + ;; only two escapes we're likely to see are backslash and space, + ;; meaning the pattern is too liberal. However, if this becomes + ;; CHARSET-aware, we'll have to accommodate UTF-8 encoded bytes. + `(let (case-fold-search) + (mapcar + (lambda (v) + (let ((start 0) + m + c) + (while (and (< start (length v)) + (string-match "[\\]x[0-9A-F][0-9A-F]" v start)) + (setq m (substring v (+ 2 (match-beginning 0)) (match-end 0)) + c (string-to-number m 16)) + (if (<= ?\ c ?~) + (setq v (concat (substring v 0 (match-beginning 0)) + (string c) + (substring v (match-end 0))) + start (- (match-end 0) 3)) + (setq start (match-end 0)))) + v)) + (if (string-search "," ,value) + (split-string ,value ",") + (list ,value))))) + (define-erc-response-handler (005) "Set the variable `erc-server-parameters' and display the received message. @@ -1592,21 +1633,28 @@ define-erc-response-handler A server may send more than one 005 message." nil - (let ((line (mapconcat #'identity - (setf (erc-response.command-args parsed) - (cdr (erc-response.command-args parsed))) - " "))) - (while (erc-response.command-args parsed) - (let ((section (pop (erc-response.command-args parsed)))) - ;; fill erc-server-parameters - (when (string-match "^\\([A-Z]+\\)=\\(.*\\)$\\|^\\([A-Z]+\\)$" + (let* ((args (cdr (erc-response.command-args parsed))) + (line (string-join args " "))) + (while args + (let ((section (pop args)) + key + value + negated) + (when (string-match "^\\([A-Z]+\\)=\\(.*\\)$\\|^\\(-\\)?\\([A-Z]+\\)$" section) - (add-to-list 'erc-server-parameters - `(,(or (match-string 1 section) - (match-string 3 section)) - . - ,(match-string 2 section)))))) - (erc-display-message parsed 'notice proc line))) + (setq key (or (match-string 1 section) (match-string 4 section)) + value (match-string 2 section) + negated (and (match-string 3 section) '-)) + (with-suppressed-warnings ((obsolete erc-server-parameters)) + (setf (alist-get key erc-server-parameters '- 'remove #'equal) + (or value negated) + ;; Since CHARSET is ignored, this can be populated during + ;; the initial burst (as well as updated later) + (alist-get (intern key) erc-isupport-parameters '- 'rem) + (or negated (and value + (erc-parse-isupport-value value)))))))) + (erc-display-message parsed 'notice proc line) + nil)) (define-erc-response-handler (221) "Display the current user modes." nil diff --git a/lisp/erc/erc-capab.el b/lisp/erc/erc-capab.el index 19bc2dbb8e..33a5c75662 100644 --- a/lisp/erc/erc-capab.el +++ b/lisp/erc/erc-capab.el @@ -137,7 +137,7 @@ erc-capab-identify-send-messages ;; could possibly check for '("IRCD" . "dancer") in ;; `erc-server-parameters' instead of looking for a specific name ;; in `erc-server-version' - (assoc "CAPAB" erc-server-parameters)) + (assq 'CAPAB erc-isupport-parameters)) (erc-log "Sending CAPAB IDENTIFY-MSG and IDENTIFY-CTCP") (erc-server-send "CAPAB IDENTIFY-MSG") (erc-server-send "CAPAB IDENTIFY-CTCP") diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index a06166b565..c4392211c5 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -3523,8 +3523,8 @@ erc-cmd-SQUERY (defun erc-cmd-NICK (nick) "Change current nickname to NICK." (erc-log (format "cmd: NICK: %s (erc-bad-nick: %S)" nick erc-bad-nick)) - (let ((nicklen (cdr (assoc "NICKLEN" (erc-with-server-buffer - erc-server-parameters))))) + (let ((nicklen (cadr (assq 'NICKLEN (erc-with-server-buffer + erc-isupport-parameters))))) (and nicklen (> (length nick) (string-to-number nicklen)) (erc-display-message nil 'notice 'active 'nick-too-long @@ -4397,9 +4397,9 @@ erc-nickname-in-use (format "Nickname %s is %s, try another." nick reason)) (setq erc-nick-change-attempt-count (+ erc-nick-change-attempt-count 1)) (let ((newnick (nth 1 erc-default-nicks)) - (nicklen (cdr (assoc "NICKLEN" + (nicklen (cadr (assq 'NICKLEN (erc-with-server-buffer - erc-server-parameters))))) + erc-isupport-parameters))))) (setq erc-bad-nick t) ;; try to use a different nick (if erc-default-nicks @@ -5002,8 +5002,8 @@ erc-channel-end-receiving-names (defun erc-parse-prefix () "Return an alist of valid prefix character types and their representations. Example: (operator) o => @, (voiced) v => +." - (let ((str (or (cdr (assoc "PREFIX" (erc-with-server-buffer - erc-server-parameters))) + (let ((str (or (cadr (assq 'PREFIX (erc-with-server-buffer + erc-isupport-parameters))) ;; provide a sane default "(qaohv)~&@%+")) types chars) diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el index b2dbc1012d..4173e6df20 100644 --- a/test/lisp/erc/erc-tests.el +++ b/test/lisp/erc/erc-tests.el @@ -127,6 +127,74 @@ erc-lurker-maybe-trim (setq erc-lurker-ignore-chars "_-`") ; set of chars, not character alts (should (string= "nick" (erc-lurker-maybe-trim "nick-_`"))))) +(ert-deftest erc-parse-isupport-value () + (should (equal (erc-parse-isupport-value "a,b") '("a" "b"))) + (should (equal (erc-parse-isupport-value "a,b,c") '("a" "b" "c"))) + + (should (equal (erc-parse-isupport-value "abc") '("abc"))) + (should (equal (erc-parse-isupport-value "\\x20foo") '(" foo"))) + (should (equal (erc-parse-isupport-value "foo\\x20") '("foo "))) + (should (equal (erc-parse-isupport-value "a\\x20b\\x20c") '("a b c"))) + (should (equal (erc-parse-isupport-value "a\\x20b\\x20c\\x20") '("a b c "))) + (should (equal (erc-parse-isupport-value "\\x20a\\x20b\\x20c") '(" a b c"))) + (should (equal (erc-parse-isupport-value "a\\x20\\x20c") '("a c"))) + (should (equal (erc-parse-isupport-value "\\x20\\x20\\x20") '(" "))) + (should (equal (erc-parse-isupport-value "\\x5Co/") '("\\o/"))) + (should (equal (erc-parse-isupport-value "\\x7F,\\x19") '("\\x7F" "\\x19"))) + (should (equal (erc-parse-isupport-value "a\\x2Cb,c") '("a,b" "c")))) + +(ert-deftest erc-server-005 () + (with-suppressed-warnings ((obsolete erc-server-parameters)) + (let* ((erc-server-005-functions (copy-sequence erc-server-005-functions)) + (hooked 0) + (verify #'ignore) + (hook (lambda (_ _) (funcall verify) (cl-incf hooked))) + erc-server-parameters + erc-isupport-parameters + erc-timer-hook + calls + args + parsed) + (add-hook 'erc-server-005-functions hook 90) + (should (eq (cadr erc-server-005-functions) hook)) + (cl-letf (((symbol-function 'erc-display-message) + (lambda (_ _ _ line) (push line calls)))) + + (ert-info ("Baseline") + (setq args '("tester" "BOT=B" "EXCEPTS" "PREFIX=(ov)@+" "are supp...") + parsed (make-erc-response :command-args args :command "005")) + + (setq verify + (lambda () + (should (equal erc-server-parameters + '(("PREFIX" . "(ov)@+") ("EXCEPTS") + ("BOT" . "B")))) + (should (equal erc-isupport-parameters + '((PREFIX "(ov)@+") (EXCEPTS) (BOT "B")))) + (should (string= (pop calls) + "BOT=B EXCEPTS PREFIX=(ov)@+ are supp...")) + (should (equal args (erc-response.command-args parsed))))) + + (erc-call-hooks nil parsed)) + + (ert-info ("Negated, updated") + (setq args '("tester" "-EXCEPTS" "PREFIX=(ohv)@%+" "are supported") + parsed (make-erc-response :command-args args :command "005")) + + (setq verify + (lambda () + (should (equal erc-server-parameters + '(("PREFIX" . "(ohv)@%+") ("BOT" . "B")))) + (should (equal erc-isupport-parameters + '((PREFIX "(ohv)@%+") (BOT "B")))) + (should (string= (pop calls) + "-EXCEPTS PREFIX=(ohv)@%+ are supported")) + (should (equal args (erc-response.command-args parsed))))) + + (erc-call-hooks nil parsed)) + (should (= hooked 2))))) + (should-not (cadr erc-server-005-functions))) + (ert-deftest erc-ring-previous-command-base-case () (ert-info ("Create ring when nonexistent and do nothing") (let (erc-input-ring -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0005-Recognize-ascii-and-strict-CASEMAPPINGs-in-ERC.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Tue, 5 Oct 2021 19:03:56 -0700 Subject: [PATCH 05/28] Recognize ascii and strict CASEMAPPINGs in ERC * lisp/erc/erc.el (erc-downcase, erc--casemapping-rfc1459-strict, erc--casemapping-rfc1459): Add new translation tables for these two mappings and use them. * test/lisp/erc/erc-tests.el: Add test for `erc-downcase'. --- lisp/erc/erc.el | 36 +++++++++++++++++++++++++----------- test/lisp/erc/erc-tests.el | 22 ++++++++++++++++++++++ 2 files changed, 47 insertions(+), 11 deletions(-) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index c4392211c5..475f7ba633 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -352,18 +352,32 @@ erc-server-users "Hash table of users on the current server. It associates nicknames with `erc-server-user' struct instances.") +(defconst erc--casemapping-rfc1459 + (make-translation-table + '((?\[ . ?\{) (?\] . ?\}) (?\\ . ?\|) (?~ . ?^)) + (mapcar (lambda (c) (cons c (+ c 32))) "ABCDEFGHIJKLMNOPQRSTUVWXYZ"))) + +(defconst erc--casemapping-rfc1459-strict + (make-translation-table + '((?\[ . ?\{) (?\] . ?\}) (?\\ . ?\|)) + (mapcar (lambda (c) (cons c (+ c 32))) "ABCDEFGHIJKLMNOPQRSTUVWXYZ"))) + (defun erc-downcase (string) - "Convert STRING to IRC standard conforming downcase." - (let ((s (downcase string)) - (c '((?\[ . ?\{) - (?\] . ?\}) - (?\\ . ?\|) - (?~ . ?^)))) - (save-match-data - (while (string-match "[]\\[~]" s) - (aset s (match-beginning 0) - (cdr (assq (aref s (match-beginning 0)) c))))) - s)) + "Return a downcased copy of STRING with properties. +Use the CASEMAPPING ISUPPORT parameter to determine the style." + (let* ((params (or erc-isupport-parameters + (erc-with-server-buffer erc-isupport-parameters))) + (mapping (cadr (assq 'CASEMAPPING params))) + (inhibit-read-only t)) + (if (equal mapping "ascii") + (downcase string) + (with-temp-buffer + (insert string) + (translate-region (point-min) (point-max) + (if (equal mapping "rfc1459-strict") + erc--casemapping-rfc1459-strict + erc--casemapping-rfc1459)) + (buffer-string))))) (defmacro erc-with-server-buffer (&rest body) "Execute BODY in the current ERC server buffer. diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el index 4173e6df20..160688c1cf 100644 --- a/test/lisp/erc/erc-tests.el +++ b/test/lisp/erc/erc-tests.el @@ -195,6 +195,28 @@ erc-server-005 (should (= hooked 2))))) (should-not (cadr erc-server-005-functions))) +(ert-deftest erc-downcase () + (let ((erc-isupport-parameters '((PREFIX "(ov)@+") (BOT "B")))) + + (ert-info ("ascii") + (setf (alist-get 'CASEMAPPING erc-isupport-parameters) '("ascii")) + (should (equal (erc-downcase "Bob[m]`") "bob[m]`")) + (should (equal (erc-downcase "Tilde~") "tilde~" )) + (should (equal (erc-downcase "\\O/") "\\o/" ))) + + (ert-info ("rfc1459") + (setf (car (alist-get 'CASEMAPPING erc-isupport-parameters)) "rfc1459") + (should (equal (erc-downcase "Bob[m]`") "bob{m}`" )) + (should (equal (erc-downcase "Tilde~") "tilde^" )) + (should (equal (erc-downcase "\\O/") "|o/" ))) + + (ert-info ("rfc1459-strict") + (setf (car (alist-get 'CASEMAPPING erc-isupport-parameters)) + "rfc1459-strict") + (should (equal (erc-downcase "Bob[m]`") "bob{m}`")) + (should (equal (erc-downcase "Tilde~") "tilde~" )) + (should (equal (erc-downcase "\\O/") "|o/" ))))) + (ert-deftest erc-ring-previous-command-base-case () (ert-info ("Create ring when nonexistent and do nothing") (let (erc-input-ring -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0006-Make-ERC-respect-spaces-in-server-passwords.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Sun, 15 Aug 2021 21:57:24 -0700 Subject: [PATCH 06/28] Make ERC respect spaces in server passwords * lisp/erc/erc.el (erc-login): Also known as connection passwords, these are sent as the sole arg to the PASS command, which is nowadays often overloaded with other semantics imposed by various entities to convey things like bouncer or services creds. --- lisp/erc/erc.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 475f7ba633..77e773c828 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -6164,7 +6164,7 @@ erc-login erc-session-server erc-session-user-full-name)) (if erc-session-password - (erc-server-send (format "PASS %s" erc-session-password)) + (erc-server-send (concat "PASS :" erc-session-password)) (message "Logging in without password")) (erc-server-send (format "NICK %s" (erc-current-nick))) (erc-server-send -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0007-Add-helper-to-determine-local-channels-in-ERC.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Mon, 16 Aug 2021 05:01:16 -0700 Subject: [PATCH 07/28] Add helper to determine local channels in ERC * lisp/erc/erc.el (erc-valid-local-channel-p): add helper to determine whether some channel is local according to network's CHANTYPES param. --- lisp/erc/erc.el | 6 ++++++ test/lisp/erc/erc-tests.el | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 77e773c828..ae386cc096 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -3212,6 +3212,12 @@ erc-server-join-channel (concat " " password) ""))))) +(defun erc-valid-local-channel-p (channel) + "Non-nil when channel is server-local on a network that allows them." + (and-let* (((eq ?& (aref channel 0))) + (chan-types (cadr (assq 'CHANTYPES erc-isupport-parameters))) + ((string-search "&" chan-types))))) + (defun erc-cmd-JOIN (channel &optional key) "Join the channel given in CHANNEL, optionally with KEY. If CHANNEL is specified as \"-invite\", join the channel to which you diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el index 160688c1cf..e1454305c2 100644 --- a/test/lisp/erc/erc-tests.el +++ b/test/lisp/erc/erc-tests.el @@ -217,6 +217,16 @@ erc-downcase (should (equal (erc-downcase "Tilde~") "tilde~" )) (should (equal (erc-downcase "\\O/") "|o/" ))))) +(ert-deftest erc-local-channel-p () + (ert-info ("Local channels not supported") + (let ((erc-isupport-parameters '((CHANTYPES "#")))) + (should-not (erc-valid-local-channel-p "#chan")) + (should-not (erc-valid-local-channel-p "&local")))) + (ert-info ("Local channels supported") + (let ((erc-isupport-parameters '((CHANTYPES "&#")))) + (should-not (erc-valid-local-channel-p "#chan")) + (should (erc-valid-local-channel-p "&local"))))) + (ert-deftest erc-ring-previous-command-base-case () (ert-info ("Create ring when nonexistent and do nothing") (let (erc-input-ring -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0008-Add-eventual-replacement-for-erc-default-recipients.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Tue, 19 Oct 2021 22:53:03 -0700 Subject: [PATCH 08/28] Add eventual replacement for erc-default-recipients * lisp/erc/erc.el (erc--target, erc--buffer-target): Add new defstruct available locally through latter in all target buffers. (erc-open): Create above items in non server buffers. * lisp/erc/erc-backend.el (erc-server-NICK): Recreate `erc--buffer-target' when necessary. --- lisp/erc/erc-backend.el | 4 ++-- lisp/erc/erc.el | 29 +++++++++++++++++++++++++++++ test/lisp/erc/erc-tests.el | 11 +++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index dedc041f51..e7256cd793 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -1388,8 +1388,8 @@ define-erc-response-handler (erc-buffer-filter (lambda () (when (equal (erc-default-target) nick) - (setq erc-default-recipients - (cons nn (cdr erc-default-recipients))) + (setq erc-default-recipients (cons nn (cdr erc-default-recipients)) + erc--buffer-target (erc--target-from-string nn)) (rename-buffer nn t) ; bug#12002 (erc-update-mode-line) (cl-pushnew (current-buffer) bufs)))) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index ae386cc096..0c2cbb9d82 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1352,6 +1352,34 @@ define-erc-module (put ',enable 'definition-name ',name) (put ',disable 'definition-name ',name)))) +;; ERASE ME: instead of this, we could have an erc--target-channel +;; type and (:include erc--target), but then erc--target-channel-p +;; would be no simpler than what we have here. +(cl-defstruct (erc--target + (:constructor + erc--target-from-string + (string + &aux + (symbol (intern (erc-downcase string))) + (channel-p (and (erc-channel-p string) t)) + (local-p (and channel-p + (erc-valid-local-channel-p string) + t))))) + ;; Use local-p instead of localp so accessor is hyphenated. + (string "" :type string :documentation "Received name of target.") + (symbol nil :type symbol :documentation "Case-mapped name as symbol.") + (channel-p nil :type boolean :documentation "Whether we're a channel.") + (local-p nil :type boolean :documentation "Whether we're a local channel.")) + +(defvar-local erc--buffer-target nil + "Info about a buffer's target, if any.") + +;; Temporary internal getter to ease transition to `erc--target' everywhere. +(defun erc--default-target () + "Return target string or nil." + (when erc--buffer-target + (erc--target-string erc--buffer-target))) + (defun erc-once-with-server-event (event f) "Run function F the next time EVENT occurs in the `current-buffer'. @@ -2042,6 +2070,7 @@ erc-open (set-marker erc-insert-marker (point)) ;; stack of default recipients (setq erc-default-recipients tgt-list) + (setq erc--buffer-target (and channel (erc--target-from-string channel))) (setq erc-server-current-nick nil) ;; Initialize erc-server-users and erc-channel-users (if connect diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el index e1454305c2..d9112c7b0a 100644 --- a/test/lisp/erc/erc-tests.el +++ b/test/lisp/erc/erc-tests.el @@ -227,6 +227,17 @@ erc-local-channel-p (should-not (erc-valid-local-channel-p "#chan")) (should (erc-valid-local-channel-p "&local"))))) +(ert-deftest erc--target-from-string () + (should (equal (erc--target-from-string "#chan") + #s(erc--target "#chan" \#chan t nil))) + + (should (equal (erc--target-from-string "Bob") + #s(erc--target "Bob" bob nil nil))) + + (let ((erc-isupport-parameters '((CHANTYPES "#&")))) + (should (equal (erc--target-from-string "&Bitlbee") + #s(erc--target "&Bitlbee" &bitlbee t t))))) + (ert-deftest erc-ring-previous-command-base-case () (ert-info ("Create ring when nonexistent and do nothing") (let (erc-input-ring -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0009-Discourage-ill-defined-use-of-buffer-targets-in-ERC.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Wed, 20 Oct 2021 03:52:18 -0700 Subject: [PATCH 09/28] Discourage ill-defined use of buffer targets in ERC * lisp/erc/erc.el (erc-default-recipients, erc-default-target): Explain that the variable has fallen out of favor and that the function may have been used historically by third-party code for detecting channel subscription status, even though that's never been the case internally since at least the adoption of version control. Recommend newer alternatives. (erc-add-default-channel, erc-delete-default-channel, erc-add-query, erc-delete-query): Deprecate these helpers, which rely on an unused usage variant of `erc-default-recipients'. * lisp/erc/erc-services.el: remove stray `erc-default-recipients' declaration. * lisp/erc/erc-backend.el (erc-server-NICK, erc-server-JOIN, erc-server-KICK, erc-server-PART): wrap deprecated helpers to suppress warnings. --- lisp/erc/erc-backend.el | 10 +++++++--- lisp/erc/erc-track.el | 2 -- lisp/erc/erc.el | 28 +++++++++++++++++++++++++++- 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index e7256cd793..e0cbe308fd 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -1300,7 +1300,9 @@ define-erc-response-handler erc-server-process)) (when buffer (set-buffer buffer) - (erc-add-default-channel chnl) + (with-suppressed-warnings + ((obsolete erc-add-default-channel)) + (erc-add-default-channel chnl)) (erc-server-send (format "MODE %s" chnl))) (erc-with-buffer (chnl proc) (erc-channel-begin-receiving-names)) @@ -1337,7 +1339,8 @@ define-erc-response-handler (erc-with-buffer (buffer) (erc-remove-channel-users)) - (erc-delete-default-channel ch buffer) + (with-suppressed-warnings ((obsolete erc-delete-default-channel)) + (erc-delete-default-channel ch buffer)) (erc-update-mode-line buffer)) ((string= nick (erc-current-nick)) (erc-display-message @@ -1426,7 +1429,8 @@ define-erc-response-handler (erc-with-buffer (buffer) (erc-remove-channel-users)) - (erc-delete-default-channel chnl buffer) + (with-suppressed-warnings ((obsolete erc-delete-default-channel)) + (erc-delete-default-channel chnl buffer)) (erc-update-mode-line buffer) (when erc-kill-buffer-on-part (kill-buffer buffer)))))) diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el index 5755384490..6b1a70102e 100644 --- a/lisp/erc/erc-track.el +++ b/lisp/erc/erc-track.el @@ -353,8 +353,6 @@ erc-track-shorten-names (> (length s) erc-track-shorten-cutoff)) erc-track-shorten-start)) -(defvar erc-default-recipients) - (defun erc-all-buffer-names () "Return all channel or query buffer names. Note that we cannot use `erc-channel-list' with a nil argument, diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 0c2cbb9d82..63f7133f96 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1847,6 +1847,17 @@ erc-buffer-list-with-nick ;; Some local variables +;; FIXME deprecate this variable +;; +;; In the ancient, pre-CVS days (prior to June 2001), this list may +;; have been used for supporting the changing of a buffer's target on +;; the fly (mid-session). Such usage, which allowed cons cells like +;; (QUERY . bob) to serve as the list's head, was either never fully +;; integrated or was partially clobbered prior to the introduction of +;; version control. But vestiges remain (see `erc-dcc-chat-mode'). +;; +;; New library code should use the `erc--target' struct instead. +;; Third-party code should consider doing so as well. (defvar-local erc-default-recipients nil "List of default recipients of the current buffer.") @@ -5834,6 +5845,18 @@ erc-nick-equal-p ;; default target handling +;; This function happens to return nil in channel buffers previously +;; parted or those from which a user had been kicked. While this +;; "works" for detecting whether a channel is currently subscribed to, +;; new code should consider using +;; +;; (erc-get-channel-user (erc-current-nick)) +;; +;; instead. For retrieving a target regardless of subscription or +;; connection status, use replacements based on `erc--target'. +;; (Coming soon.) +;; +;; TODO deprecate this (defun erc-default-target () "Return the current default target (as a character string) or nil if none." (let ((tgt (car erc-default-recipients))) @@ -5844,12 +5867,14 @@ erc-default-target (defun erc-add-default-channel (channel) "Add CHANNEL to the default channel list." + (declare (obsolete "use `erc-cmd-JOIN' or similar instead" "29.1")) (let ((chl (downcase channel))) (setq erc-default-recipients (cons chl erc-default-recipients)))) (defun erc-delete-default-channel (channel &optional buffer) "Delete CHANNEL from the default channel list." + (declare (obsolete "use `erc-cmd-PART' or similar instead" "29.1")) (with-current-buffer (if (and buffer (bufferp buffer)) buffer @@ -5861,6 +5886,7 @@ erc-add-query "Add QUERY'd NICKNAME to the default channel list. The previous default target of QUERY type gets removed." + (declare (obsolete "use `erc-cmd-QUERY' or similar instead" "29.1")) (let ((d1 (car erc-default-recipients)) (d2 (cdr erc-default-recipients)) (qt (cons 'QUERY (downcase nickname)))) @@ -5871,7 +5897,7 @@ erc-add-query (defun erc-delete-query () "Delete the topmost target if it is a QUERY." - + (declare (obsolete "use one query buffer per target instead" "29.1")) (let ((d1 (car erc-default-recipients)) (d2 (cdr erc-default-recipients))) (if (and (listp d1) -- 2.31.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0010-Add-ERC-test-server-and-related-resources.patch Content-Transfer-Encoding: quoted-printable >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Thu, 13 May 2021 03:33:33 -0700 Subject: [PATCH 10/28] Add ERC test server and related resources * test/lisp/erc/erc-d/erc-d.el: Add new file providing "dumb" test server for quasi-functional (not quite e2e) testing of ERC. * test/lisp/erc/erc-d/erc-d-u.el: Add new file providing helpers for ERT test cases and support for the dumb server. * test/lisp/erc/erc-d/erc-d-meta.el: add new file for testing the dumb server itself. Also add related resources under the directory test/lisp/erc/erc-d/erc-d-meta-resources, which mostly contains canned "dialogs" resembling I/O logs. --- test/lisp/erc/erc-d/erc-d-i.el | 125 ++ .../erc-d/erc-d-self-resources/basic.lispdata | 32 + .../erc-d-self-resources/depleted.lispdata | 12 + .../erc-d-self-resources/drop-a.lispdata | 4 + .../erc-d-self-resources/drop-b.lispdata | 4 + .../dynamic-barnet.lispdata | 33 + .../dynamic-foonet.lispdata | 32 + .../dynamic-stub.lispdata | 4 + .../erc-d-self-resources/dynamic.lispdata | 30 + .../erc-d/erc-d-self-resources/eof.lispdata | 33 + .../erc-d/erc-d-self-resources/fuzzy.lispdata | 42 + .../erc-d-self-resources/incremental.lispdata | 43 + .../irc-parser-tests.lispdata | 380 +++++ .../linger-multi-a.lispdata | 3 + .../linger-multi-b.lispdata | 3 + .../erc-d-self-resources/linger.lispdata | 33 + .../erc-d-self-resources/no-block.lispdata | 55 + .../erc-d-self-resources/no-match.lispdata | 32 + .../erc-d-self-resources/no-pong.lispdata | 27 + .../erc-d-self-resources/nonstandard.lispdata | 6 + .../proxy-barnet.lispdata | 24 + .../proxy-foonet.lispdata | 24 + .../erc-d-self-resources/proxy-solo.lispdata | 9 + .../erc-d-self-resources/proxy-subprocess.el | 26 + .../erc-d-self-resources/timeout.lispdata | 27 + .../erc-d-self-resources/unexpected.lispdata | 28 + test/lisp/erc/erc-d/erc-d-self.el | 1311 +++++++++++++++++ test/lisp/erc/erc-d/erc-d-t.el | 157 ++ test/lisp/erc/erc-d/erc-d-u.el | 200 +++ test/lisp/erc/erc-d/erc-d.el | 970 ++++++++++++ 30 files changed, 3709 insertions(+) create mode 100644 test/lisp/erc/erc-d/erc-d-i.el create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/basic.lispdata create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/depleted.lispd= ata create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/drop-a.lispdata create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/drop-b.lispdata create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/dynamic-barnet= .lispdata create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/dynamic-foonet= .lispdata create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/dynamic-stub.l= ispdata create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/dynamic.lispda= ta create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/eof.lispdata create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/fuzzy.lispdata create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/incremental.li= spdata create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/irc-parser-tes= ts.lispdata create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/linger-multi-a= .lispdata create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/linger-multi-b= .lispdata create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/linger.lispdata create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/no-block.lispd= ata create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/no-match.lispd= ata create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/no-pong.lispda= ta create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/nonstandard.li= spdata create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/proxy-barnet.l= ispdata create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/proxy-foonet.l= ispdata create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/proxy-solo.lis= pdata create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/proxy-subproce= ss.el create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/timeout.lispda= ta create mode 100644 test/lisp/erc/erc-d/erc-d-self-resources/unexpected.lis= pdata create mode 100644 test/lisp/erc/erc-d/erc-d-self.el create mode 100644 test/lisp/erc/erc-d/erc-d-t.el create mode 100644 test/lisp/erc/erc-d/erc-d-u.el create mode 100644 test/lisp/erc/erc-d/erc-d.el diff --git a/test/lisp/erc/erc-d/erc-d-i.el b/test/lisp/erc/erc-d/erc-d-i.el new file mode 100644 index 0000000000..ee748dab93 --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-i.el @@ -0,0 +1,125 @@ +;;; erc-d-i.el --- IRC helpers for ERC test server -*- lexical-binding: t = -*- + +;; Copyright (C) 2020-2021 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 +;; . + +;;; Commentary: + +;;; Code: + +(require 'cl-lib) + +(cl-defstruct (erc-d-i-message (:conc-name erc-d-i-message.)) + "Identical to `erc-response'. +When member `compat' is nil, it means the raw message was decoded as +UTF-8 text before parsing, which is nonstandard." + (unparsed "" :type string) + (sender "" :type string) + (command "" :type string) + (command-args nil :type (list-of string)) + (contents "" :type string) + (tags nil :type (list-of (cons symbol string))) + (compat t :type boolean)) + +(defvar erc-d-i--tag-escapes + '((";" . "\\:") (" " . "\\s") ("\\" . "\\\\") ("\r" . "\\r") ("\n" . "\\= n"))) + +;; XXX these are not mirror inverses; unescaping may degenerate +;; original by dropping stranded/misplaced backslashes. + +(defvar erc-d-i--tag-escaped-regexp + (rx (or ?\; ?\ ?\\ ?\r ?\n))) + +(defvar erc-d-i--tag-unescaped-regexp + (rx (or "\\:" "\\s" "\\\\" "\\r" "\\n" + (seq "\\" (or string-end (not (or ":" "n" "r" "\\"))))))) + +(defun erc-d-i--unescape-tag-value (str) + "Undo substitution of char placeholders in raw tag value STR." + (replace-regexp-in-string erc-d-i--tag-unescaped-regexp + (lambda (s) + (or (car (rassoc s erc-d-i--tag-escapes)) + (substring s 1))) + str t t)) + +(defun erc-d-i--escape-tag-value (str) + "Swap out banned chars in tag value STR with message representation." + (replace-regexp-in-string erc-d-i--tag-escaped-regexp + (lambda (s) + (cdr (assoc s erc-d-i--tag-escapes))) + str t t)) + +(defvar erc-d-i--invalid-tag-regexp (rx (any "\0\7\r\n; "))) + +;; This is `erc-v3-message-tags' with fatal errors. + +(defun erc-d-i--validate-tags (raw) + "Validate tags portion of some RAW message. +RAW must not have a leading \"@\" or a trailing space. The spec says +validation shouldn't be performed on keys and that undecodeable values +or ones with illegal (unescaped) chars may be dropped. This does not +respect any of that." + (unless (> 4095 (string-bytes raw)) + ;; 417 ERR_INPUTTOOLONG Input line was too long + (error "Message tags exceed 4094 bytes: %S" raw)) + (let (tags + (tag-strings (split-string raw ";"))) + (dolist (s tag-strings (nreverse tags)) + (let* ((m (string-search "=3D" s)) + (key (if m (substring s 0 m) s)) + (val (when-let* (m ; check first, like (m), but shadow + (v (substring s (1+ m))) + ((not (string-equal v "")))) + (when (string-match-p erc-d-i--invalid-tag-regexp v) + (error "Bad tag: %s" s)) + (thread-first v + (decode-coding-string 'utf-8 t) + (erc-d-i--unescape-tag-value))))) + (when (string-empty-p key) + (error "Tag missing key: %S" s)) + (setf (alist-get (intern key) tags) val))))) + +(defun erc-d-i--parse-message (s &optional decode) + "Parse string S into `erc-d-i-message' object. +With DECODE, decode as UTF-8 text." + (when (string-suffix-p "\r\n" s) + (error "Unstripped message encountered")) + (when decode + (setq s (decode-coding-string s 'utf-8 t))) + (let ((mes (make-erc-d-i-message :unparsed s :compat (not decode))) + tokens) + (when-let* (((not (string-empty-p s))) + ((eq ?@ (aref s 0))) + (m (string-match " " s)) + (u (substring s 1 m))) + (setf (erc-d-i-message.tags mes) (erc-d-i--validate-tags u) + s (substring s (1+ m)))) + (if-let* ((m (string-match " :" s)) + (other-toks (split-string (substring s 0 m) " " t)) + (rest (substring s (+ 2 m)))) + (setf (erc-d-i-message.contents mes) rest + tokens (nconc other-toks (list rest))) + (setq tokens (split-string s " " t " "))) + (when (and tokens (eq ?: (aref (car tokens) 0))) + (setf (erc-d-i-message.sender mes) (substring (pop tokens) 1))) + (setf (erc-d-i-message.command mes) (or (pop tokens) "") + (erc-d-i-message.command-args mes) tokens) + mes)) + +(provide 'erc-d-i) +;;; erc-d-i.el ends here diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/basic.lispdata b/test= /lisp/erc/erc-d/erc-d-self-resources/basic.lispdata new file mode 100644 index 0000000000..a5f6bcb90c --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/basic.lispdata @@ -0,0 +1,32 @@ +;;; -*- mode: lisp-data -*- + +((pass 10.0 "PASS " (? ?:) "changeme")) +((nick 0.2 "NICK tester")) + +((user 0.2 "USER user 0 * :tester") + (0 ":irc.example.org 001 tester :Welcome to the Internet Relay Network te= ster") + (0 ":irc.example.org 002 tester :Your host is irc.example.org") + (0 ":irc.example.org 003 tester :This server was created just now") + (0 ":irc.example.org 004 tester irc.example.org BERios CEIRabehiklmnoqstv= Iabehkloqv") + (0 ":irc.example.org 005 tester MODES NETWORK=3DExampleOrg NICKLEN=3D32 P= REFIX=3D(qaohv)~&@%+" + " :are supported by this server") + (0 ":irc.example.org 251 tester :There are 3 users and 0 invisible on 1 s= erver(s)") + ;; Just to mix thing's up (force handler to schedule timer) + (0.1 ":irc.example.org 252 tester 0 :IRC Operators online") + (0 ":irc.example.org 253 tester 0 :unregistered connections") + (0 ":irc.example.org 254 tester 1 :channels formed") + (0 ":irc.example.org 255 tester :I have 3 clients and 0 servers") + (0.1 ":irc.example.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.example.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.example.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + (0 ":irc.example.org 221 tester +Zi") + (0 ":irc.example.org 306 tester :You have been marked as being away") + (0 ":tester!~tester@localhost JOIN #chan") + (0 ":irc.example.org 353 alice =3D #chan :+alice!~alice@example.com @%+bo= b!~bob@example.org") + (0 ":irc.example.org 366 alice #chan :End of NAMES list")) + +;; Some comment (to prevent regression) +((mode-chan 1.2 "MODE #chan") + (0.1 ":bob!~bob@example.org PRIVMSG #chan :hey")) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/depleted.lispdata b/t= est/lisp/erc/erc-d/erc-d-self-resources/depleted.lispdata new file mode 100644 index 0000000000..e5a7f03efb --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/depleted.lispdata @@ -0,0 +1,12 @@ +;;; -*- mode: lisp-data -*- + +((pass 10.0 "PASS :changeme")) + +((~fake 3.2 "FAKE ") + (0.1 ":irc.example.org FAKE irc.example.com :ok")) + +((nick 0.2 "NICK tester")) + +((user 0.2 "USER user 0 * :tester") + (0 ":irc.example.org 001 tester :Welcome to the Internet tester") + (0 ":irc.example.org 422 tester :MOTD File is missing")) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/drop-a.lispdata b/tes= t/lisp/erc/erc-d/erc-d-self-resources/drop-a.lispdata new file mode 100644 index 0000000000..2e23eeb20f --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/drop-a.lispdata @@ -0,0 +1,4 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS " (? ?:) "a") + (0 "hi")) +((drop 0.01 DROP)) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/drop-b.lispdata b/tes= t/lisp/erc/erc-d/erc-d-self-resources/drop-b.lispdata new file mode 100644 index 0000000000..facecd5e81 --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/drop-b.lispdata @@ -0,0 +1,4 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS " (? ?:) "b") + (0 "hi")) +((linger 1 LINGER)) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/dynamic-barnet.lispda= ta b/test/lisp/erc/erc-d/erc-d-self-resources/dynamic-barnet.lispdata new file mode 100644 index 0000000000..36b1cc2308 --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/dynamic-barnet.lispdata @@ -0,0 +1,33 @@ +;;; -*- mode: lisp-data -*- +((fake 0 "FAKE noop")) + +((nick 1.2 "NICK tester")) + +((user 2.2 "USER user 0 * :tester") + (0. ":irc.barnet.org 001 tester :Welcome to the BAR Network tester") + (0. ":irc.barnet.org 002 tester :Your host is irc.barnet.org") + (0. ":irc.barnet.org 003 tester :This server was created just now") + (0. ":irc.barnet.org 004 tester irc.barnet.org BERios CEIRabehiklmnoqstv = Iabehkloqv") + (0. ":irc.barnet.org 005 tester MODES NETWORK=3DBarNet NICKLEN=3D32 PREFI= X=3D(qaohv)~&@%+ :are supported by this server") + (0. ":irc.barnet.org 251 tester :There are 3 users and 0 invisible on 1 s= erver(s)") + (0. ":irc.barnet.org 252 tester 0 :IRC Operators online") + (0. ":irc.barnet.org 253 tester 0 :unregistered connections") + (0. ":irc.barnet.org 254 tester 1 :channels formed") + (0. ":irc.barnet.org 255 tester :I have 3 clients and 0 servers") + (0. ":irc.barnet.org 265 tester 3 3 :Current local users 3, max 3") + (0. ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") + (0. ":irc.barnet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + (0. ":irc.barnet.org 221 tester +Zi") + (0. ":irc.barnet.org 306 tester :You have been marked as being away") + (0 ":tester!~u@awyxgybtkx7uq.irc JOIN #chan") + (0 ":irc.barnet.org 353 joe =3D #chan :+joe!~joe@example.com @%+mike!~mik= e@example.org") + (0 ":irc.barnet.org 366 joe #chan :End of NAMES list")) + +((mode 1 "MODE #chan") + (0 ":irc.barnet.org 324 tester #chan +nt") + (0 ":irc.barnet.org 329 tester #chan 1620805269") + (0.1 ":joe!~u@awyxgybtkx7uq.irc PRIVMSG #chan :mike: Yes, a dozen; and as= many to the vantage, as would store the world they played for.") + (0.05 ":mike!~u@awyxgybtkx7uq.irc PRIVMSG #chan :joe: As he regards his a= ged father's life.") + (0.05 ":joe!~u@awyxgybtkx7uq.irc PRIVMSG #chan :mike: It is a rupture tha= t you may easily heal; and the cure of it not only saves your brother, but = keeps you from dishonour in doing it.")) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/dynamic-foonet.lispda= ta b/test/lisp/erc/erc-d/erc-d-self-resources/dynamic-foonet.lispdata new file mode 100644 index 0000000000..e0c1e79a36 --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/dynamic-foonet.lispdata @@ -0,0 +1,32 @@ +;;; -*- mode: lisp-data -*- + +((nick 1.2 "NICK tester")) + +((user 2.2 "USER user 0 * :tester") + (0. ":irc.foonet.org 001 tester :Welcome to the FOO Network tester") + (0. ":irc.foonet.org 002 tester :Your host is irc.foonet.org") + (0. ":irc.foonet.org 003 tester :This server was created just now") + (0. ":irc.foonet.org 004 tester irc.foonet.org BERios CEIRabehiklmnoqstv = Iabehkloqv") + (0. ":irc.foonet.org 005 tester MODES NETWORK=3DFooNet NICKLEN=3D32 PREFI= X=3D(qaohv)~&@%+ :are supported by this server") + (0. ":irc.foonet.org 251 tester :There are 3 users and 0 invisible on 1 s= erver(s)") + (0. ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0. ":irc.foonet.org 253 tester 0 :unregistered connections") + (0. ":irc.foonet.org 254 tester 1 :channels formed") + (0. ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0. ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0. ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0. ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + (0. ":irc.foonet.org 221 tester +Zi") + (0. ":irc.foonet.org 306 tester :You have been marked as being away") + (0 ":tester!~u@awyxgybtkx7uq.irc JOIN #chan") + (0 ":irc.foonet.org 353 alice =3D #chan :+alice!~alice@example.com @%+bob= !~bob@example.org") + (0 ":irc.foonet.org 366 alice #chan :End of NAMES list")) + +((mode 1 "MODE #chan") + (0 ":irc.foonet.org 324 tester #chan +nt") + (0 ":irc.foonet.org 329 tester #chan 1620805269") + (0.1 ":alice!~u@awyxgybtkx7uq.irc PRIVMSG #chan :bob: Yes, a dozen; and a= s many to the vantage, as would store the world they played for.") + (0.05 ":bob!~u@awyxgybtkx7uq.irc PRIVMSG #chan :alice: As he regards his = aged father's life.") + (0.05 ":alice!~u@awyxgybtkx7uq.irc PRIVMSG #chan :bob: It is a rupture th= at you may easily heal; and the cure of it not only saves your brother, but= keeps you from dishonour in doing it.")) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/dynamic-stub.lispdata= b/test/lisp/erc/erc-d/erc-d-self-resources/dynamic-stub.lispdata new file mode 100644 index 0000000000..d93313023d --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/dynamic-stub.lispdata @@ -0,0 +1,4 @@ +;;; -*- mode: lisp-data -*- +((pass 10.0 "PASS " (? ?:) token ":changeme")) + +((fake 0 "FAKE")) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/dynamic.lispdata b/te= st/lisp/erc/erc-d/erc-d-self-resources/dynamic.lispdata new file mode 100644 index 0000000000..8698560109 --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/dynamic.lispdata @@ -0,0 +1,30 @@ +;;; -*- mode: lisp-data -*- +((pass 10.0 "PASS " (? ?:) "changeme")) +((nick 0.2 "NICK tester")) + +((user 0.2 "USER " user " " (ignored digit "*") " :" realname) + (0.0 ":" dom " 001 " nick " :Welcome to the Internet Relay Network tester= ") + (0.0 ":" dom " 002 " nick " :Your host is " dom) + (0.0 ":" dom " 003 " nick " :This server was created just now") + (0.0 ":" dom " 004 " nick " " dom " BERios CEIRabehiklmnoqstv Iabehkloqv") + (0.0 ":" dom " 005 " nick " MODES NETWORK=3DExampleOrg NICKLEN=3D32 PREFI= X=3D(qaohv)~&@%+" + " :are supported by this server") + (0.0 ":" dom " 251 " nick " :There are 3 users and 0 invisible on 1 serve= r(s)") + (0.0 ":" dom " 252 " nick " 0 :IRC Operators online") + (0.0 ":" dom " 253 " nick " 0 :unregistered connections") + (0.0 ":" dom " 254 " nick " 1 :channels formed") + (0.0 ":" dom " 255 " nick " :I have 3 clients and 0 servers") + (0.0 ":" dom " 265 " nick " 3 3 :Current local users 3, max 3") + (0.0 ":" dom " 266 " nick " 3 3 :Current global users 3, max 3") + (0.0 ":" dom " 422 " nick " :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + (0.0 ":" dom " 221 " nick " +Zi") + + (0.0 ":" dom " 306 " nick " :You have been marked as being away") + (0.0 ":" nick "!~" nick "@localhost JOIN #chan") + (0.0 ":" dom " 353 alice =3D #chan :+alice!~alice@example.com @%+bob!~bob= @example.org") + (0.0 ":" dom " 366 alice #chan :End of NAMES list")) + +((mode 1.2 "MODE #chan") + (0.1 ":bob!~bob@example.org PRIVMSG #chan :" nick ": hey")) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/eof.lispdata b/test/l= isp/erc/erc-d/erc-d-self-resources/eof.lispdata new file mode 100644 index 0000000000..5da84b2e74 --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/eof.lispdata @@ -0,0 +1,33 @@ +;;; -*- mode: lisp-data -*- + +((pass 10.0 "PASS " (? ?:) "changeme")) +((nick 0.2 "NICK tester")) + +((user 0.2 "USER user 0 * :tester") + (0 ":irc.example.org 001 tester :Welcome to the Internet Relay Network te= ster") + (0 ":irc.example.org 002 tester :Your host is irc.example.org") + (0 ":irc.example.org 003 tester :This server was created just now") + (0 ":irc.example.org 004 tester irc.example.org BERios CEIRabehiklmnoqstv= Iabehkloqv") + (0 ":irc.example.org 005 tester MODES NETWORK=3DExampleOrg NICKLEN=3D32 P= REFIX=3D(qaohv)~&@%+" + " :are supported by this server") + (0 ":irc.example.org 251 tester :There are 3 users and 0 invisible on 1 s= erver(s)") + ;; Just to mix thing's up (force handler to schedule timer) + (0.1 ":irc.example.org 252 tester 0 :IRC Operators online") + (0 ":irc.example.org 253 tester 0 :unregistered connections") + (0 ":irc.example.org 254 tester 1 :channels formed") + (0 ":irc.example.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.example.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.example.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.example.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + (0 ":irc.example.org 221 tester +Zi") + (0 ":irc.example.org 306 tester :You have been marked as being away") + (0 ":tester!~tester@localhost JOIN #chan") + (0 ":irc.example.org 353 alice =3D #chan :+alice!~alice@example.com @%+bo= b!~bob@example.org") + (0 ":irc.example.org 366 alice #chan :End of NAMES list")) + +((mode-chan 1.2 "MODE #chan") + (0.1 ":bob!~bob@example.org PRIVMSG #chan :hey")) + +((eof 1.0 EOF)) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/fuzzy.lispdata b/test= /lisp/erc/erc-d/erc-d-self-resources/fuzzy.lispdata new file mode 100644 index 0000000000..0504b6a668 --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/fuzzy.lispdata @@ -0,0 +1,42 @@ +;;; -*- mode: lisp-data -*- +((pass 10.0 "PASS " (? ?:) "changeme")) +((nick 0.2 "NICK tester")) + +((user 0.5 "USER user 0 * :tester") + (0.0 "@time=3D" now " :irc.org 001 tester :Welcome to the Internet Relay = Network tester") + (0.0 "@time=3D" now " :irc.org 002 tester :Your host is irc.org") + (0.0 "@time=3D" now " :irc.org 003 tester :This server was created just n= ow") + (0.0 "@time=3D" now " :irc.org 004 tester irc.org BERios CEIRabehiklmnoqs= tv Iabehkloqv") + (0.0 "@time=3D" now " :irc.org 005 tester MODES NETWORK=3DExampleOrg NICK= LEN=3D32 PREFIX=3D(qaohv)~&@%+ :are supported by this server") + (0.0 "@time=3D" now " :irc.org 251 tester :There are 3 users and 0 invisi= ble on 1 server(s)") + (0.0 "@time=3D" now " :irc.org 252 tester 0 :IRC Operators online") + (0.0 "@time=3D" now " :irc.org 253 tester 0 :unregistered connections") + (0.0 "@time=3D" now " :irc.org 254 tester 1 :channels formed") + (0.0 "@time=3D" now " :irc.org 255 tester :I have 3 clients and 0 servers= ") + (0.0 "@time=3D" now " :irc.org 265 tester 3 3 :Current local users 3, max= 3") + (0.0 "@time=3D" now " :irc.org 266 tester 3 3 :Current global users 3, ma= x 3") + (0.0 "@time=3D" now " :irc.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + (0.0 "@time=3D" now " :irc.org 221 tester +Zi") + (0.0 "@time=3D" now " :irc.org 306 tester :You have been marked as being = away")) + +((~join-foo 3.2 "JOIN #foo") + (0 "@time=3D" now " :tester!~tester@localhost JOIN #foo") + (0 "@time=3D" now " :irc.example.org 353 alice =3D #foo :+alice!~alice@ex= ample.com @%+bob!~bob@example.org") + (0 "@time=3D" now " :irc.example.org 366 alice #foo :End of NAMES list")) + +((~join-bar 1.2 "JOIN #bar") + (0 "@time=3D" now " :tester!~tester@localhost JOIN #bar") + (0 "@time=3D" now " :irc.example.org 353 alice =3D #bar :+alice!~alice@ex= ample.com @%+bob!~bob@example.org") + (0 "@time=3D" now " :irc.example.org 366 alice #bar :End of NAMES list")) + +((~mode-foo 3.2 "MODE #foo") + (0.0 "@time=3D" now " :irc.example.org 324 tester #foo +Cint") + (0.0 "@time=3D" now " :irc.example.org 329 tester #foo 1519850102") + (0.1 "@time=3D" now " :bob!~bob@example.org PRIVMSG #foo :hey")) + +((mode-bar 10.2 "MODE #bar") + (0.0 "@time=3D" now " :irc.example.org 324 tester #bar +HMfnrt 50:5h :10:= 5") + (0.0 "@time=3D" now " :irc.example.org 329 tester #bar :1602642829") + (0.1 "@time=3D" now " :alice!~alice@example.com PRIVMSG #bar :hi")) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/incremental.lispdata = b/test/lisp/erc/erc-d/erc-d-self-resources/incremental.lispdata new file mode 100644 index 0000000000..ab940fe612 --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/incremental.lispdata @@ -0,0 +1,43 @@ +;;; -*- mode: lisp-data -*- +((pass 10.0 "PASS " (? ?:) "changeme")) +((nick 0.2 "NICK tester")) + +((user 0.2 "USER user 0 * :tester") + (0.0 ":irc.foo.net 001 tester :Welcome to the Internet Relay Network test= er") + (0.0 ":irc.foo.net 002 tester :Your host is irc.foo.net") + (0.0 ":irc.foo.net 003 tester :This server was created just now") + (0.0 ":irc.foo.net 004 tester irc.foo.net BERios CEIRabehiklmnoqstv Iabeh= kloqv") + (0.0 ":irc.foo.net 005 tester MODES NETWORK=3DFooNet NICKLEN=3D32 PREFIX= =3D(qaohv)~&@%+" + " :are supported by this server") + (0.0 ":irc.foo.net 251 tester :There are 3 users and 0 invisible on 1 ser= ver(s)") + (0.0 ":irc.foo.net 252 tester 0 :IRC Operators online") + (0.0 ":irc.foo.net 253 tester 0 :unregistered connections") + (0.0 ":irc.foo.net 254 tester 1 :channels formed") + (0.0 ":irc.foo.net 255 tester :I have 3 clients and 0 servers") + (0.0 ":irc.foo.net 265 tester 3 3 :Current local users 3, max 3") + (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") + (0.0 ":irc.foo.net 221 tester +Zi") + (0.0 ":irc.foo.net 306 tester :You have been marked as being away")) + +((join 3 "JOIN #foo") + (0 ":tester!~tester@localhost JOIN #foo") + (0 ":irc.foo.net 353 alice =3D #foo :+alice!~alice@example.com @%+bob!~bo= b@example.org") + (0 ":irc.foo.net 366 alice #foo :End of NAMES list")) + +((mode 3 "MODE #foo") + (0.0 ":irc.foo.net 324 tester #foo +Cint") + (0.0 ":irc.foo.net 329 tester #foo 1519850102") + (0.1 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :alice: But, in defence, by = mercy, 'tis most just.") + (0.1 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #foo :bob: Grows, lives, and di= es, in single blessedness.") + (0.1 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :Look for me.") + (0.1 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #foo :bob: By this hand, it wil= l not kill a fly. But come, now I will be your Rosalind in a more coming-on= disposition; and ask me what you will, I will grant it.") + (0.1 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :alice: That I must love a l= oathed enemy.") + (0.1 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #foo :bob: As't please your lor= dship: I'll leave you.") + (0.1 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :alice: Then there is no tru= e lover in the forest; else sighing every minute and groaning every hour wo= uld detect the lazy foot of Time as well as a clock.") + (0.1 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #foo :bob: His discretion, I am= sure, cannot carry his valour, for the goose carries not the fox. It is we= ll: leave it to his discretion, and let us listen to the moon.") + (0.1 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :Done")) + +((hi 10 "PRIVMSG #foo :Hi")) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/irc-parser-tests.lisp= data b/test/lisp/erc/erc-d/erc-d-self-resources/irc-parser-tests.lispdata new file mode 100644 index 0000000000..168569f548 --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/irc-parser-tests.lispdata @@ -0,0 +1,380 @@ +;;; -*- mode: lisp-data; -*- + +;; https://github.com/DanielOaks/irc-parser-tests +((mask-match + (tests + ((mask . "*@127.0.0.1") + (matches "coolguy!ab@127.0.0.1" "cooldud3!~bc@127.0.0.1") + (fails "coolguy!ab@127.0.0.5" "cooldud3!~d@124.0.0.1")) + ((mask . "cool*@*") + (matches "coolguy!ab@127.0.0.1" "cooldud3!~bc@127.0.0.1" "cool132!ab@e= xample.com") + (fails "koolguy!ab@127.0.0.5" "cooodud3!~d@124.0.0.1")) + ((mask . "cool!*@*") + (matches "cool!guyab@127.0.0.1" "cool!~dudebc@127.0.0.1" "cool!312ab@e= xample.com") + (fails "coolguy!ab@127.0.0.1" "cooldud3!~bc@127.0.0.1" "koolguy!ab@127= .0.0.5" "cooodud3!~d@124.0.0.1")) + ((mask . "cool!?username@*") + (matches "cool!ausername@127.0.0.1" "cool!~username@127.0.0.1") + (fails "cool!username@127.0.0.1")) + ((mask . "cool!a?*@*") + (matches "cool!ab@127.0.0.1" "cool!abc@127.0.0.1") + (fails "cool!a@127.0.0.1")) + ((mask . "cool[guy]!*@*") + (matches "cool[guy]!guy@127.0.0.1" "cool[guy]!a@example.com") + (fails "coolg!ab@127.0.0.1" "cool[!ac@127.0.1.1")))) + (msg-join + (tests + ((desc . "Simple test with verb and params.") + (atoms + (verb . "foo") + (params "bar" "baz" "asdf")) + (matches "foo bar baz asdf" "foo bar baz :asdf")) + ((desc . "Simple test with source and no params.") + (atoms + (source . "src") + (verb . "AWAY")) + (matches ":src AWAY")) + ((desc . "Simple test with source and empty trailing param.") + (atoms + (source . "src") + (verb . "AWAY") + (params "")) + (matches ":src AWAY :")) + ((desc . "Simple test with source.") + (atoms + (source . "coolguy") + (verb . "foo") + (params "bar" "baz" "asdf")) + (matches ":coolguy foo bar baz asdf" ":coolguy foo bar baz :asdf")) + ((desc . "Simple test with trailing param.") + (atoms + (verb . "foo") + (params "bar" "baz" "asdf quux")) + (matches "foo bar baz :asdf quux")) + ((desc . "Simple test with empty trailing param.") + (atoms + (verb . "foo") + (params "bar" "baz" "")) + (matches "foo bar baz :")) + ((desc . "Simple test with trailing param containing colon.") + (atoms + (verb . "foo") + (params "bar" "baz" ":asdf")) + (matches "foo bar baz ::asdf")) + ((desc . "Test with source and trailing param.") + (atoms + (source . "coolguy") + (verb . "foo") + (params "bar" "baz" "asdf quux")) + (matches ":coolguy foo bar baz :asdf quux")) + ((desc . "Test with trailing containing beginning+end whitespace.") + (atoms + (source . "coolguy") + (verb . "foo") + (params "bar" "baz" " asdf quux ")) + (matches ":coolguy foo bar baz : asdf quux ")) + ((desc . "Test with trailing containing what looks like another trailin= g param.") + (atoms + (source . "coolguy") + (verb . "PRIVMSG") + (params "bar" "lol :) ")) + (matches ":coolguy PRIVMSG bar :lol :) ")) + ((desc . "Simple test with source and empty trailing.") + (atoms + (source . "coolguy") + (verb . "foo") + (params "bar" "baz" "")) + (matches ":coolguy foo bar baz :")) + ((desc . "Trailing contains only spaces.") + (atoms + (source . "coolguy") + (verb . "foo") + (params "bar" "baz" " ")) + (matches ":coolguy foo bar baz : ")) + ((desc . "Param containing tab (tab is not considered SPACE for message= splitting).") + (atoms + (source . "coolguy") + (verb . "foo") + (params "b ar" "baz")) + (matches ":coolguy foo b ar baz" ":coolguy foo b ar :baz")) + ((desc . "Tag with no value and space-filled trailing.") + (atoms + (tags + (asd . "")) + (source . "coolguy") + (verb . "foo") + (params "bar" "baz" " ")) + (matches "@asd :coolguy foo bar baz : ")) + ((desc . "Tags with escaped values.") + (atoms + (verb . "foo") + (tags + (a . "b\\and\nk") + (d . "gh;764"))) + (matches "@a=3Db\\\\and\\nk;d=3Dgh\\:764 foo" "@d=3Dgh\\:764;a=3Db\\\\= and\\nk foo")) + ((desc . "Tags with escaped values and params.") + (atoms + (verb . "foo") + (tags + (a . "b\\and\nk") + (d . "gh;764")) + (params "par1" "par2")) + (matches "@a=3Db\\\\and\\nk;d=3Dgh\\:764 foo par1 par2" "@a=3Db\\\\and= \\nk;d=3Dgh\\:764 foo par1 :par2" "@d=3Dgh\\:764;a=3Db\\\\and\\nk foo par1 = par2" "@d=3Dgh\\:764;a=3Db\\\\and\\nk foo par1 :par2")) + ((desc . "Tag with long, strange values (including LF and newline).") + (atoms + (tags + (foo . "\\\\;\\s =0D\n")) + (verb . "COMMAND")) + (matches "@foo=3D\\\\\\\\\\:\\\\s\\s\\r\\n COMMAND")))) + (msg-split + (tests + ((input . "foo bar baz asdf") + (atoms + (verb . "foo") + (params "bar" "baz" "asdf"))) + ((input . ":coolguy foo bar baz asdf") + (atoms + (source . "coolguy") + (verb . "foo") + (params "bar" "baz" "asdf"))) + ((input . "foo bar baz :asdf quux") + (atoms + (verb . "foo") + (params "bar" "baz" "asdf quux"))) + ((input . "foo bar baz :") + (atoms + (verb . "foo") + (params "bar" "baz" ""))) + ((input . "foo bar baz ::asdf") + (atoms + (verb . "foo") + (params "bar" "baz" ":asdf"))) + ((input . ":coolguy foo bar baz :asdf quux") + (atoms + (source . "coolguy") + (verb . "foo") + (params "bar" "baz" "asdf quux"))) + ((input . ":coolguy foo bar baz : asdf quux ") + (atoms + (source . "coolguy") + (verb . "foo") + (params "bar" "baz" " asdf quux "))) + ((input . ":coolguy PRIVMSG bar :lol :) ") + (atoms + (source . "coolguy") + (verb . "PRIVMSG") + (params "bar" "lol :) "))) + ((input . ":coolguy foo bar baz :") + (atoms + (source . "coolguy") + (verb . "foo") + (params "bar" "baz" ""))) + ((input . ":coolguy foo bar baz : ") + (atoms + (source . "coolguy") + (verb . "foo") + (params "bar" "baz" " "))) + ((input . "@a=3Db;c=3D32;k;rt=3Dql7 foo") + (atoms + (verb . "foo") + (tags + (a . "b") + (c . "32") + (k . "") + (rt . "ql7")))) + ((input . "@a=3Db\\\\and\\nk;c=3D72\\s45;d=3Dgh\\:764 foo") + (atoms + (verb . "foo") + (tags + (a . "b\\and\nk") + (c . "72 45") + (d . "gh;764")))) + ((input . "@c;h=3D;a=3Db :quux ab cd") + (atoms + (tags + (c . "") + (h . "") + (a . "b")) + (source . "quux") + (verb . "ab") + (params "cd"))) + ((input . ":src JOIN #chan") + (atoms + (source . "src") + (verb . "JOIN") + (params "#chan"))) + ((input . ":src JOIN :#chan") + (atoms + (source . "src") + (verb . "JOIN") + (params "#chan"))) + ((input . ":src AWAY") + (atoms + (source . "src") + (verb . "AWAY"))) + ((input . ":src AWAY ") + (atoms + (source . "src") + (verb . "AWAY"))) + ((input . ":cool guy foo bar baz") + (atoms + (source . "cool guy") + (verb . "foo") + (params "bar" "baz"))) + ((input . ":coolguy!ag@net=035w=03ork.admin PRIVMSG foo :bar baz") + (atoms + (source . "coolguy!ag@net=035w=03ork.admin") + (verb . "PRIVMSG") + (params "foo" "bar baz"))) + ((input . ":coolguy!~ag@n=02et=0305w=0Fork.admin PRIVMSG foo :bar baz") + (atoms + (source . "coolguy!~ag@n=02et=0305w=0Fork.admin") + (verb . "PRIVMSG") + (params "foo" "bar baz"))) + ((input . "@tag1=3Dvalue1;tag2;vendor1/tag3=3Dvalue2;vendor2/tag4=3D :i= rc.example.com COMMAND param1 param2 :param3 param3") + (atoms + (tags + (tag1 . "value1") + (tag2 . "") + (vendor1/tag3 . "value2") + (vendor2/tag4 . "")) + (source . "irc.example.com") + (verb . "COMMAND") + (params "param1" "param2" "param3 param3"))) + ((input . ":irc.example.com COMMAND param1 param2 :param3 param3") + (atoms + (source . "irc.example.com") + (verb . "COMMAND") + (params "param1" "param2" "param3 param3"))) + ((input . "@tag1=3Dvalue1;tag2;vendor1/tag3=3Dvalue2;vendor2/tag4 COMMA= ND param1 param2 :param3 param3") + (atoms + (tags + (tag1 . "value1") + (tag2 . "") + (vendor1/tag3 . "value2") + (vendor2/tag4 . "")) + (verb . "COMMAND") + (params "param1" "param2" "param3 param3"))) + ((input . "COMMAND") + (atoms + (verb . "COMMAND"))) + ((input . "@foo=3D\\\\\\\\\\:\\\\s\\s\\r\\n COMMAND") + (atoms + (tags + (foo . "\\\\;\\s =0D\n")) + (verb . "COMMAND"))) + ((input . ":gravel.mozilla.org 432 #momo :Erroneous Nickname: Illegal = characters") + (atoms + (source . "gravel.mozilla.org") + (verb . "432") + (params "#momo" "Erroneous Nickname: Illegal characters"))) + ((input . ":gravel.mozilla.org MODE #tckk +n ") + (atoms + (source . "gravel.mozilla.org") + (verb . "MODE") + (params "#tckk" "+n"))) + ((input . ":services.esper.net MODE #foo-bar +o foobar ") + (atoms + (source . "services.esper.net") + (verb . "MODE") + (params "#foo-bar" "+o" "foobar"))) + ((input . "@tag1=3Dvalue\\\\ntest COMMAND") + (atoms + (tags + (tag1 . "value\\ntest")) + (verb . "COMMAND"))) + ((input . "@tag1=3Dvalue\\1 COMMAND") + (atoms + (tags + (tag1 . "value1")) + (verb . "COMMAND"))) + ((input . "@tag1=3Dvalue1\\ COMMAND") + (atoms + (tags + (tag1 . "value1")) + (verb . "COMMAND"))) + ((input . "@tag1=3D1;tag2=3D3;tag3=3D4;tag1=3D5 COMMAND") + (atoms + (tags + (tag1 . "5") + (tag2 . "3") + (tag3 . "4")) + (verb . "COMMAND"))) + ((input . "@tag1=3D1;tag2=3D3;tag3=3D4;tag1=3D5;vendor/tag2=3D8 COMMAND= ") + (atoms + (tags + (tag1 . "5") + (tag2 . "3") + (tag3 . "4") + (vendor/tag2 . "8")) + (verb . "COMMAND"))) + ((input . ":SomeOp MODE #channel :+i") + (atoms + (source . "SomeOp") + (verb . "MODE") + (params "#channel" "+i"))) + ((input . ":SomeOp MODE #channel +oo SomeUser :AnotherUser") + (atoms + (source . "SomeOp") + (verb . "MODE") + (params "#channel" "+oo" "SomeUser" "AnotherUser"))))) + (userhost-split + (tests + ((source . "coolguy") + (atoms + (nick . "coolguy"))) + ((source . "coolguy!ag@127.0.0.1") + (atoms + (nick . "coolguy") + (user . "ag") + (host . "127.0.0.1"))) + ((source . "coolguy!~ag@localhost") + (atoms + (nick . "coolguy") + (user . "~ag") + (host . "localhost"))) + ((source . "coolguy@127.0.0.1") + (atoms + (nick . "coolguy") + (host . "127.0.0.1"))) + ((source . "coolguy!ag") + (atoms + (nick . "coolguy") + (user . "ag"))) + ((source . "coolguy!ag@net=035w=03ork.admin") + (atoms + (nick . "coolguy") + (user . "ag") + (host . "net=035w=03ork.admin"))) + ((source . "coolguy!~ag@n=02et=0305w=0Fork.admin") + (atoms + (nick . "coolguy") + (user . "~ag") + (host . "n=02et=0305w=0Fork.admin"))))) + (validate-hostname + (tests + ((host . "irc.example.com") + (valid . t)) + ((host . "i.coolguy.net") + (valid . t)) + ((host . "irc-srv.net.uk") + (valid . t)) + ((host . "iRC.CooLguY.NeT") + (valid . t)) + ((host . "gsf.ds342.co.uk") + (valid . t)) + ((host . "324.net.uk") + (valid . t)) + ((host . "xn--bcher-kva.ch") + (valid . t)) + ((host . "-lol-.net.uk") + (valid . :false)) + ((host . "-lol.net.uk") + (valid . :false)) + ((host . "_irc._sctp.lol.net.uk") + (valid . :false)) + ((host . "irc") + (valid . :false)) + ((host . "com") + (valid . :false)) + ((host . "") + (valid . :false))))) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/linger-multi-a.lispda= ta b/test/lisp/erc/erc-d/erc-d-self-resources/linger-multi-a.lispdata new file mode 100644 index 0000000000..751500537d --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/linger-multi-a.lispdata @@ -0,0 +1,3 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS " (? ?:) "a")) +((linger 100 LINGER)) \ No newline at end of file diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/linger-multi-b.lispda= ta b/test/lisp/erc/erc-d/erc-d-self-resources/linger-multi-b.lispdata new file mode 100644 index 0000000000..c906c9e649 --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/linger-multi-b.lispdata @@ -0,0 +1,3 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS " (? ?:) "b")) +((linger 1 LINGER)) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/linger.lispdata b/tes= t/lisp/erc/erc-d/erc-d-self-resources/linger.lispdata new file mode 100644 index 0000000000..36c81a3af4 --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/linger.lispdata @@ -0,0 +1,33 @@ +;;; -*- mode: lisp-data -*- + +((pass 10.0 "PASS " (? ?:) "changeme")) +((nick 0.2 "NICK tester")) + +((user 0.2 "USER user 0 * :tester") + (0 ":irc.example.org 001 tester :Welcome to the Internet Relay Network te= ster") + (0 ":irc.example.org 002 tester :Your host is irc.example.org") + (0 ":irc.example.org 003 tester :This server was created just now") + (0 ":irc.example.org 004 tester irc.example.org BERios CEIRabehiklmnoqstv= Iabehkloqv") + (0 ":irc.example.org 005 tester MODES NETWORK=3DExampleOrg NICKLEN=3D32 P= REFIX=3D(qaohv)~&@%+" + " :are supported by this server") + (0 ":irc.example.org 251 tester :There are 3 users and 0 invisible on 1 s= erver(s)") + ;; Just to mix thing's up (force handler to schedule timer) + (0.1 ":irc.example.org 252 tester 0 :IRC Operators online") + (0 ":irc.example.org 253 tester 0 :unregistered connections") + (0 ":irc.example.org 254 tester 1 :channels formed") + (0 ":irc.example.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.example.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.example.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.example.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + (0 ":irc.example.org 221 tester +Zi") + (0 ":irc.example.org 306 tester :You have been marked as being away") + (0 ":tester!~tester@localhost JOIN #chan") + (0 ":irc.example.org 353 alice =3D #chan :+alice!~alice@example.com @%+bo= b!~bob@example.org") + (0 ":irc.example.org 366 alice #chan :End of NAMES list")) + +((mode-chan 1.2 "MODE #chan") + (0 ":bob!~bob@example.org PRIVMSG #chan :hey")) + +((linger 1.0 LINGER)) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/no-block.lispdata b/t= est/lisp/erc/erc-d/erc-d-self-resources/no-block.lispdata new file mode 100644 index 0000000000..cd341dd192 --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/no-block.lispdata @@ -0,0 +1,55 @@ +;;; -*- mode: lisp-data -*- +((pass 10.0 "PASS " (? ?:) "changeme")) +((nick 0.2 "NICK tester")) + +((user 0.2 "USER user 0 * :tester") + (0.0 ":irc.org 001 tester :Welcome to the Internet Relay Network tester") + (0.0 ":irc.org 002 tester :Your host is irc.org") + (0.0 ":irc.org 003 tester :This server was created just now") + (0.0 ":irc.org 004 tester irc.org BERios CEIRabehiklmnoqstv Iabehkloqv") + (0.0 ":irc.org 005 tester MODES NETWORK=3DExampleOrg NICKLEN=3D32 PREFIX= =3D(qaohv)~&@%+" + " :are supported by this server") + (0.0 ":irc.org 251 tester :There are 3 users and 0 invisible on 1 server(= s)") + (0.0 ":irc.org 252 tester 0 :IRC Operators online") + (0.0 ":irc.org 253 tester 0 :unregistered connections") + (0.0 ":irc.org 254 tester 1 :channels formed") + (0.0 ":irc.org 255 tester :I have 3 clients and 0 servers") + (0.0 ":irc.org 265 tester 3 3 :Current local users 3, max 3") + (0.0 ":irc.org 266 tester 3 3 :Current global users 3, max 3") + (0.0 ":irc.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + (0.0 ":irc.org 221 tester +Zi") + (0.0 ":irc.org 306 tester :You have been marked as being away")) + +((join-foo 1.2 "JOIN #foo") + (0 ":tester!~tester@localhost JOIN #foo") + (0 ":irc.example.org 353 alice =3D #foo :+alice!~alice@example.com @%+bob= !~bob@example.org") + (0 ":irc.example.org 366 alice #foo :End of NAMES list")) + +;; This would time out if the mode-foo's outgoing blocked (remove minus si= gns to see) +((~join-bar 1.5 "JOIN #bar") + (0 ":tester!~tester@localhost JOIN #bar") + (0 ":irc.example.org 353 alice =3D #bar :+alice!~alice@example.com @%+bob= !~bob@example.org") + (0 ":irc.example.org 366 alice #bar :End of NAMES list")) + +((mode-foo 1.2 "MODE #foo") + (0.0 ":irc.example.org 324 tester #foo +Cint") + (0.0 ":irc.example.org 329 tester #foo 1519850102") + (-0.1 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :alice: But, in defence, by= mercy, 'tis most just.") + (-0.2 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #foo :bob: Grows, lives, and d= ies, in single blessedness.") + (-0.3 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :alice: For these two hours= , Rosalind, I will leave thee.") + (-0.4 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #foo :bob: By this hand, it wi= ll not kill a fly. But come, now I will be your Rosalind in a more coming-o= n disposition; and ask me what you will, I will grant it.") + (-0.5 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :alice: That I must love a = loathed enemy.") + (-0.6 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #foo :bob: As't please your lo= rdship: I'll leave you.") + (-0.7 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :alice: Then there is no tr= ue lover in the forest; else sighing every minute and groaning every hour w= ould detect the lazy foot of Time as well as a clock.") + (-0.8 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #foo :bob: His discretion, I a= m sure, cannot carry his valour, for the goose carries not the fox. It is w= ell: leave it to his discretion, and let us listen to the moon.") + (-0.9 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :alice: As living here and = you no use of him.") + (-1.0 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #foo :bob: If there be truth i= n sight, you are my Rosalind.") + (-1.1 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :alice: That is another's l= awful promis'd love.") + (-1.1 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :I am heard.")) + +((mode-bar 1.5 "MODE #bar") + (0.0 ":irc.example.org 324 tester #bar +HMfnrt 50:5h :10:5") + (0.0 ":irc.example.org 329 tester #bar :1602642829") + (0.1 ":alice!~alice@example.com PRIVMSG #bar :hi")) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/no-match.lispdata b/t= est/lisp/erc/erc-d/erc-d-self-resources/no-match.lispdata new file mode 100644 index 0000000000..d147be1e08 --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/no-match.lispdata @@ -0,0 +1,32 @@ +;;; -*- mode: lisp-data -*- + +((pass 10.0 "PASS " (? ?:) "changeme")) +((nick 0.2 "NICK tester")) + +((user 0.2 "USER user 0 * :tester") + (0 ":irc.example.org 001 tester :Welcome to the Internet Relay Network te= ster") + (0 ":irc.example.org 002 tester :Your host is irc.example.org") + (0 ":irc.example.org 003 tester :This server was created just now") + (0 ":irc.example.org 004 tester irc.example.org BERios CEIRabehiklmnoqstv= Iabehkloqv") + (0 ":irc.example.org 005 tester MODES NETWORK=3DExampleOrg NICKLEN=3D32 P= REFIX=3D(qaohv)~&@%+" + " :are supported by this server") + (0 ":irc.example.org 251 tester :There are 3 users and 0 invisible on 1 s= erver(s)") + (0 ":irc.example.org 252 tester 0 :IRC Operators online") + (0 ":irc.example.org 253 tester 0 :unregistered connections") + (0 ":irc.example.org 254 tester 1 :channels formed") + (0 ":irc.example.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.example.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.example.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.example.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + (0 ":irc.example.org 221 tester +Zi") + (0 ":irc.example.org 306 tester :You have been marked as being away")) + +((join 1.2 "JOIN #chan") + (0 ":tester!~tester@localhost JOIN #chan") + (0 ":irc.example.org 353 alice =3D #chan :+alice!~alice@example.com @%+bo= b!~bob@example.org") + (0 ":irc.example.org 366 alice #chan :End of NAMES list")) + +((mode-chan 0.2 "MODE #chan") + (0.1 ":bob!~bob@example.org PRIVMSG #chan :hey")) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/no-pong.lispdata b/te= st/lisp/erc/erc-d/erc-d-self-resources/no-pong.lispdata new file mode 100644 index 0000000000..30cd805d76 --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/no-pong.lispdata @@ -0,0 +1,27 @@ +;;; -*- mode: lisp-data -*- + +((pass 10.0 "PASS " (? ?:) "changeme")) +((nick 0.2 "NICK tester")) + +((~ping 1.2 "PING " nonce) + (0.1 ":irc.example.org PONG irc.example.com " echo)) + +((user 0.2 "USER user 0 * :tester") + (0 ":irc.example.org 001 tester :Welcome to the Internet Relay Network te= ster") + (0 ":irc.example.org 002 tester :Your host is irc.example.org") + (0 ":irc.example.org 003 tester :This server was created just now") + (0 ":irc.example.org 004 tester irc.example.org BERios CEIRabehiklmnoqstv= Iabehkloqv") + (0 ":irc.example.org 005 tester MODES NETWORK=3DExampleOrg NICKLEN=3D32 P= REFIX=3D(qaohv)~&@%+" + " :are supported by this server") + (0 ":irc.example.org 251 tester :There are 3 users and 0 invisible on 1 s= erver(s)") + (0 ":irc.example.org 252 tester 0 :IRC Operators online") + (0 ":irc.example.org 253 tester 0 :unregistered connections") + (0 ":irc.example.org 254 tester 1 :channels formed") + (0 ":irc.example.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.example.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.example.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.example.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + (0 ":irc.example.org 221 tester +Zi") + (0 ":irc.example.org 306 tester :You have been marked as being away")) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/nonstandard.lispdata = b/test/lisp/erc/erc-d/erc-d-self-resources/nonstandard.lispdata new file mode 100644 index 0000000000..c9cd608e6b --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/nonstandard.lispdata @@ -0,0 +1,6 @@ +;;; -*- mode: lisp-data -*- +((one 1 "ONE one")) +((two 1 "TWO two")) +((blank 1 "")) +((one-space 1 " ")) +((two-spaces 1 " ")) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/proxy-barnet.lispdata= b/test/lisp/erc/erc-d/erc-d-self-resources/proxy-barnet.lispdata new file mode 100644 index 0000000000..e74d20d5b3 --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/proxy-barnet.lispdata @@ -0,0 +1,24 @@ +;;; -*- mode: lisp-data -*- + +((pass 10.0 "PASS " (? ?:) network ":changeme")) +((nick 1.2 "NICK tester")) + +((user 1.2 "USER user 0 * :tester") + (0.001 ":" fqdn " 001 tester :Welcome to the BAR Network tester") + (0.002 ":" fqdn " 002 tester :Your host is " fqdn) + (0.003 ":" fqdn " 003 tester :This server was created just now") + (0.004 ":" fqdn " 004 tester " fqdn " BERios CEIRabehiklmnoqstv Iabehkloq= v") + (0.005 ":" fqdn " 005 tester MODES NETWORK=3D" net " NICKLEN=3D32 PREFIX= =3D(qaohv)~&@%+" + " :are supported by this server") + (0.006 ":" fqdn " 251 tester :There are 3 users and 0 invisible on 1 serv= er(s)") + (0.007 ":" fqdn " 252 tester 0 :IRC Operators online") + (0.008 ":" fqdn " 253 tester 0 :unregistered connections") + (0.009 ":" fqdn " 254 tester 1 :channels formed") + (0.010 ":" fqdn " 255 tester :I have 3 clients and 0 servers") + (0.011 ":" fqdn " 265 tester 3 3 :Current local users 3, max 3") + (0.012 ":" fqdn " 266 tester 3 3 :Current global users 3, max 3") + (0.013 ":" fqdn " 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + (0.014 ":" fqdn " 221 tester +Zi") + (0.015 ":" fqdn " 306 tester :You have been marked as being away")) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/proxy-foonet.lispdata= b/test/lisp/erc/erc-d/erc-d-self-resources/proxy-foonet.lispdata new file mode 100644 index 0000000000..cc2e9d253c --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/proxy-foonet.lispdata @@ -0,0 +1,24 @@ +;;; -*- mode: lisp-data -*- + +((pass 10.0 "PASS " (? ?:) network ":changeme")) +((nick 1.2 "NICK tester")) + +((user 2.2 "USER user 0 * :tester") + (0.015 ":" fqdn " 001 tester :Welcome to the FOO Network tester") + (0.014 ":" fqdn " 002 tester :Your host is " fqdn) + (0.013 ":" fqdn " 003 tester :This server was created just now") + (0.012 ":" fqdn " 004 tester " fqdn " BERios CEIRabehiklmnoqstv Iabehkloq= v") + (0.011 ":" fqdn " 005 tester MODES NETWORK=3D" net " NICKLEN=3D32 PREFIX= =3D(qaohv)~&@%+" + " :are supported by this server") + (0.010 ":" fqdn " 251 tester :There are 3 users and 0 invisible on 1 serv= er(s)") + (0.009 ":" fqdn " 252 tester 0 :IRC Operators online") + (0.008 ":" fqdn " 253 tester 0 :unregistered connections") + (0.007 ":" fqdn " 254 tester 1 :channels formed") + (0.006 ":" fqdn " 255 tester :I have 3 clients and 0 servers") + (0.005 ":" fqdn " 265 tester 3 3 :Current local users 3, max 3") + (0.004 ":" fqdn " 266 tester 3 3 :Current global users 3, max 3") + (0.003 ":" fqdn " 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + (0.002 ":" fqdn " 221 tester +Zi") + (0.001 ":" fqdn " 306 tester :You have been marked as being away")) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/proxy-solo.lispdata b= /test/lisp/erc/erc-d/erc-d-self-resources/proxy-solo.lispdata new file mode 100644 index 0000000000..af216c80ed --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/proxy-solo.lispdata @@ -0,0 +1,9 @@ +;;; -*- mode: lisp-data -*- + +((pass 10.0 "PASS " (? ?:) "changeme")) +((nick 0.2 "NICK tester")) + +((user 0.2 "USER user 0 * :" (group (+ alpha)) eos) + (0 ":*status!znc@znc.in NOTICE " nick " :You have no networks configured." + " Use /znc AddNetwork to add one.") + (0 ":irc.znc.in 001 " nick " :Welcome " nick "!")) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/proxy-subprocess.el b= /test/lisp/erc/erc-d/erc-d-self-resources/proxy-subprocess.el new file mode 100644 index 0000000000..6e4624050a --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/proxy-subprocess.el @@ -0,0 +1,26 @@ +;;; proxy-subprocess.el --- Example setup file for erc-d +;;; Commentary: +;;; Code: + +(defvar erc-d-spec-vars) + +(setq erc-d-spec-vars + + (list + (cons 'fqdn (lambda (helper) + (let ((name (funcall helper :dialog-name))) + (funcall helper :set + (if (eq name 'proxy-foonet) + "irc.foo.net" + "irc.bar.net"))))) + + (cons 'net (lambda (helper) + (let ((name (funcall helper :dialog-name))) + (funcall helper :set + (if (eq name 'proxy-foonet) + "FooNet" + "BarNet"))))) + + (cons 'network '(group (+ alpha))))) + +;;; proxy-subprocess.el ends here diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/timeout.lispdata b/te= st/lisp/erc/erc-d/erc-d-self-resources/timeout.lispdata new file mode 100644 index 0000000000..9cfad4fa8c --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/timeout.lispdata @@ -0,0 +1,27 @@ +;;; -*- mode: lisp-data -*- + +((pass 10.0 "PASS " (? ?:) "changeme")) +((nick 0.2 "NICK tester")) + +((user 0.2 "USER user 0 * :tester") + (0 ":irc.example.org 001 tester :Welcome to the Internet Relay Network te= ster") + (0 ":irc.example.org 002 tester :Your host is irc.example.org") + (0 ":irc.example.org 003 tester :This server was created just now") + (0 ":irc.example.org 004 tester irc.example.org BERios CEIRabehiklmnoqstv= Iabehkloqv") + (0 ":irc.example.org 005 tester MODES NETWORK=3DExampleOrg NICKLEN=3D32 P= REFIX=3D(qaohv)~&@%+" + " :are supported by this server") + (0 ":irc.example.org 251 tester :There are 3 users and 0 invisible on 1 s= erver(s)") + (0 ":irc.example.org 252 tester 0 :IRC Operators online") + (0 ":irc.example.org 253 tester 0 :unregistered connections") + (0 ":irc.example.org 254 tester 1 :channels formed") + (0 ":irc.example.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.example.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.example.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.example.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + (0 ":irc.example.org 221 tester +Zi") + (0 ":irc.example.org 306 tester :You have been marked as being away")) + +((mode 0.2 "MODE #chan") + (0.1 ":bob!~bob@example.org PRIVMSG #chan :hey")) diff --git a/test/lisp/erc/erc-d/erc-d-self-resources/unexpected.lispdata b= /test/lisp/erc/erc-d/erc-d-self-resources/unexpected.lispdata new file mode 100644 index 0000000000..ac0a8fecfa --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self-resources/unexpected.lispdata @@ -0,0 +1,28 @@ +;;; -*- mode: lisp-data -*- +((t 10.0 "PASS " (? ?:) "changeme")) +((t 0.2 "NICK tester")) + +((t 0.2 "USER user 0 * :tester") + (0.0 ":irc.example.org 001 tester :Welcome to the Internet Relay Network = tester") + (0.0 ":irc.example.org 002 tester :Your host is irc.example.org") + (0.0 ":irc.example.org 003 tester :This server was created just now") + (0.0 ":irc.example.org 004 tester irc.example.org BERios CEIRabehiklmnoqs= tv Iabehkloqv") + (0.0 ":irc.example.org 005 tester MODES NETWORK=3DExampleOrg NICKLEN=3D32= PREFIX=3D(qaohv)~&@%+" + " :are supported by this server") + (0.0 ":irc.example.org 251 tester :There are 3 users and 0 invisible on 1= server(s)") + (0.0 ":irc.example.org 252 tester 0 :IRC Operators online") + (0.0 ":irc.example.org 253 tester 0 :unregistered connections") + (0.0 ":irc.example.org 254 tester 1 :channels formed") + (0.0 ":irc.example.org 255 tester :I have 3 clients and 0 servers") + (0.0 ":irc.example.org 265 tester 3 3 :Current local users 3, max 3") + (0.0 ":irc.example.org 266 tester 3 3 :Current global users 3, max 3") + (0.0 ":irc.example.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + (0.0 ":irc.example.org 221 tester +Zi") + + (0.0 ":irc.example.org 306 tester :You have been marked as being away") + (0.0 ":tester!~tester@localhost JOIN #chan") + (0.0 ":irc.example.org 353 alice =3D #chan :+alice!~alice@example.com @%+= bob!~bob@example.org") + (0.0 ":irc.example.org 366 alice #chan :End of NAMES list") + (0.1 ":bob!~bob@example.org PRIVMSG #chan :hey")) diff --git a/test/lisp/erc/erc-d/erc-d-self.el b/test/lisp/erc/erc-d/erc-d-= self.el new file mode 100644 index 0000000000..8e2e448d13 --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-self.el @@ -0,0 +1,1311 @@ +;;; erc-d-self.el --- tests for erc-d -*- lexical-binding: t -*- + +;; 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 +;; . + +;;; Commentary: +;; +;; This file tests the dumb server itself. The file name does not end +;; in "-tests.el" because test/Makefile looks for corresponding +;; library files and raises an error when one isn't found. + +;;; Code: +(require 'ert-x) +(eval-and-compile (let ((dir (getenv "EMACS_TEST_DIRECTORY"))) + (when dir + (load (concat dir "/lisp/erc/erc-d/erc-d") nil t) + (load (concat dir "/lisp/erc/erc-d/erc-d-t") nil t))= )) + +(require 'erc-d) +(require 'erc-d-t) +(require 'erc-backend) + +(ert-deftest erc-d-u--canned-load-dialog--basic () + (should-not (get-buffer "basic.lispdata")) + (should-not erc-d-u--canned-buffers) + (let ((exes (erc-d-u--canned-load-dialog 'basic t))) + (should (get-buffer "basic.lispdata")) + (should (memq (get-buffer (get-buffer "basic.lispdata")) + erc-d-u--canned-buffers)) + (should (equal (cl-loop for spec iter-by (iter-next exes) collect spec) + '((pass 10.0 "PASS " (? ?:) "changeme")))) + (should (equal (cl-loop for spec iter-by (iter-next exes) collect spec) + '((nick 0.2 "NICK tester")))) + (should (equal (car (cl-loop for s iter-by (iter-next exes) collect s)) + '(user 0.2 "USER user 0 * :tester"))) + (should (equal (car (cl-loop for s iter-by (iter-next exes) collect s)) + '(mode-user 1.2 "MODE tester +i"))) + (should (equal (cl-loop for s iter-by (iter-next exes) collect s) + '((mode-chan 1.2 "MODE #chan") + (0.1 ":bob!~bob@example.org PRIVMSG #chan :hey")))) + ;; See `define-error' site for `iter-end-of-sequence' + ;; Guess this self-parenting prevents detection by `should-error' + (ert-info ("End of buffer detected") + (let (done) + (condition-case err + (iter-next exes) + (iter-end-of-sequence + (setq done (cdr err)))) + (should-not done)))) + (should-not (get-buffer "basic.lispdata")) + (should-not erc-d-u--canned-buffers)) + +;; Fuzzies need to be able to access any non-exhausted genny. +(ert-deftest erc-d-u--canned-load-dialog--intermingled () + (should-not (get-buffer "basic.lispdata")) + (should-not erc-d-u--canned-buffers) + (let* ((exes (erc-d-u--canned-load-dialog 'basic t)) + (pass (iter-next exes)) + (nick (iter-next exes)) + (user (iter-next exes)) + (modu (iter-next exes)) + (modc (iter-next exes))) + + (should (equal (iter-next user) '(user 0.2 "USER user 0 * :tester"))) + (should (equal (iter-next modu) '(mode-user 1.2 "MODE tester +i"))) + (should (equal (iter-next modc) '(mode-chan 1.2 "MODE #chan"))) + + (cl-loop repeat 8 do (iter-next user)) ; skip a few + (should (equal (iter-next user) + '(0 ":irc.example.org 254 tester 1 :channels formed"))) + (should (equal (iter-next modu) + '(0 ":irc.example.org 221 tester +Zi"))) + (should (equal (cl-loop for spec iter-by modc collect spec) ; done + '((0.1 ":bob!~bob@example.org PRIVMSG #chan :hey")))) + + (cl-loop repeat 3 do (iter-next user)) + (cl-loop repeat 3 do (iter-next modu)) + + (ert-info ("Change up the order") + (should + (equal (iter-next modu) + '(0 ":irc.example.org 366 alice #chan :End of NAMES list"))) + (should + (equal (iter-next user) + '(0 ":irc.example.org 422 tester :MOTD File is missing")))) + + ;; Exhaust these + (should (equal (cl-loop for spec iter-by pass collect spec) ; done + '((pass 10.0 "PASS " (? ?:) "changeme")))) + (should (equal (cl-loop for spec iter-by nick collect spec) ; done + '((nick 0.2 "NICK tester")))) + + (ert-info ("End of file but no teardown because hunks outstanding") + (condition-case err + (iter-next exes) + (iter-end-of-sequence (should-not (cdr err)))) + (should (get-buffer "basic.lispdata"))) + + ;; Finish + (should + (eq t (condition-case _ (iter-next user) (iter-end-of-sequence t)))) + (should + (eq t (condition-case _ (iter-next modu) (iter-end-of-sequence t))))) + + (should-not (get-buffer "basic.lispdata")) + (should-not erc-d-u--canned-buffers)) + +;; This indirectly tests `erc-d-u--canned-read' cleanup/teardown + +(ert-deftest erc-d-u--rewrite-for-slow-mo () + (should-not (get-buffer "basic.lispdata")) + (should-not (get-buffer "basic.lispdata<2>")) + (should-not (get-buffer "basic.lispdata<3>")) + (should-not erc-d-u--canned-buffers) + (let ((exes (erc-d-u--canned-load-dialog 'basic)) ; genny in + (exes-lower (erc-d-u--canned-load-dialog 'basic t)) ; iter in + (exes-custom (erc-d-u--canned-load-dialog 'basic t))) + (should (get-buffer "basic.lispdata")) + (should (get-buffer "basic.lispdata<2>")) + (should (get-buffer "basic.lispdata<3>")) + (should (equal (list (get-buffer "basic.lispdata<3>") + (get-buffer "basic.lispdata<2>") + (get-buffer "basic.lispdata")) + erc-d-u--canned-buffers)) + + (ert-info ("Rewrite for slowmo basic") + (setq exes (funcall (erc-d-u--rewrite-for-slow-mo 10 exes))) ; genny= out + (should (equal (cl-loop for s iter-by (iter-next exes) collect s) + '((pass 20.0 "PASS " (? ?:) + "changeme")))) + (should (equal (cl-loop for s iter-by (iter-next exes) collect s) + '((nick 10.2 "NICK tester")))) + (should (equal (car (cl-loop for s iter-by (iter-next exes) collect = s)) + '(user 10.2 "USER user 0 * :tester"))) + (should (equal (car (cl-loop for s iter-by (iter-next exes) collect = s)) + '(mode-user 11.2 "MODE tester +i"))) + (should (equal (car (cl-loop for s iter-by (iter-next exes) collect = s)) + '(mode-chan 11.2 "MODE #chan"))) + (ert-info ("End of buffer detected") + (let (done) + (condition-case err + (iter-next exes) + (iter-end-of-sequence + (setq done (cdr err)))) + (should-not done)))) + + (ert-info ("Rewrite for slowmo bounded") + (setq exes-lower (erc-d-u--rewrite-for-slow-mo -5 exes-lower)) ; ite= r out + (should (equal (cl-loop for s iter-by (iter-next exes-lower) collect= s) + '((pass 10.0 "PASS " (? ?:) "changeme")))) + (should (equal (cl-loop for s iter-by (iter-next exes-lower) collect= s) + '((nick 5 "NICK tester")))) + (should (equal (car (cl-loop for s iter-by (iter-next exes-lower) + collect s)) + '(user 5 "USER user 0 * :tester"))) + (should (equal (car (cl-loop for s iter-by (iter-next exes-lower) + collect s)) + '(mode-user 5 "MODE tester +i"))) + (should (equal (car (cl-loop for s iter-by (iter-next exes-lower) + collect s)) + '(mode-chan 5 "MODE #chan"))) + (should-not (ignore-error iter-end-of-sequence (iter-next exes-lower= )))) + + (ert-info ("Rewrite for slowmo custom") + (setq exes-custom (erc-d-u--rewrite-for-slow-mo + (lambda (n) (* 2 n)) exes-custom)) + (should (equal (cl-loop for s iter-by (iter-next exes-custom) collec= t s) + '((pass 20.0 "PASS " (? ?:) "changeme")))) + (should (equal (cl-loop for s iter-by (iter-next exes-custom) collec= t s) + '((nick 0.4 "NICK tester")))) + (should (equal (car (cl-loop for s iter-by (iter-next exes-custom) + collect s)) + '(user 0.4 "USER user 0 * :tester"))) + (should (equal (car (cl-loop for s iter-by (iter-next exes-custom) + collect s)) + '(mode-user 2.4 "MODE tester +i"))) + (should (equal (car (cl-loop for s iter-by (iter-next exes-custom) + collect s)) + '(mode-chan 2.4 "MODE #chan"))) + (should-not (ignore-error iter-end-of-sequence + (iter-next exes-custom))))) + + (should-not (get-buffer "basic.lispdata")) + (should-not (get-buffer "basic.lispdata<2>")) + (should-not (get-buffer "basic.lispdata<3>")) + (should-not erc-d-u--canned-buffers)) + +(ert-deftest erc-d--active-ex-p () + (let ((ring (make-ring 5))) + (ert-info ("Empty ring returns nil for not active") + (should-not (erc-d--active-ex-p ring))) + (ert-info ("One fuzzy member returns nil for not active") + (ring-insert ring (make-erc-d-exchange :tag '~foo)) + (should-not (erc-d--active-ex-p ring))) + (ert-info ("One active member returns t for active") + (ring-insert-at-beginning ring (make-erc-d-exchange :tag 'bar)) + (should (erc-d--active-ex-p ring))))) + +(defun erc-d-self--parse-message-upstream (raw) + "Hack shim for parsing RAW line recvd from peer." + (cl-letf (((symbol-function #'erc-handle-parsed-server-response) + (lambda (_ p) p))) + (let ((erc-active-buffer nil)) + (erc-parse-server-response nil raw)))) + +(ert-deftest erc-d-i--validate-tags () + (should (erc-d-i--validate-tags + (concat "batch=3D4cc99692bf24a4bec4aa03da437364f5;" + "time=3D2021-01-04T00:32:13.839Z"))) + (should (erc-d-i--validate-tags "+foo=3Dbar;baz=3Dspam")) + (should (erc-d-i--validate-tags "foo=3D\\:ok;baz=3D\\s")) + (should (erc-d-i--validate-tags "foo=3D\303\247edilla")) + (should (erc-d-i--validate-tags "foo=3D\\")) + (should (erc-d-i--validate-tags "foo=3Dbar\\baz")) + (should-error (erc-d-i--validate-tags "foo=3D\\\\;baz=3D\\\r\\\n")) + (should-error (erc-d-i--validate-tags "foo=3D\n")) + (should-error (erc-d-i--validate-tags "foo=3D\0ok")) + (should-error (erc-d-i--validate-tags "foo=3Dbar baz")) + (should-error (erc-d-i--validate-tags "foo=3Dbar\r")) + (should-error (erc-d-i--validate-tags "foo=3Dbar;"))) + +(ert-deftest erc-d-i--parse-message () + (let* ((raw (concat "@time=3D2020-11-23T09:10:33.088Z " + ":tilde.chat BATCH +1 chathistory :#meta")) + (upstream (erc-d-self--parse-message-upstream raw)) + (ours (erc-d-i--parse-message raw))) + + ;; Upstream tags may be nil or (SYM . VAL) or (STR VAL) depending on + ;; the Emacs version and whether erc-v3 has been loaded. + (ert-info ("Baseline upstream") + (should (equal (erc-response.unparsed upstream) raw)) + (should (equal (erc-response.sender upstream) "tilde.chat")) + (should (equal (erc-response.command upstream) "BATCH")) + (should (equal (erc-response.command-args upstream) + '("+1" "chathistory" "#meta"))) + (should (equal (erc-response.contents upstream) "#meta"))) + + (ert-info ("Ours my not compare cl-equalp but is otherwise the same") + (should (equal (erc-d-i-message.unparsed ours) raw)) + (should (equal (erc-d-i-message.sender ours) "tilde.chat")) + (should (equal (erc-d-i-message.command ours) "BATCH")) + (should (equal (erc-d-i-message.command-args ours) + '("+1" "chathistory" "#meta"))) + (should (equal (erc-d-i-message.contents ours) "#meta")) + (should (equal (erc-d-i-message.tags ours) + '((time . "2020-11-23T09:10:33.088Z"))))) + + (ert-info ("No compat decodes the whole message as utf-8") + (setq ours (erc-d-i--parse-message + "@foo=3D\303\247edilla TAGMSG #ch\303\240n" + 'decode)) + (should-not (erc-d-i-message.compat ours)) + (should (equal (erc-d-i-message.command-args ours) '("#ch=C3=A0n"))) + (should (equal (erc-d-i-message.contents ours) "")) + (should (equal (erc-d-i-message.tags ours) '((foo . "=C3=A7edilla"))= ))))) + +(ert-deftest erc-d-i--unescape-tag-value () + (should (equal (erc-d-i--unescape-tag-value + "\\sabc\\sdef\\s\\sxyz\\s") + " abc def xyz ")) + (should (equal (erc-d-i--unescape-tag-value + "\\\\abc\\\\def\\\\\\\\xyz\\\\") + "\\abc\\def\\\\xyz\\")) + (should (equal (erc-d-i--unescape-tag-value "a\\bc") "abc")) + (should (equal (erc-d-i--unescape-tag-value + "\\\\abc\\\\def\\\\\\\\xyz\\") + "\\abc\\def\\\\xyz")) + (should (equal (erc-d-i--unescape-tag-value "a\\:b\\r\\nc\\sd") + "a;b\r\nc d"))) + +(ert-deftest erc-d-i--escape-tag-value () + (should (equal (erc-d-i--escape-tag-value " abc def xyz ") + "\\sabc\\sdef\\s\\sxyz\\s")) + (should (equal (erc-d-i--escape-tag-value "\\abc\\def\\\\xyz\\") + "\\\\abc\\\\def\\\\\\\\xyz\\\\")) + (should (equal (erc-d-i--escape-tag-value "a;b\r\nc d") + "a\\:b\\r\\nc\\sd"))) + +;; TODO add tests for msg-join, mask-match, userhost-split, +;; validate-hostname + +(ert-deftest erc-d-i--parse-message--irc-parser-tests () + (let* ((data (with-temp-buffer + (insert-file-contents + (ert-resource-file "irc-parser-tests.lispdata")) + (read (current-buffer)))) + (tests (assoc-default 'tests (assoc-default 'msg-split data))) + input atoms m ours) + (dolist (test tests) + (setq input (assoc-default 'input test) + atoms (assoc-default 'atoms test) + m (erc-d-i--parse-message input)) + (ert-info ("Parses tags correctly") + (setq ours (erc-d-i-message.tags m)) + (if-let ((tags (assoc-default 'tags atoms))) + (pcase-dolist (`(,key . ,value) ours) + (should (string=3D (cdr (assq key tags)) (or value "")))) + (should-not ours))) + (ert-info ("Parses verbs correctly") + (setq ours (erc-d-i-message.command m)) + (if-let ((verbs (assoc-default 'verb atoms))) + (should (string=3D (downcase verbs) (downcase ours))) + (should (string-empty-p ours)))) + (ert-info ("Parses sources correctly") + (setq ours (erc-d-i-message.sender m)) + (if-let ((source (assoc-default 'source atoms))) + (should (string=3D source ours)) + (should (string-empty-p ours)))) + (ert-info ("Parses params correctly") + (setq ours (erc-d-i-message.command-args m)) + (if-let ((params (assoc-default 'params atoms))) + (should (equal ours params)) + (should-not ours)))))) + +(iter-defun erc-d-self--i (form) + (while form (iter-yield (pop form)))) + +(ert-deftest erc-d--render-entries () + (let ((dialog (make-erc-d-dialog :vars `((:a . 1) + (c . ((a b) (: a space b))) + (d . (c alpha digit)) + (bee . 2) + (f . ,(lambda () "3")) + (i . emacs-pid)))) + (exchange (make-erc-d-exchange)) + it) + + (erc-d-exchange-reload dialog exchange) + + (ert-info ("Baseline Outgoing") + (setq it (erc-d--render-entries dialog exchange + (erc-d-self--i '((0 "abc"))))) + (should (equal (iter-next it) 0)) + (should (equal (iter-next it) "abc"))) + + (ert-info ("Incoming are regexp escaped") + (setq it (erc-d--render-entries dialog exchange + (erc-d-self--i '((i 0.0 "fsf" ".org"= ))))) + (should (equal (cons (iter-next it) (iter-next it)) '(i . 0.0))) + (should (equal (iter-next it) "\\`fsf\\.org"))) + + (ert-info ("Incoming can access vars via rx-let") + (setq it (erc-d--render-entries dialog exchange + (erc-d-self--i '((i 0.0 bee))))) + (should (equal (cons (iter-next it) (iter-next it)) '(i . 0.0))) + (should (equal (iter-next it) "\\`\002"))) + + (ert-info ("Incoming rx-let params") + (setq it (erc-d--render-entries dialog exchange + (erc-d-self--i '((i 0.0 d))))) + (should (equal (cons (iter-next it) (iter-next it)) '(i . 0.0))) + (should (equal (iter-next it) "\\`[[:alpha:]][[:space:]][[:digit:]]"= ))) + + (ert-info ("Incoming literal rx forms") + (setq it (erc-d--render-entries dialog exchange + (erc-d-self--i + '((i 0.0 (=3D 3 alpha) ".org"))))) + (should (equal (cons (iter-next it) (iter-next it)) '(i . 0.0))) + (should (equal (iter-next it) "\\`[[:alpha:]]\\{3\\}\\.org"))) + + (ert-info ("Self-quoting disallowed") + (setq it (erc-d--render-entries dialog exchange + (erc-d-self--i '((0 :a "abc"))))) + (should (equal (iter-next it) 0)) + (should-error (iter-next it))) + + (ert-info ("Outgoing mixed") + (let ((s '((0 (format "%s" (not (zerop i))) (string bee) f)))) + (setq it (erc-d--render-entries dialog exchange (erc-d-self--i s))= )) + (should (equal (iter-next it) 0)) + (should (equal (iter-next it) "t\0023"))) + + (ert-info ("Exits clean") + (when (listp (alist-get 'f (erc-d-dialog-vars dialog))) ; may be com= piled + (should (eq 'closure (car (alist-get 'f (erc-d-dialog-vars dialog)= ))))) + (let (c) + (condition-case _ (iter-next it) (iter-end-of-sequence (setq c t))) + (should c)) + (should (equal (erc-d-dialog-vars dialog) + `((:a . 1) + (c . ((a b) (: a space b))) + (d . (c alpha digit)) + (bee . 2) + (f . ,(alist-get 'f (erc-d-dialog-vars dialog))) + (i . emacs-pid))))))) + +(ert-deftest erc-d--render-entries--matches () + (let* ((alist (list + (cons 'f (lambda (a) (funcall a :match 1))) + (cons 'g (lambda () (match-string 2 "foo bar baz"))) + (cons 'h (lambda (a) (concat (funcall a :match 0) + (funcall a :request)))) + (cons 'i (lambda (_ e) (erc-d-exchange-request e))) + (cons 'j (lambda () + (set-match-data '(0 1)) + (match-string 0 "j"))))) + (dialog (make-erc-d-dialog :vars alist)) + (exchange (make-erc-d-exchange + :request "foo bar baz" + ;; 11 222 + :match-data '(4 11 4 6 8 11))) + it) + + (erc-d-exchange-reload dialog exchange) + + (ert-info ("Baseline outgoing") + (setq it (erc-d--render-entries dialog exchange + (erc-d-self--i '((0 :request))))) + (should (equal (iter-next it) 0)) + (should-error (iter-next it))) + + (ert-info ("One arg, match") + (erc-d-exchange-reload dialog exchange) + (setq it (erc-d--render-entries dialog exchange + (erc-d-self--i '((0 f))))) + (should (equal (iter-next it) 0)) + (should (equal (iter-next it) "ba"))) + + (ert-info ("No args") + (setq it (erc-d--render-entries dialog exchange + (erc-d-self--i '((0 g))))) + (should (equal (iter-next it) 0)) + (should (equal (iter-next it) "baz"))) + + (ert-info ("Second arg is exchange object") + (setq it (erc-d--render-entries dialog exchange + (erc-d-self--i '((0 i))))) + (should (equal (iter-next it) 0)) + (should (equal (iter-next it) "foo bar baz"))) + + (ert-info ("One arg, multiple calls") + (setq it (erc-d--render-entries dialog exchange + (erc-d-self--i '((0 h))))) + (should (equal (iter-next it) 0)) + (should (equal (iter-next it) "bar bazfoo bar baz"))) + + (ert-info ("Match data restored") + (setq it (erc-d--render-entries dialog exchange + (erc-d-self--i '((0 j))))) + (should (equal (iter-next it) 0)) + (should (equal (iter-next it) "j")) + + (setq it (erc-d--render-entries dialog exchange + (erc-d-self--i '((0 g))))) + (should (equal (iter-next it) 0)) + (should (equal (iter-next it) "baz"))) + + (ert-info ("Bad signature") + (let ((qlist (list 'f '(lambda (p q x) (ignore))))) + (setf (erc-d-dialog-vars dialog) qlist) + (should-error (erc-d-exchange-reload dialog exchange)))))) + +(ert-deftest erc-d--render-entries--dynamic () + (let* ((alist (list + (cons 'foo "foo") + '(f . (lambda () foo)) + (cons 'g '(lambda (a) (funcall a :rebind 'g f) "bar")) + (cons 'j (lambda (a) (funcall a :set "123") "abc")) + (cons 'k (lambda () "abc")))) + (dialog (make-erc-d-dialog :vars alist)) + (exchange (make-erc-d-exchange)) + it) + + (erc-d-exchange-reload dialog exchange) + + (ert-info ("Initial reference calls function") + (setq it (erc-d--render-entries dialog exchange + (erc-d-self--i '((0 j) (0 j))))) + (should (equal (iter-next it) 0)) + (should (equal (iter-next it) "abc"))) + + (ert-info ("Subsequent reference expands to string") + (should (equal (iter-next it) 0)) + (should (equal (iter-next it) "123"))) + + (ert-info ("Outside manipulation: initial reference calls function") + (setq it (erc-d--render-entries dialog exchange + (erc-d-self--i '((0 k) (0 k))))) + (should (equal (iter-next it) 0)) + (should (equal (iter-next it) "abc"))) + + (ert-info ("Outside manipulation: subsequent reference expands to stri= ng") + (erc-d-exchange-rebind dialog exchange 'k "123") + (should (equal (iter-next it) 0)) + (should (equal (iter-next it) "123"))) + + (ert-info ("Swap one function for another") + (setq it (erc-d--render-entries dialog exchange + (erc-d-self--i '((0 g) (0 g))))) + (should (equal (iter-next it) 0)) + (should (equal (iter-next it) "bar")) + (should (equal (iter-next it) 0)) + (should (equal (iter-next it) "foo"))) + + (ert-info ("Bindings accessible inside functions") ; anti-feature? + (setq it (erc-d--render-entries dialog exchange + (erc-d-self--i '((0 f))))) + (should (equal (iter-next it) 0)) + (should (equal (iter-next it) "foo"))) + + (ert-info ("Rebuild alist by sending flag") + (setq it (erc-d--render-entries dialog exchange + (erc-d-self--i + '((0 f) (1 f) (2 f) (i 3 f))))) + (should (equal (iter-next it) 0)) + (should (equal (iter-next it) "foo")) + (erc-d-exchange-rebind dialog exchange 'f "bar") + (should (equal (iter-next it) 1)) + (should (equal (iter-next it) "bar")) + (setq alist (setf (alist-get 'f (erc-d-dialog-vars dialog)) + (lambda nil "baz"))) + (should (eq (iter-next it) 2)) + (should (equal (iter-next it 'reload) "baz")) + (setq alist (setf (alist-get 'f (erc-d-dialog-vars dialog)) "spam")) + (should (eq (iter-next it) 'i)) + (should (eq (iter-next it 'reload) 3)) + (should (equal (iter-next it) "\\`spam"))))) + +(ert-deftest erc-d-t-with-cleanup () + (should-not (get-buffer "*echo*")) + (should-not (get-buffer "*foo*")) + (should-not (get-buffer "*bar*")) + (should-not (get-buffer "*baz*")) + (erc-d-t-with-cleanup + ((echo (start-process "echo" (get-buffer-create "*echo*") "sleep" "1= ")) + (buffer-foo (get-buffer-create "*foo*")) + (buffer-bar (get-buffer-create "*bar*")) + (clean-up (list (intern (process-name echo)))) ; let* + buffer-baz) + (ert-info ("Clean Up") + (should (equal clean-up '(ran echo))) + (should (bufferp buffer-baz)) + (should (bufferp buffer-foo)) + (setq buffer-foo nil)) + (setq buffer-baz (get-buffer-create "*baz*")) + (push 'ran clean-up)) + (ert-info ("Buffers and procs destroyed") + (should-not (get-buffer "*echo*")) + (should-not (get-buffer "*bar*")) + (should-not (get-buffer "*baz*"))) + (ert-info ("Buffer foo spared") + (should (get-buffer "*foo*")) + (kill-buffer "*foo*"))) + +(eval-and-compile + (defvar erc-d-self-with-server-password "changeme")) + +;; Compromise between removing `autojoin' from `erc-modules' entirely +;; and allowing side effects to meddle excessively +(defvar erc-autojoin-channels-alist) + +;; This is only meant to be used by tests in this file. +(cl-defmacro erc-d-self-with-server ((dumb-server-var erc-server-buffer-va= r) + dialog &rest body) + "Create server for DIALOG and run BODY. +DIALOG may also be a list of dialogs. ERC-SERVER-BUFFER-VAR and +DUMB-SERVER-VAR are bound accordingly in BODY." + (declare (indent 2)) + (when (eq '_ dumb-server-var) + (setq dumb-server-var (make-symbol "dumb-server-var"))) + (when (eq '_ erc-server-buffer-var) + (setq erc-server-buffer-var (make-symbol "erc-server-buffer-var"))) + (if (listp dialog) + (setq dialog (mapcar (lambda (f) (list 'quote f)) dialog)) + (setq dialog `((quote ,dialog)))) + `(let* (auth-source-do-cache + (,dumb-server-var (erc-d-run "localhost" t ,@dialog)) + ,erc-server-buffer-var + ;; + (erc-server-flood-penalty 0.05) + erc-autojoin-channels-alist + erc-server-auto-reconnect) + (should-not erc-d--slow-mo) + (with-current-buffer "*erc-d-server*" (erc-d-t-search-for 4 "Starting= ")) + ;; Allow important messages through, even in -batch mode. + (advice-add #'erc-handle-login :around #'erc-d-t-silence-around) + (advice-add #'erc-server-connect :around #'erc-d-t-silence-around) + (unless (or noninteractive erc-debug-irc-protocol) + (erc-toggle-debug-irc-protocol)) + (setq ,erc-server-buffer-var + (erc :server "localhost" + :password erc-d-self-with-server-password + :port (process-contact ,dumb-server-var :service) + :nick "tester" + :full-name "tester")) + (unwind-protect + (progn + ,@body + (erc-d-t-wait-for 1 "dumb-server death" + (not (process-live-p ,dumb-server-var)))) + (when (process-live-p erc-server-process) + (delete-process erc-server-process)) + (advice-remove #'erc-handle-login #'erc-d-t-silence-around) + (advice-remove #'erc-server-connect #'erc-d-t-silence-around) + (when noninteractive + (kill-buffer ,erc-server-buffer-var) + (erc-d-t-kill-related-buffers))))) + +(defmacro erc-d-self-with-failure-spy (found func-syms &rest body) + "Wrap functions with advice for inspecting errors caused by BODY. +Do this for functions whose names appear in FUNC-SYMS. When running +advice code, add errors to list FOUND. Note: the teardown finalizer is +not added by default. Also, `erc-d-linger-secs' likely has to +be nonzero for this to work." + (declare (indent 2)) + ;; Catch errors thrown by timers that `should-error'ignores + `(progn + (cl-labels ((ad (f o &rest r) + (condition-case err + (apply o r) + (error (push err ,found) + (advice-remove f 'spy))))) + (dolist (sym ,func-syms) + (advice-add sym :around (apply-partially #'ad sym) '((name . spy)= ))) + (progn ,@body)) + (setq ,found (nreverse ,found)) + (dolist (sym ,func-syms) + (advice-remove sym 'spy)))) + +(ert-deftest erc-d-run-nonstandard-messages () + (let* ((erc-d-linger-secs 0.2) + (dumb-server (erc-d-run "localhost" t 'nonstandard)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (expect (erc-d-t-make-expecter)) + (erc-d-t-use-regeexp-when-searching t) + client) + (with-current-buffer "*erc-d-server*" (erc-d-t-search-for 4 "Starting"= )) + (setq client (open-network-stream "erc-d-client" nil + "localhost" + (process-contact dumb-server :servic= e) + :coding 'binary)) + (ert-info ("Server splits CRLF delimited lines") + (process-send-string client "ONE one\r\nTWO two\r\n") + (with-current-buffer dumb-server-buffer + (funcall expect 1 "<- nonstandard:[[:digit:]]+ ONE one$") + (funcall expect 1 "<- nonstandard:[[:digit:]]+ TWO two$"))) + (ert-info ("Server doesn't discard empty lines") + (process-send-string client "\r\n") + (with-current-buffer dumb-server-buffer + (funcall expect 1 "<- nonstandard:[[:digit:]]+ $"))) + (ert-info ("Server preserves spaces") + (process-send-string client " \r\n") + (with-current-buffer dumb-server-buffer + (funcall expect 1 "<- nonstandard:[[:digit:]]+ \\{2\\}$")) + (process-send-string client " \r\n") + (with-current-buffer dumb-server-buffer + (funcall expect 1 "<- nonstandard:[[:digit:]]+ \\{3\\}$"))) + (erc-d-t-wait-for 3 "dumb-server death" + (not (process-live-p dumb-server))) + (delete-process client) + (when noninteractive + (kill-buffer dumb-server-buffer)))) + +(ert-deftest erc-d-run-basic () + (erc-d-self-with-server (_ _) basic + (erc-d-t-wait-for 3 "#chan" + (get-buffer "#chan")) + (with-current-buffer "#chan" + (erc-d-t-search-for 2 "hey")) + (when noninteractive + (kill-buffer "#chan")))) + +(ert-deftest erc-d-run-eof () + (skip-unless noninteractive) + (erc-d-self-with-server (_ erc-s-buf) eof + (erc-d-t-wait-for 3 "#chan" + (get-buffer "#chan")) + (with-current-buffer "#chan" + (erc-d-t-search-for 2 "hey")) + (with-current-buffer erc-s-buf + (process-send-eof erc-server-process)))) + +(ert-deftest erc-d-run-eof-fail () + (let (errors) + (erc-d-self-with-failure-spy errors '(erc-d--teardown) + (erc-d-self-with-server (_ _) eof + (erc-d-t-wait-for 5 "#chan" (get-buffer "#chan")) + (with-current-buffer "#chan" (erc-d-t-search-for 2 "hey")) + (erc-d-t-wait-for 10 "Bad match" errors))) + (should (string-match-p "Timed out awaiting request.*__EOF__" + (cadr (pop errors)))))) + +(ert-deftest erc-d-run-linger () + (erc-d-self-with-server (dumb-s _) linger + (erc-d-t-wait-for 3 "#chan" + (get-buffer "#chan")) + (with-current-buffer "#chan" + (erc-d-t-search-for 2 "hey")) + (with-current-buffer (process-buffer dumb-s) + (erc-d-t-search-for 2 "Lingering for 1.00 seconds")) + (with-current-buffer (process-buffer dumb-s) + (erc-d-t-search-for 2 "Lingered for 1.00 seconds")))) + +(ert-deftest erc-d-run-linger-fail () + (let ((erc-server-flood-penalty 0.1) + errors) + (erc-d-self-with-failure-spy + errors '(erc-d--teardown erc-d-command) + (erc-d-self-with-server (_ _) linger + (erc-d-t-wait-for 3 "#chan" + (get-buffer "#chan")) + (with-current-buffer "#chan" + (erc-d-t-search-for 2 "hey") + (erc-cmd-MSG "#chan hi")) + (erc-d-t-wait-for 10 "Bad match" errors))) + (should (string-match-p "Match failed.*hi" (cadr (pop errors)))))) + +(ert-deftest erc-d-run-linger-direct () + (let* ((dumb-server (erc-d-run "localhost" t + 'linger-multi-a 'linger-multi-b)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (client-buffer-a (get-buffer-create "*erc-d-client-a*")) + (client-buffer-b (get-buffer-create "*erc-d-client-b*")) + (start (current-time)) + client-a client-b) + (with-current-buffer "*erc-d-server*" (erc-d-t-search-for 4 "Starting"= )) + (setq client-a (open-network-stream "erc-d-client-a" client-buffer-a + "localhost" port + :coding 'binary) + client-b (open-network-stream "erc-d-client-b" client-buffer-b + "localhost" port + :coding 'binary)) + (process-send-string client-a "PASS :a\r\n") + (sleep-for 0.01) + (process-send-string client-b "PASS :b\r\n") + (sleep-for 0.01) + (erc-d-t-wait-for 3 "dumb-server death" + (not (process-live-p dumb-server))) + (ert-info ("Ensure linger of one second") + (should (time-less-p 1 (time-subtract (current-time) start))) + (should (time-less-p (time-subtract (current-time) start) 1.5))) + (delete-process client-a) + (delete-process client-b) + (when noninteractive + (kill-buffer client-buffer-a) + (kill-buffer client-buffer-b) + (kill-buffer dumb-server-buffer)))) + +(ert-deftest erc-d-run-drop-direct () + (let* ((dumb-server (erc-d-run "localhost" t 'drop-a 'drop-b)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (client-buffer-a (get-buffer-create "*erc-d-client-a*")) + (client-buffer-b (get-buffer-create "*erc-d-client-b*")) + (start (current-time)) + client-a client-b) + (with-current-buffer "*erc-d-server*" (erc-d-t-search-for 4 "Starting"= )) + (setq client-a (open-network-stream "erc-d-client-a" client-buffer-a + "localhost" port + :coding 'binary) + client-b (open-network-stream "erc-d-client-b" client-buffer-b + "localhost" port + :coding 'binary)) + (process-send-string client-a "PASS :a\r\n") + (sleep-for 0.01) + (process-send-string client-b "PASS :b\r\n") + (erc-d-t-wait-for 3 "client-a dies" (not (process-live-p client-a))) + (should (time-less-p (time-subtract (current-time) start) 0.32)) + (erc-d-t-wait-for 3 "dumb-server death" + (not (process-live-p dumb-server))) + (ert-info ("Ensure linger of one second") + (should (time-less-p 1 (time-subtract (current-time) start)))) + (delete-process client-a) + (delete-process client-b) + (when noninteractive + (kill-buffer client-buffer-a) + (kill-buffer client-buffer-b) + (kill-buffer dumb-server-buffer)))) + +(ert-deftest erc-d-run-no-match () + (let ((erc-d-linger-secs 1) + erc-server-auto-reconnect + errors) + (erc-d-self-with-failure-spy errors '(erc-d--teardown erc-d-command) + (erc-d-self-with-server (_ erc-server-buffer) no-match + (with-current-buffer erc-server-buffer + (erc-d-t-search-for 2 "away") + (erc-cmd-JOIN "#foo") + (erc-d-t-wait-for 10 "Bad match" errors)))) + (should (string-match-p "Match failed.*foo.*chan" (cadr (pop errors)))) + (should-not (get-buffer "#foo")))) + +(ert-deftest erc-d-run-timeout () + (let ((erc-d-linger-secs 1) + err errors) + (erc-d-self-with-failure-spy errors '(erc-d--teardown) + (erc-d-self-with-server (_ _) timeout + (erc-d-t-wait-for 10 "error caught" errors))) + (setq err (pop errors)) + (should (eq (car err) 'erc-d-timeout)) + (should (string-match-p "Timed out" (cadr err))))) + +(ert-deftest erc-d-run-unexpected () + (let ((erc-d-linger-secs 2) + errors) + (erc-d-self-with-failure-spy + errors '(erc-d--teardown erc-d-command) + (erc-d-self-with-server (_ _) unexpected + (ert-info ("All specs consumed when more input arrives") + (erc-d-t-wait-for 10 "error caught" + (=3D 2 (length errors)))))) + (should (string-match-p "unexpected.*MODE" (cadr (pop errors)))) + ;; Nonsensical normally because func would have already exited when + ;; first error was thrown + (should (string-match-p "Match failed" (cadr (pop errors)))))) + +(ert-deftest erc-d-run-unexpected-depleted () + (let ((erc-d-linger-secs 3) + errors) + (erc-d-self-with-failure-spy errors '(erc-d--teardown erc-d-command) + (let* ((dumb-server-buffer (get-buffer-create "*erc-d-server*")) + (dumb-server (erc-d-run "localhost" t 'depleted)) + (expect (erc-d-t-make-expecter)) + (client-buf (get-buffer-create "*erc-d-client*")) + client-proc) + (with-current-buffer dumb-server-buffer + (erc-d-t-search-for 3 "Starting")) + (setq client-proc (make-network-process + :buffer client-buf + :name "erc-d-client" + :family 'ipv4 + :noquery t + :coding 'binary + :service (process-contact dumb-server :service) + :host "localhost")) + (with-current-buffer dumb-server-buffer + (funcall expect 3 "Connection")) + (process-send-string client-proc "PASS :changeme\r\n") + (sleep-for 0.01) + (process-send-string client-proc "NICK tester\r\n") + (sleep-for 0.01) + (process-send-string client-proc "USER user 0 * :tester\r\n") + (sleep-for 0.01) + (process-send-string client-proc "BLAH :too much\r\n") + (sleep-for 0.01) + (with-current-buffer client-buf + (funcall expect 3 "Welcome to the Internet")) + (erc-d-t-wait-for 2 "dumb-server death" + (not (process-live-p dumb-server))) + (delete-process client-proc) + (when noninteractive + (kill-buffer client-buf) + (kill-buffer dumb-server-buffer)))) + (should (string-match-p "unexpected.*BLAH" (cadr (pop errors)))) + ;; Wouldn't happen IRL + (should (string-match-p "unexpected.*BLAH" (cadr (pop errors)))) + (should-not errors))) + +(defun erc-d-self--dynamic-match-user (_dialog exchange) + "Shared pattern/response handler for canned dynamic DIALOG test." + (should (string=3D (match-string 1 (erc-d-exchange-request exchange)) + "tester"))) + +(defun erc-d-self--run-dynamic () + "Perform common assertions for \"dynamic\" dialog." + (erc-d-self-with-server (dumb-server erc-server-buffer) dynamic + (erc-d-t-wait-for 3 "#chan" + (get-buffer "#chan")) + (with-current-buffer "#chan" + (erc-d-t-search-for 2 "tester: hey")) + (with-current-buffer erc-server-buffer + (let ((expect (erc-d-t-make-expecter))) + (funcall expect 2 "host is irc.fsf.org") + (funcall expect 2 "modes for tester"))) + (with-current-buffer (process-buffer dumb-server) + (erc-d-t-search-for 2 "irc.fsf.org")) + (when noninteractive + (kill-buffer "#chan")))) + +(ert-deftest erc-d-run-dynamic-default-match () + (let* (dynamic-tally + (erc-d-spec-vars '((user . "user") + (ignored . ((a b) (: a space b))) + (realname . (group (+ graph))))) + (nick (lambda (a) + (push '(nick . match-user) dynamic-tally) + (funcall a :set (funcall a :match 1) 'export))) + (dom (lambda (a) + (push '(dom . match-user) dynamic-tally) + (funcall a :set erc-d-server-fqdn))) + (erc-d-match-handlers + (list :user (lambda (d e) + (erc-d-exchange-rebind d e 'nick nick) + (erc-d-exchange-rebind d e 'dom dom) + (erc-d-self--dynamic-match-user d e)) + :mode-user (lambda (d e) + (erc-d-exchange-rebind d e 'nick "tester") + (erc-d-exchange-rebind d e 'dom dom)))) + (erc-d-server-fqdn "irc.fsf.org")) + (erc-d-self--run-dynamic) + (should (equal '((dom . match-user) (nick . match-user) (dom . match-u= ser)) + dynamic-tally)))) + +(ert-deftest erc-d-run-dynamic-default-match-rebind () + (let* (tally + ;; + (erc-d-spec-vars '((user . "user") + (ignored . ((a b) (: a space b))) + (realname . (group (+ graph))))) + (erc-d-match-handlers + (list :user + (lambda (d e) + (erc-d-exchange-rebind + d e 'nick + (lambda (a) + (push 'bind-nick tally) + (funcall a :rebind 'nick (funcall a :match 1) 'export= ))) + (erc-d-exchange-rebind + d e 'dom + (lambda () + (push 'bind-dom tally) + (erc-d-exchange-rebind d e 'dom erc-d-server-fqdn))) + (erc-d-self--dynamic-match-user d e)) + :mode-user + (lambda (d e) + (erc-d-exchange-rebind d e 'nick "tester") + (erc-d-exchange-rebind d e 'dom erc-d-server-fqdn)))) + (erc-d-server-fqdn "irc.fsf.org")) + (erc-d-self--run-dynamic) + (should (equal '(bind-nick bind-dom) tally)))) + +(ert-deftest erc-d-run-dynamic-runtime-stub () + (let ((erc-d-spec-vars '((token . (group (or "barnet" "foonet"))))) + (erc-d-match-handlers + (list :pass (lambda (d _e) + (erc-d-load-replacement-dialog d 'dynamic-foonet)))) + (erc-d-self-with-server-password "foonet:changeme")) + (erc-d-self-with-server (_ erc-server-buffer) + (dynamic-stub dynamic-foonet) + (erc-d-t-wait-for 3 "#chan" + (get-buffer "#chan")) + (with-current-buffer "#chan" + (erc-d-t-search-for 2 "alice:") + (erc-d-t-search-for -0.1 "joe")) + (with-current-buffer erc-server-buffer + (let ((expect (erc-d-t-make-expecter))) + (funcall expect 2 "host is irc.foonet.org") + (funcall expect 2 "NETWORK=3DFooNet"))) + (when noninteractive + (kill-buffer "#chan"))))) + +(ert-deftest erc-d-run-dynamic-runtime-stub-skip () + (let ((erc-d-spec-vars '((token . "barnet"))) + (erc-d-match-handlers + (list :pass (lambda (d _e) + (erc-d-load-replacement-dialog + d 'dynamic-barnet 1)))) + (erc-d-self-with-server-password "barnet:changeme")) + (erc-d-self-with-server (_ erc-server-buffer) + (dynamic-stub dynamic-barnet) + (erc-d-t-wait-for 3 "#chan" + (get-buffer "#chan")) + (with-current-buffer "#chan" + (erc-d-t-search-for 2 "joe:") + (erc-d-t-search-for -0.1 "alice")) + (with-current-buffer erc-server-buffer + (let ((expect (erc-d-t-make-expecter))) + (funcall expect 2 "host is irc.barnet.org") + (funcall expect 2 "NETWORK=3DBarNet"))) + (when noninteractive + (kill-buffer "#chan"))))) + +;; This can be removed; only exists to get a baseline for next test +(ert-deftest erc-d-run-fuzzy-direct () + (let* ((erc-d-linger-secs 0.1) + (erc-d-spec-vars + `((now . ,(lambda () (format-time-string "%FT%T.%3NZ" nil t))))) + (dumb-server (erc-d-run "localhost" t 'fuzzy)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (client-buffer (get-buffer-create "*erc-d-client*")) + client) + (with-current-buffer "*erc-d-server*" + (erc-d-t-search-for 4 "Starting")) + (setq client (make-network-process + :buffer client-buffer + :name "erc-d-client" + :family 'ipv4 + :noquery t + :coding 'binary + :service (process-contact dumb-server :service) + :host "localhost")) + ;; We could also just send this as a single fatty + (process-send-string client "PASS :changeme\r\n") + (sleep-for 0.01) + (process-send-string client "NICK tester\r\n") + (sleep-for 0.01) + (process-send-string client "USER user 0 * :tester\r\n") + (sleep-for 0.01) + (process-send-string client "MODE tester +i\r\n") + (sleep-for 0.01) + (process-send-string client "JOIN #bar\r\n") + (sleep-for 0.01) + (process-send-string client "JOIN #foo\r\n") + (sleep-for 0.01) + (process-send-string client "MODE #bar\r\n") + (sleep-for 0.01) + (process-send-string client "MODE #foo\r\n") + (sleep-for 0.01) + (erc-d-t-wait-for 1 "dumb-server death" + (not (process-live-p dumb-server))) + (when noninteractive + (kill-buffer client-buffer) + (kill-buffer dumb-server-buffer)))) + +;; Without adjusting penalty, takes ~15 secs. With is comprable to direct = ^. +(ert-deftest erc-d-run-fuzzy () + (let ((erc-server-flood-penalty 1.2) ; penalty < margin/sends is basical= ly 0 + (erc-d-linger-secs 0.1) + (erc-d-spec-vars + `((now . ,(lambda () (format-time-string "%FT%T.%3NZ" nil t))))) + erc-server-auto-reconnect) + (erc-d-self-with-server (_ erc-server-buffer) fuzzy + (with-current-buffer erc-server-buffer + (erc-d-t-search-for 2 "away") + (goto-char erc-input-marker) + (erc-cmd-JOIN "#bar")) + (erc-d-t-wait-for 2 "#bar" + (get-buffer "#bar")) + (with-current-buffer erc-server-buffer + (erc-cmd-JOIN "#foo")) + (erc-d-t-wait-for 20 "#foo" + (get-buffer "#foo")) + (with-current-buffer "#bar" + (erc-d-t-search-for 1 "was created on")) + (with-current-buffer "#foo" + (erc-d-t-search-for 5 "was created on"))))) + +(ert-deftest erc-d-run-no-block () + (let ((erc-server-flood-penalty 1) + (erc-d-linger-secs 1.2) + (expect (erc-d-t-make-expecter)) + erc-server-auto-reconnect) + (erc-d-self-with-server (_ erc-server-buffer) no-block + (with-current-buffer erc-server-buffer + (funcall expect 2 "away") + (funcall expect 1 erc-prompt) + (with-current-buffer erc-server-buffer (erc-cmd-JOIN "#foo"))) + (erc-d-t-wait-for 2 "#foo" (get-buffer "#foo")) + (with-current-buffer "#foo" (funcall expect 2 "was created on")) + + (ert-info ("Join #bar") + (with-current-buffer erc-server-buffer (erc-cmd-JOIN "#bar")) + (erc-d-t-wait-for 2 "#bar" (get-buffer "#bar"))) + + (with-current-buffer "#bar" (funcall expect 1 "was created on")) + + (ert-info ("Server expects next pattern but keeps sending") + (with-current-buffer "#foo" (funcall expect 2 "Rosalind")) + (with-current-buffer "#bar" (funcall expect 1 "hi")) + (with-current-buffer "#foo" + (should-not (search-forward " I am heard" nil t)) + (funcall expect 1.5 " I am heard")))))) + +(defun erc-d-self--run-proxy-direct (dumb-server dumb-server-buffer port) + "Start DUMB-SERVER with DUMB-SERVER-BUFFER and PORT. +These are steps shared by in-proc and subproc variants testing a +bouncer-like setup." + (when (version< emacs-version "28") (ert-skip "TODO connection refused")) + (let ((client-buffer-foo (get-buffer-create "*erc-d-client-foo*")) + (client-buffer-bar (get-buffer-create "*erc-d-client-bar*")) + (expect (erc-d-t-make-expecter)) + client-foo + client-bar) + (setq client-foo (make-network-process + :buffer client-buffer-foo + :name "erc-d-client-foo" + :family 'ipv4 + :noquery t + :coding 'binary + :service port + :host "localhost") + client-bar (make-network-process + :buffer client-buffer-bar + :name "erc-d-client-bar" + :family 'ipv4 + :noquery t + :coding 'binary + :service port + :host "localhost")) + (with-current-buffer dumb-server-buffer + (funcall expect 3 "Connection")) + (process-send-string client-foo "PASS :foo:changeme\r\n") + (process-send-string client-bar "PASS :bar:changeme\r\n") + (sleep-for 0.01) + (process-send-string client-foo "NICK tester\r\n") + (process-send-string client-bar "NICK tester\r\n") + (sleep-for 0.01) + (process-send-string client-foo "USER user 0 * :tester\r\n") + (process-send-string client-bar "USER user 0 * :tester\r\n") + (sleep-for 0.01) + (process-send-string client-foo "MODE tester +i\r\n") + (process-send-string client-bar "MODE tester +i\r\n") + (sleep-for 0.01) + (with-current-buffer client-buffer-foo + (funcall expect 3 "FooNet") + (funcall expect 3 "irc.foo.net") + (funcall expect 3 "marked as being away") + (goto-char (point-min)) + (should-not (search-forward "bar" nil t))) + (with-current-buffer client-buffer-bar + (funcall expect 3 "BarNet") + (funcall expect 3 "irc.bar.net") + (funcall expect 3 "marked as being away") + (goto-char (point-min)) + (should-not (search-forward "foo" nil t))) + (erc-d-t-wait-for 2 "dumb-server death" + (not (process-live-p dumb-server))) + (delete-process client-foo) + (delete-process client-bar) + (when noninteractive + (kill-buffer client-buffer-foo) + (kill-buffer client-buffer-bar) + (kill-buffer dumb-server-buffer)))) + +;; This test shows the simplest way to set up template variables: put +;; everything needed for the whole session in `erc-d-spec-vars' before +;; starting the server. + +(ert-deftest erc-d-run-proxy-direct-spec-vars () + (let* ((dumb-server-buffer (get-buffer-create "*erc-d-server*")) + (erc-d-linger-secs 0.5) + (erc-d-spec-vars + `((network . (group (+ alpha))) + (fqdn . ,(lambda (a) + (let ((network (funcall a :match 1 'pass))) + (should (member network '("foo" "bar"))) + (funcall a :set (concat "irc." network ".net"))))) + (net . ,(lambda (a) + (let ((network (funcall a :match 1 'pass))) + (should (member network '("foo" "bar"))) + (concat (capitalize network) "Net")))))) + (dumb-server (erc-d-run "localhost" t 'proxy-foonet 'proxy-barnet= )) + (port (process-contact dumb-server :service))) + (with-current-buffer dumb-server-buffer + (erc-d-t-search-for 3 "Starting")) + (erc-d-self--run-proxy-direct dumb-server dumb-server-buffer port))) + +(cl-defun erc-d-self--start-server (&key dialogs buffer linger program lib= s) + "Start and return a server in a subprocess using BUFFER and PORT. +DIALOGS are symbols representing the base names of dialog files in +`erc-d-u-canned-dialog-dir'. LIBS are extra files to load." + (push (locate-library "erc-d" nil (list erc-d-u--library-directory)) lib= s) + (cl-assert (car libs)) + (let* ((args `("erc-d-server" ,buffer + ,(concat invocation-directory invocation-name) + "-Q" "-batch" "-L" ,erc-d-u--library-directory + ,@(let (o) (while libs (push (pop libs) o) (push "-l" o))= o) + "-eval" ,(format "%S" program) "-f" "erc-d-serve" + ,@(when linger (list "--linger" (number-to-string linger)= )) + ,@(mapcar #'erc-d-u--expand-dialog-symbol dialogs))) + (proc (apply #'start-process args))) + (set-process-query-on-exit-flag proc nil) + (with-current-buffer buffer + (erc-d-t-search-for 5 "Starting") + (search-forward " (") + (backward-char)) + (let ((pair (read buffer))) + (cons proc (cdr pair))))) + +(ert-deftest erc-d-run-proxy-direct-subprocess () + (let* ((buffer (get-buffer-create "*erc-d-server*")) + ;; These are quoted because they're passed as printed forms to su= bproc + (fqdn '(lambda (a e) + (let* ((d (erc-d-exchange-dialog e)) + (name (erc-d-dialog-name d))) + (funcall a :set (if (eq name 'proxy-foonet) + "irc.foo.net" + "irc.bar.net"))))) + (net '(lambda (a) + (funcall a :rebind 'net + (if (eq (funcall a :dialog-name) 'proxy-foonet) + "FooNet" + "BarNet")))) + (program `(setq erc-d-spec-vars '((fqdn . ,fqdn) + (net . ,net) + (network . (group (+ alpha)))))) + (port (erc-d-self--start-server + :linger 0.3 + :program program + :buffer buffer + :dialogs '(proxy-foonet proxy-barnet))) + (server (pop port))) + (erc-d-self--run-proxy-direct server buffer port))) + +(ert-deftest erc-d-run-proxy-direct-subprocess-lib () + (let* ((buffer (get-buffer-create "*erc-d-server*")) + (lib (ert-resource-file "proxy-subprocess.el")) + (port (erc-d-self--start-server :linger 0.3 + :buffer buffer + :dialogs '(proxy-foonet proxy-bar= net) + :libs (list lib))) + (server (pop port))) + (erc-d-self--run-proxy-direct server buffer port))) + +(ert-deftest erc-d-run-no-pong () + (let* (erc-d-auto-pong + ;; + (erc-d-spec-vars + `((nonce . (group (: digit digit))) + (echo . ,(lambda (a) + (should (string=3D (funcall a :match 1) "42")) "42"= )))) + (dumb-server-buffer (get-buffer-create "*erc-d-server*")) + (dumb-server (erc-d-run "localhost" t 'no-pong)) + (expect (erc-d-t-make-expecter)) + (client-buf (get-buffer-create "*erc-d-client*")) + client-proc) + (with-current-buffer dumb-server-buffer + (erc-d-t-search-for 3 "Starting")) + (setq client-proc (make-network-process + :buffer client-buf + :name "erc-d-client" + :family 'ipv4 + :noquery t + :coding 'binary + :service (process-contact dumb-server :service) + :host "localhost")) + (with-current-buffer dumb-server-buffer + (funcall expect 3 "Connection")) + (process-send-string client-proc "PASS :changeme\r\nNICK tester\r\n") + (sleep-for 0.01) + (process-send-string client-proc "USER user 0 * :tester\r\n") + (sleep-for 0.01) + (process-send-string client-proc "MODE tester +i\r\n") + (sleep-for 0.01) + (with-current-buffer client-buf + (funcall expect 3 "ExampleOrg") + (funcall expect 3 "irc.example.org") + (funcall expect 3 "marked as being away")) + (ert-info ("PING is not intercepted by specialized method") + (process-send-string client-proc "PING 42\r\n") + (with-current-buffer client-buf + (funcall expect 3 "PONG"))) + (erc-d-t-wait-for 2 "dumb-server death" + (not (process-live-p dumb-server))) + (delete-process client-proc) + (when noninteractive + (kill-buffer client-buf) + (kill-buffer dumb-server-buffer)))) + +;; Inspect replies as they arrive within a single exchange, i.e., ensure we +;; don't regress to prior buggy version in which inspection wasn't possible +;; until all replies had been sent by the server. +(ert-deftest erc-d-run-incremental () + (let ((erc-server-flood-penalty 0) + (expect (erc-d-t-make-expecter)) + erc-d-linger-secs) + (erc-d-self-with-server (_ erc-server-buffer) incremental + (with-current-buffer erc-server-buffer + (funcall expect 3 "marked as being away")) + (with-current-buffer erc-server-buffer + (erc-cmd-JOIN "#foo")) + (erc-d-t-wait-for 1 "#foo exists" + (get-buffer "#foo")) + (with-current-buffer "#foo" + (funcall expect 1 "Users on #foo") + (funcall expect 1 "Look for me") + (not (search-forward "Done" nil t)) + (funcall expect 10 "Done") + (erc-send-message "Hi"))))) + +(ert-deftest erc-d-unix-socket-direct () + (skip-unless (featurep 'make-network-process '(:family local))) + (let* ((erc-d-linger-secs 0.1) + (sock (expand-file-name "erc-d.sock" temporary-file-directory)) + (dumb-server (erc-d-run nil sock 'basic)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (client-buffer (get-buffer-create "*erc-d-client*")) + client) + (with-current-buffer "*erc-d-server*" + (erc-d-t-search-for 4 "Starting")) + (unwind-protect + (progn + (setq client (make-network-process + :buffer client-buffer + :name "erc-d-client" + :family 'local + :noquery t + :coding 'binary + :service sock)) + (process-send-string client "PASS :changeme\r\n") + (sleep-for 0.01) + (process-send-string client "NICK tester\r\n") + (sleep-for 0.01) + (process-send-string client "USER user 0 * :tester\r\n") + (sleep-for 0.1) + (process-send-string client "MODE tester +i\r\n") + (sleep-for 0.01) + (process-send-string client "MODE #chan\r\n") + (sleep-for 0.01) + (erc-d-t-wait-for 1 "dumb-server death" + (not (process-live-p dumb-server))) + (when noninteractive + (kill-buffer client-buffer) + (kill-buffer dumb-server-buffer))) + (delete-file sock)))) + +;;; erc-d-self.el ends here diff --git a/test/lisp/erc/erc-d/erc-d-t.el b/test/lisp/erc/erc-d/erc-d-t.el new file mode 100644 index 0000000000..9e8fd20b90 --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-t.el @@ -0,0 +1,157 @@ +;;; erc-d-t.el --- ERT helpers for ERC test server -*- lexical-binding: t = -*- + +;; Copyright (C) 2020-2021 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 +;; . + +;;; Commentary: + +;;; Code: +(eval-and-compile (let ((dir (getenv "EMACS_TEST_DIRECTORY"))) + (when dir + (load (concat dir "/lisp/erc/erc-d/erc-d-u") nil t))= )) +(require 'erc-d-u) +(require 'ert) + +(defun erc-d-t-kill-related-buffers () + "Kill all erc- or erc-d- related buffers." + (let (buflist) + (dolist (buf (buffer-list)) + (with-current-buffer buf + (when (or erc-d-u--process-buffer + (derived-mode-p 'erc-mode)) + (push buf buflist)))) + (dolist (buf buflist) + (when (and (boundp 'erc-server-flood-timer) + (timerp erc-server-flood-timer)) + (cancel-timer erc-server-flood-timer)) + (when-let ((proc (get-buffer-process buf))) + (delete-process proc)) + (when (buffer-live-p buf) + (kill-buffer buf)))) + (while (when-let ((buf (pop erc-d-u--canned-buffers))) + (kill-buffer buf)))) + +(defun erc-d-t-silence-around (orig &rest args) + "Run ORIG function with ARGS silently. +Use this on `erc-handle-login' and `erc-server-connect'." + (let ((inhibit-message t)) + (apply orig args))) + +(defvar erc-d-t-cleanup-sleep-secs 0.1) + +(defmacro erc-d-t-with-cleanup (bindings cleanup &rest body) + "Execute BODY and run CLEANUP form regardless of outcome. +`let*'-bind BINDINGS and make them available in BODY and CLEANUP. +After CLEANUP, destroy any values in BINDINGS that remain bound to +buffers or processes. Sleep `erc-d-t-cleanup-sleep-secs' before +returning." + (declare (indent 2)) + `(let* ,bindings + (unwind-protect + (progn ,@body) + ,cleanup + (when noninteractive + (let (bufs procs) + (dolist (o (list ,@(mapcar (lambda (b) (or (car-safe b) b)) + bindings))) + (when (bufferp o) + (push o bufs)) + (when (processp o) + (push o procs))) + (dolist (proc procs) + (delete-process proc) + (when-let ((buf (process-buffer proc))) + (push buf bufs))) + (dolist (buf bufs) + (when-let ((proc (get-buffer-process buf))) + (delete-process proc)) + (when (bufferp buf) + (ignore-errors (kill-buffer buf))))) + (sleep-for erc-d-t-cleanup-sleep-secs))))) + +(defmacro erc-d-t-wait-for (max-secs msg &rest body) + "Wait for BODY to become non-nil. +Or signal error with MSG after MAX-SECS. When MAX-SECS is negative, +signal if BODY returns nil but not if MAX-SECS elapses. On success, +return BODY's value. + +Note: this assumes BODY is waiting on a peer's output. It tends to +artificially accelerate consumption of all process output, which may not +be desirable." + (declare (indent 2)) + (let ((inverted (make-symbol "inverted")) + (time-out (make-symbol "time-out")) + (result (make-symbol "result"))) + `(ert-info ((concat "Awaiting: " ,msg)) + (let ((,time-out (abs ,max-secs)) + (,inverted (< ,max-secs 0)) + (,result ',result)) + (with-timeout (,time-out (if ,inverted + (setq ,inverted nil) + (error "Failed awaiting: %s" ,msg))) + (while (not (setq ,result (progn ,@body))) + (when (and (accept-process-output nil 0.1) (not noninteractiv= e)) + (redisplay)))) + (when ,inverted + (error "Failed awaiting: %s" ,msg)) + ,result)))) + +(defvar erc-d-t-use-regeexp-when-searching nil) + +(defun erc-d-t-search-for (time-out text &optional starting-from) + "Wait for TEXT to appear in current buffer before TIME-OUT secs. +With marker or number STARTING-FROM, only look forward from there. When +`erc-d-t-use-regeexp-when-searching' is non-nil, TEXT can be a regular +expression." + (save-restriction + (widen) + (erc-d-t-wait-for time-out (format "string: %s" text) + (goto-char (or starting-from (point-min))) + (funcall (if erc-d-t-use-regeexp-when-searching + #'search-forward-regexp + #'search-forward) + text nil t)))) + +(defun erc-d-t-make-expecter () + "Return function to search for new output in buffer. +The returned function works like `erc-d-t-search-for', but it never +revisits previously covered territory. To use a regexp, ensure +`erc-d-t-use-regeexp-when-searching' is non-nil during the actual +search. To reset the marker position, pass it as STARTING-FROM." + (let (positions) + (lambda (time-out text &optional starting-from) + (save-restriction + (widen) + (let ((pos (cdr (assq (current-buffer) positions)))) + (when starting-from + (set-marker pos starting-from)) + (when (and text time-out) + (erc-d-t-wait-for time-out (format "string: %s" text) + (goto-char (or pos (point-min))) + (when (funcall (if erc-d-t-use-regeexp-when-searching + #'search-forward-regexp + #'search-forward) + text nil t) + (unless pos + (push (cons (current-buffer) (setq pos (make-marker))) + positions)) + (marker-position + (set-marker pos (min (point) (1- (point-max))))))))))))) + +(provide 'erc-d-t) +;;; erc-d-t.el ends here diff --git a/test/lisp/erc/erc-d/erc-d-u.el b/test/lisp/erc/erc-d/erc-d-u.el new file mode 100644 index 0000000000..8d34c3d0c0 --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d-u.el @@ -0,0 +1,200 @@ +;;; erc-d-u.el --- Helpers for ERC test server -*- lexical-binding: t -*- + +;; Copyright (C) 2020-2021 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 +;; . + +;;; Commentary: + +;; The utilities here are kept separate from those in `erc-d' so that +;; tests running the server in a subprocess can use them without +;; having to require the main lib. If migrating outside of test/lisp, +;; there may be no reason to continue this. +;; +;; Another (perhaps misguided) goal here is to avoid having ERC itself +;; as a dependency. +;; +;; FIXME this ^ is no longer the case (ERC is not a dependency) + +;;; Code: +(require 'rx) +(require 'generator) +(require 'subr-x) +(eval-when-compile (require 'ert)) + +(defvar erc-d-u--canned-buffers nil + "List of canned dialog buffers currently open for reading.") + +(defun erc-d-u--canned-read (file) + "Read canned FILE as generator and yield exchanges as iterators." + (let* ((buf (generate-new-buffer (file-name-nondirectory file))) + (coding-system-for-read 'utf-8) + (parse-sexp-ignore-comments t) + ;; Actually, "done" only means outer exchange genny is done. + last done specs + ;; + (done-cb (lambda () + (kill-buffer buf) + (setq erc-d-u--canned-buffers + (delq buf erc-d-u--canned-buffers)))) + (fspec (iter-lambda (pos) + (let (val) + (while (and specs + (with-current-buffer buf + (goto-char pos) + (condition-case _err + (setq val (read pos)) + ;; Raised unless malformed + (invalid-read-syntax nil)))) + (iter-yield val))) + (setq specs (delq pos specs)) + (unless (or specs (not done)) + (funcall done-cb) + (setq done-cb #'ignore))))) + (push buf erc-d-u--canned-buffers) + (with-current-buffer buf + (insert-file-contents-literally file) + (lisp-data-mode)) + (iter-lambda () + ;; Yielding isn't allowed inside save-excursion, etc. + (while (with-current-buffer buf + (condition-case _err + (progn + (when last + (goto-char last) + (forward-list)) + (setq last (point)) + (down-list) + (push (set-marker (make-marker) (point)) specs) + t) + ((end-of-buffer scan-error) + (setq done t) + nil))) + ;; Suppose we *could* yield specs directly here but then + ;; detecting exchange boundaries is more of a headache + (iter-yield (funcall fspec (car specs)))) + (unless specs + (funcall done-cb)) + nil))) + +(defvar erc-d-u--library-directory (file-name-directory load-file-name)) +(defvar erc-d-u-canned-dialog-dir + (file-name-as-directory (expand-file-name "erc-d-self-resources" + erc-d-u--library-directory))) + +(defun erc-d-u--normalize-canned-name (dialog) + "Return DIALOG name as a symbol without validating it." + (if (symbolp dialog) + dialog + (intern (file-name-base dialog)))) + +(defvar erc-d-u-canned-file-name-extension "lispdata") + +(defun erc-d-u--expand-dialog-symbol (dialog) + "Return filename based on symbol DIALOG." + (let ((name (symbol-name dialog))) + (unless (equal (file-name-extension name) + erc-d-u-canned-file-name-extension) + (setq name (concat name "." erc-d-u-canned-file-name-extension))) + (expand-file-name name erc-d-u-canned-dialog-dir))) + +(defun erc-d-u--massage-canned-name (dialog) + "Return DIALOG in a form acceptable to `erc-d-run'." + (if (or (symbolp dialog) (file-exists-p dialog)) + dialog + (erc-d-u--expand-dialog-symbol (intern dialog)))) + +(defun erc-d-u--canned-load-dialog (dialog &optional start) + "Load and maybe START dispensing exchanges from DIALOG. +If DIALOG is a string, consider it a file path. Otherwise find a file +in `erc-d-u-canned-dialog-dir' with a base name matching the symbol's +name. + +Return an iterator that yields exchanges, each one an iterator of spec +forms. The first is a so-called request spec and the rest are composed +of zero or more response specs." + (when (symbolp dialog) + (setq dialog (erc-d-u--expand-dialog-symbol dialog))) + (unless (file-exists-p dialog) + (error "File not found: %s" dialog)) + (let ((genny (erc-d-u--canned-read dialog))) + (if start (funcall genny) genny))) + +(defun erc-d-u--rewrite-for-slow-mo (num ex-it) + "Return modified iterator or generator from original EX-IT. +When NUM is a positive number, delay incoming requests by NUM more +seconds. If NUM is negative, raise insufficient incoming delays to at +least -NUM seconds. If NUM is a function, set each delay to whatever it +returns when called with the existing value." + (let* ((genny-in (zerop (car (func-arity ex-it)))) + (g (iter-lambda () + (let ((ex-it (if genny-in (funcall ex-it) ex-it)) + next) + (while + (when (setq next (condition-case err + (iter-next ex-it) + (iter-end-of-sequence + (setq ex-it nil) + (cdr err)))) + (iter-yield + (funcall + (iter-lambda () + (iter-do (spec next) + (when (symbolp (car spec)) + (let ((new (cond + ((functionp num) + (funcall num (nth 1 spec))) + ((< num 0) + (max (nth 1 spec) (- num))) + (t (+ (nth 1 spec) num))))) + (setf (nth 1 spec) new))) + (iter-yield spec))))) + t)) + next)))) + (if genny-in g (funcall g)))) + +(defun erc-d-u--get-remote-port (process) + "Return peer TCP port for client PROCESS. +When absent, just generate an id." + (let ((remote (plist-get (process-contact process t) :remote))) + (if (vectorp remote) + (aref remote (1- (length remote))) + (format "%s:%d" (process-contact process :local) + (logand 1023 (time-convert nil 'integer)))))) + +(defun erc-d-u--format-bind-address (process) + "Return string or (STRING . INT) for bind address of network PROCESS." + (let ((local (process-contact process :local))) + (if (vectorp local) ; inet + (cons (mapconcat #'number-to-string (seq-subseq local 0 -1) ".") + (aref local (1- (length local)))) + local))) + +(defun erc-d-u--unkeyword (plist) + "Return a copy of PLIST with keywords keys converted to non-keywords." + (cl-loop for (key value) on plist by #'cddr + when (keywordp key) + do (setq key (intern (substring (symbol-name key) 1))) + append (list key value))) + +(defvar-local erc-d-u--process-buffer nil + "Beacon for erc-d process buffers. +The server process is usually deleted first, but we may want to examine +the buffer afterward.") + +(provide 'erc-d-u) +;;; erc-d-u.el ends here diff --git a/test/lisp/erc/erc-d/erc-d.el b/test/lisp/erc/erc-d/erc-d.el new file mode 100644 index 0000000000..6c2b8f4d58 --- /dev/null +++ b/test/lisp/erc/erc-d/erc-d.el @@ -0,0 +1,970 @@ +;;; erc-d.el --- A dumb test server for ERC -*- lexical-binding: t -*- + +;; Copyright (C) 2020-2021 Free Software Foundation, Inc. +;; +;; Version: 1.1 +;; +;; 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 +;; . + +;;; Commentary: + +;; This is a netcat style server for testing ERC. The "d" in the name +;; stands for "daemon" as well as for "dialog" (as well as for "dumb" +;; because this server isn't very smart). It either spits out a +;; canned reply when an incoming request matches the expected regexp +;; or signals an error and dies. The entry point function is +;; `erc-d-run'. +;; +;; Canned scripts, or "dialogs," should be Lisp-Data files containing +;; one or more request/reply forms like this: +;; +;; | ((mode-chan 1.5 "MODE #chan") ; request: tag, expr, regex +;; | (0.1 ":irc.org 324 bob #chan +Cint") ; reply: delay, content +;; | (0.0 ":irc.org 329 bob #chan 12345")) ; reply: ... +;; +;; These are referred to as "exchanges." The first element is a list +;; whose CAR is a descriptive "tag" and whose CDR is an incoming +;; "spec" representing an inbound message from the client. The rest +;; of the exchange is composed of outgoing specs representing +;; server-to-client messages. A tag can be any symbol (ideally unique +;; in the dialog), but a leading tilde means the request should be +;; allowed to arrive out of order (within the allotted time). +;; +;; The first element in an incoming spec is a number indicating the +;; maximum number of seconds to wait for a match before raising an +;; error. The CDR is interpreted as the arguments of an `rx' form to +;; be matched against the raw request (stripped of its CRLF line +;; ending). A "string-start" backslash assertion, "\\`", is prepended +;; to all patterns. +;; +;; Similarly, the leading number in an *outgoing* spec indicates how +;; many seconds to wait before sending the line, which is rendered by +;; concatenating the other members after evaluating each in place. +;; CRLF line endings are appended on the way out and should be absent. +;; +;; Recall that IRC is "asynchronous," meaning some flow intervals +;; don't jibe with lockstep request-reply semantics. However, for our +;; purposes, grouping things as [input, output1, ..., outputN] makes +;; sense, even though input and output may be completely unrelated. +;; +;; Template interpolation: +;; +;; A rudimentary templating facility is provided for additional +;; flexibility. However, it's best to keep things simple (even if +;; overly verbose), so others can easily tell what's going on at a +;; glance. If necessary, consult existing tests for examples (grep +;; for the variables `erc-d-spec-vars' and `erc-d-match-handlers'). +;; +;; Subprocess or in-process?: +;; +;; Running in-process confers better visibility and easier setup at +;; the cost of additional cleanup and resource wrangling. With a +;; subprocess, cleanup happens by pulling the plug, but configuration +;; means loading a separate file or passing -eval "(forms...)" during +;; invocation. In some cases, a subprocess may be the only option, +;; like when trying to avoid `require'ing this file. +;; +;; Dialog objects: +;; +;; For a given exchange, the first argument passed to a request +;; handler is the `erc-d-dialog' object representing the overall +;; conversation with the connecting peer. It can be used to pass +;; information between handlers during a session. Some important +;; items are: +;; +;; * name (symbol); name of the current dialog +;; +;; * queue (ring); a backlog of unhandled raw requests, minus CRLF +;; endings. +;; +;; * timers (list of timers); when run, these send messages originally +;; deferred as per the most recently matched exchange's delay info. +;; Normally, all outgoing messages must be sent before another request +;; is considered. (See `erc-d--send-outgoing' for an escape hatch.) +;; +;; * hunks (iterator of iterators); unconsumed exchanges as read from +;; a Lisp-Data dialog file. The exchange iterators being dispensed +;; themselves yield portions of member forms as a 2- or 3-part +;; sequence: [tag] delay spec. (BTW, here, "hunk" just means "list of +;; exchange elements" and has nothing to do with +;; https://maclisp.info/pitmanual/hunks.html.) +;; +;; * vars (alist of cons pairs); for sharing state among template +;; functions during the lifetime of an exchange. Initially populated +;; by `erc-d-spec-vars', these KEY/VALUE pairs are made available in +;; the template environment as bound variables. Updates can be made +;; by exchange handlers (see `erc-d-match-handlers'). When VALUE is a +;; function, occurrences of KEY in an outgoing spec are replaced with +;; the result of calling VALUE with match data set appropriately. See +;; `erc-d--render-entries' for details. +;; +;; * exchanges (ring of erc-d-exchange objects); activated hunks +;; allowed to match out of order, plus the current active exchange +;; being yielded from, if any. See `erc-d-exchange'. +;; +;; TODO +;; +;; - Remove unused functionality and simplify API +;; - Maybe migrate d-u and d-i dependencies here +;; - Maybe remove generators to help with debugging/deobfuscation +;; - Maybe convert bindings to cons pairs passable directly to `eval' + +;;; Code: +(eval-and-compile (let ((dir (getenv "EMACS_TEST_DIRECTORY"))) + (when dir + (load (concat dir "/lisp/erc/erc-d/erc-d-i") nil t) + (load (concat dir "/lisp/erc/erc-d/erc-d-u") nil t))= )) +(require 'ring) +(require 'erc-d-i) +(require 'erc-d-u) + +(defvar erc-d-server-name "erc-d-server" + "Default name of a server process and basis for its buffer name. +Only relevant when starting a server with `erc-d-run'.") + +(defvar erc-d-server-fqdn "irc.example.org" + "Usually the same as the server's RPL_MYINFO \"announced name\". +Possibly used by overriding handlers, like the one for PING, and/or +dialog templates for the sender portion of a reply message.") + +(defvar erc-d-linger-secs nil + "Seconds to wait before quitting for all dialogs. +For more granular control, use the provided LINGER `rx' variable (alone) +as the incoming template spec of a dialog's last exchange.") + +(defvar erc-d-spec-vars nil + "An alist of template bindings available to client dialogs. +Populate it when calling `erc-d-run', and the contents will be made +available to all client dialogs through the `erc-d-dialog' \"vars\" +field and (therefore) to all templates as variables when rendering. For +example, a key/value pair like (network . \"oftc\") will cause instances +of the (unquoted) symbol `network' to be replaced with \"oftc\" in the +rendered template string. + +This list provides default template bindings common to all dialogs. +Each new client-connection process makes a shallow copy on init, but the +usual precautions apply when mutating member items. Within the span of +a dialog, updates not applicable to all exchanges should die with their +exchange. See `erc-d--render-entries' for details. In the unlikely +event that an exchange-specific handler is needed, see +`erc-d-match-handlers'.") + +(defvar erc-d-match-handlers nil + "A plist of exchange-tag symbols mapped to request-handler functions. +This is meant to address edge cases for which `erc-d-spec-vars' comes up +short. These may include (1) needing access to the client process +itself and/or (2) adding or altering outgoing response templates before +rendering. Note that (2) requires using `erc-d-exchange-rebind' instead +of manipulating exchange bindings directly. + +The hook-like function `erc-d-on-match' calls any handler whose key is +`eq' to the tag of the currently matched exchange (passing the client +`erc-d-dialog' as the first argument and the current `erc-d-exchange' +object as the second). The handler runs just prior to sending the first +response.") + +(defvar erc-d-auto-pong t + "Handle PING requests automatically.") + +(defvar erc-d--in-process t + "Whether the server is running in the same Emacs as ERT.") + +(defvar erc-d--slow-mo nil + "Adjustment for all incoming timeouts. +This is to allow for human interaction or a slow Emacs or CI runner. +The value is the number of seconds to extend all incoming spec timeouts +by on init. If the value is a negative number, it's negated and +interpreted as a lower bound to raise all incoming timeouts to. If the +value is a function, it should take an existing timeout in seconds and +return a replacement.") + +(defconst erc-d--eof-sentinel "__EOF__") +(defconst erc-d--linger-sentinel "__LINGER__") +(defconst erc-d--drop-sentinel "__DROP__") + +(defvar erc-d--clients nil + "List containing all clients for this server session.") + +;; Some :type names may just be made up (not actual CL types) + +(cl-defstruct (erc-d-exchange) + "Object representing a request/response unit from a canned dialog." + (dialog nil :type erc-d-dialog) ; owning dialog + (tag nil :type symbol) ; a.k.a. tag, the caar + (pattern nil :type string) ; regexp to match requests against + (specs nil :type function) ; iterator, see `erc-d--render-entries' + (timeout nil :type number) ; time allotted for current request + (timer nil :type timer) ; match timer fires when timeout expires + (bindings nil :type list) ; let-style bindings (KEY VAL) ... + (rx-bindings nil :type list) ; rx-let bindings + (labels nil :type list) ; let-style bindings (KEY VAL) ... + ;; Post-match + (match-data nil :type match-data) ; from the latest matched request + (request nil :type string)) ; the original request sans CRLF + +(cl-defstruct (erc-d-dialog) + "Session state for managing a client conversation." + (process nil :type process) ; client-connection process + (name nil :type symbol) ; likely the interned stem of the file + (queue nil :type ring) ; backlog of incoming lines to process + (hunks nil :type function) ; nil when done; yields raw exchange hunks + (timers nil :type list) ; unsent replies + (vars nil :type list) ; template bindings for rendering + (exchanges nil :type ring) ; ring of erc-d-exchange objects + (handler nil :type boolean) ; control agent for managing dialog + (state nil :type symbol) ; handler's last recorded control state + (message nil :type erc-d-i-message) ; `erc-d-i-message' + (match-handlers nil :type list) ; copy of `erc-d-match-handlers' + (server-fqdn nil :type string) ; copy of `erc-d-server-fqdn' + (finalizer nil :type function) ; custom teardown, passed dialog and exch= ange + ;; Post-match history is a plist whose keys are exchange tags + ;; (symbols) and whose values are a cons of match-data and request + ;; values from prior matches. + (history nil :type list)) + +(defun erc-d--initialize-client (process) + "Initialize state variables used by a client PROCESS." + ;; Discard server-only/owned props + (process-put process :dialog-dialogs nil) + (let* ((server (process-get process :server)) + (ex-it (pop (process-get server :dialog-dialogs))) + (name (pop ex-it)) + ;; Copy handlers so they can self-mutate per process + (mat-h (copy-sequence (process-get process :dialog-match-handlers= ))) + (fqdn (copy-sequence (process-get process :dialog-server-fqdn))) + (vars (copy-sequence (process-get process :dialog-vars))) + (dialog (make-erc-d-dialog :name name + :process process + :queue (make-ring 5) + :exchanges (make-ring 10) + :match-handlers mat-h + :server-fqdn fqdn))) + ;; Add items expected by convenience commands like `erc-d-exchange-rel= oad'. + (setf (alist-get 'EOF vars) `(: ,erc-d--eof-sentinel eot) + (alist-get 'LINGER vars) `(: ,erc-d--linger-sentinel eot) + (alist-get 'DROP vars) `(: ,erc-d--drop-sentinel eot) + (erc-d-dialog-vars dialog) vars + (erc-d-dialog-hunks dialog) (erc-d--advance-or-die dialog + (funcall ex-i= t))) + (iter-next (setf (erc-d-dialog-handler dialog) + (erc-d--command-handle-all dialog))) + ;; Add reverse link + (process-put process :dialog dialog) + ;; Register client + (push process erc-d--clients) + (erc-d--on-request process))) + +(defun erc-d-load-replacement-dialog (dialog replacement &optional skip) + "Find REPLACEMENT among backlog and swap out current DIALOG's iterator. +With int SKIP, advance past that many exchanges." + (let* ((process (erc-d-dialog-process dialog)) + (server (process-get process :server)) + (ex-it (assoc-default replacement + (process-get server :dialog-dialogs) + #'eq))) + (setq ex-it (funcall ex-it)) + (when skip (while (not (zerop skip)) + (iter-next ex-it) + (cl-decf skip))) + (dolist (timer (erc-d-dialog-timers dialog)) + (cancel-timer timer)) + (dolist (exchange (ring-elements (erc-d-dialog-exchanges dialog))) + (cancel-timer (erc-d-exchange-timer exchange))) + (setf (erc-d-dialog-hunks dialog) (erc-d--advance-or-die dialog ex-it)) + (iter-next (setf (erc-d-dialog-handler dialog) + (erc-d--command-handle-all dialog))))) + +(defvar erc-d--m-debug (getenv "ERC_D_DEBUG")) + +(defmacro erc-d--m (process format-string &rest args) + "Output ARGS using FORMAT-STRING somewhere depending on context. +PROCESS should be a client connection or a server network process." + `(let ((format-string (if erc-d--m-debug + (concat (format-time-string "%s.%N: ") + ,format-string) + ,format-string)) + (want-insert (and ,process erc-d--in-process))) + (when want-insert + (with-current-buffer (process-buffer (process-get ,process :server)) + (goto-char (point-max)) + (insert (concat (format ,format-string ,@args) "\n")))) + (when (or erc-d--m-debug (not want-insert)) + (message format-string ,@args)))) + +(defmacro erc-d--log (process string &optional outbound) + "Log STRING sent to (OUTBOUND) or received from PROCESS peer." + `(let ((id (or (process-get ,process :log-id) + (let ((port (erc-d-u--get-remote-port ,process))) + (process-put ,process :log-id port) + port))) + (name (erc-d-dialog-name (process-get ,process :dialog)))) + (if ,outbound + (erc-d--m process "-> %s:%s %s" name id ,string) + (dolist (line (split-string ,string "\r\n")) + (erc-d--m process "<- %s:%s %s" name id line))))) + +(defun erc-d--send (process string) + "Send STRING to PROCESS peer." + (erc-d--log process string 'outbound) + (process-send-string process (concat string "\r\n"))) + +(define-inline erc-d--fuzzy-p (exchange) + (inline-letevals (exchange) + (inline-quote + (let ((tag (symbol-name (erc-d-exchange-tag ,exchange)))) + (eq ?~ (aref tag 0)))))) + +(define-error 'erc-d-timeout "Timed out awaiting expected request") + +(defun erc-d--finalize-dialog (dialog) + "Delete client-connection and finalize DIALOG. +Return associated server." + (let ((process (erc-d-dialog-process dialog))) + (setq erc-d--clients (delq process erc-d--clients)) + (dolist (timer (erc-d-dialog-timers dialog)) + (cancel-timer timer)) + (dolist (exchange (ring-elements (erc-d-dialog-exchanges dialog))) + (cancel-timer (erc-d-exchange-timer exchange))) + (prog1 (process-get process :server) + (delete-process process)))) + +(defun erc-d--teardown (&optional sig &rest msg) + "Clean up processes and maybe send signal SIG using MSG." + (unless erc-d--in-process + (when sig + (erc-d--m nil "%s %s" sig (apply #'format-message msg))) + (kill-emacs (if msg 1 0))) + (let (process servers) + (while (setq process (pop erc-d--clients)) + (push (erc-d--finalize-dialog (process-get process :dialog)) servers= )) + (dolist (server servers) + (delete-process server))) + (dolist (timer timer-list) + (when (memq (timer--function timer) '(erc-d--send erc-d--iter-next)) + (erc-d--m nil "Stray timer found: %S" (timer--function timer)) + (cancel-timer timer))) + (when sig + (dolist (buf erc-d-u--canned-buffers) + (kill-buffer buf)) + (setq erc-d-u--canned-buffers nil) + (signal sig (list (apply #'format-message msg))))) + +(defun erc-d--teardown-this-dialog-at-least (dialog) + "Run `erc-d--teardown' after destroying DIALOG if it's the last one." + (let ((server (process-get (erc-d-dialog-process dialog) :server)) + (us (erc-d-dialog-process dialog))) + (erc-d--finalize-dialog dialog) + (cl-assert (not (memq us erc-d--clients))) + (unless (or (process-get server :dialog-dialogs) + (catch 'other + (dolist (process erc-d--clients) + (when (eq (process-get process :server) server) + (throw 'other process))))) + (push us erc-d--clients) + (erc-d--teardown)))) + +(defun erc-d--expire (dialog exchange) + "Raise timeout error for EXCHANGE. +This will start the teardown for DIALOG." + (setf (erc-d-exchange-specs exchange) nil) + (if-let ((finalizer (erc-d-dialog-finalizer dialog))) + (funcall finalizer dialog exchange) + (erc-d--teardown 'erc-d-timeout "Timed out awaiting request: %s" + (list :name (erc-d-exchange-tag exchange) + :pattern (erc-d-exchange-pattern exchange) + :timeout (erc-d-exchange-timeout exchange) + :dialog (erc-d-dialog-name dialog))))) + +;; Using `run-at-time' here allows test cases to examine replies as +;; they arrive instead of forcing tests to wait until an exchange +;; completes. The `run-at-time' in `erc-d--command-meter-replies' +;; does the same. When running as a subprocess, a normal while loop +;; with a `sleep-for' works fine (including with multiple dialogs). +;; FYI, this issue was still present in older versions that called +;; this directly from `erc-d--filter'. + +(defun erc-d--on-request (process) + "Handle one request for client-connection PROCESS." + (when (process-live-p process) + (let* ((dialog (process-get process :dialog)) + (queue (erc-d-dialog-queue dialog))) + (unless (ring-empty-p queue) + (let* ((parsed (ring-remove queue)) + (cmd (intern (erc-d-i-message.command parsed)))) + (setf (erc-d-dialog-message dialog) parsed) + (erc-d-command dialog cmd))) + (run-at-time nil nil #'erc-d--on-request process)))) + +(defun erc-d--drop-p (exchange) + (string-search erc-d--drop-sentinel (erc-d-exchange-pattern exchange))) + +(defun erc-d--linger-p (exchange) + (string-search erc-d--linger-sentinel (erc-d-exchange-pattern exchange))) + +(defun erc-d--fake-eof (dialog) + "Simulate receiving a fictitious \"EOF\" message from peer." + (setf (erc-d-dialog-message dialog) ; use downcase for internal cmds + (make-erc-d-i-message :command "eof" :unparsed erc-d--eof-sentinel= )) + (run-at-time nil nil #'erc-d-command dialog 'eof)) + +(defun erc-d--process-sentinel (process event) + "Set up or tear down client-connection PROCESS depending on EVENT." + (erc-d--m process "Connection %s: %s" process (string-trim-right event)) + (if (eq 'open (process-status process)) + (erc-d--initialize-client process) + (let* ((dialog (process-get process :dialog)) + (exes (and dialog (erc-d-dialog-exchanges dialog)))) + (if (and exes (not (ring-empty-p exes))) + (cond ((string-prefix-p "connection broken" event) + (erc-d--fake-eof dialog)) + ;; Ignore disconnecting peer when pattern is DROP + ((and (string-prefix-p "deleted" event) + (erc-d--drop-p (ring-ref exes -1)))) + (t (erc-d--teardown))) + (erc-d--teardown))))) + +(defun erc-d--filter (process string) + "Handle input received from peer. +PROCESS represents a client peer connection and STRING is a raw request +including line delimiters." + (let ((queue (erc-d-dialog-queue (process-get process :dialog)))) + (setq string (concat (process-get process :stashed-input) string)) + (while (and string (string-match "\\(?:\r\n\\)+" string)) + (let ((line (substring string 0 (match-beginning 0)))) + (setq string (unless (=3D (match-end 0) (length string)) + (substring string (match-end 0)))) + (erc-d--log process line nil) + (ring-insert queue (erc-d-i--parse-message line 'decode)))) + (when string + (setf (process-get process :stashed-input) string)))) + +;; Misc process properties: +;; +;; The server property `:dialog-dialogs' is an alist of (symbol +;; . iterator) conses, each of which pairs a dialog name with a +;; dispenser of exchange hunks (described above in the Commentary). +;; This list is populated by `erc-d-run' at the start of each session. +;; +;; Client-connection processes keep a reference to their server via a +;; `:server' property, which can be used to share info with other +;; clients. There is currently no built-in way to do the same with +;; clients of other servers. Clients also keep references to their +;; dialogs and raw messages via `:dialog' and `:stashed-input'. +;; +;; The logger stores a unique, human-friendly process name in the +;; client-process property `:log-id'. + +(defun erc-d--start (host service name &rest plist) + "Serve canned replies on HOST at SERVICE. +Return the new server process immediately when `erc-d--in-process' is +non-nil. Otherwise, serve forever. PLIST becomes the plist of the +server process and is used to initialize the plists of connection +processes. NAME is used for the process and the buffer." + (let* ((buf (get-buffer-create (concat "*" name "*"))) + (proc (make-network-process :server t + :buffer buf + :noquery t + :filter #'erc-d--filter + :sentinel #'erc-d--process-sentinel + :name name + :family (if host 'ipv4 'local) + :coding 'binary + :service (or service t) + :host host + :plist plist))) + (process-put proc :server proc) + ;; We don't have a minor mode, so use an arbitrary variable to mark + ;; buffers owned by us instead + (with-current-buffer buf (setq erc-d-u--process-buffer t)) + (erc-d--m proc "Starting network process: %S %S" + proc (erc-d-u--format-bind-address proc)) + (if erc-d--in-process + proc + (while (process-live-p proc) + (accept-process-output nil 0.01))))) + +(defun erc-d--wrap-func-val (dialog exchange key func) + "Return a form invoking FUNC when evaluated. +Arrange for FUNC to be called with the args it expects based on +the description in `erc-d--render-entries'." + (let (args) + ;; Ignore &rest or &optional + (pcase-let ((`(,n . ,_) (func-arity func))) + (cl-case n + (0) + (1 (push (apply-partially #'erc-d-exchange-multi dialog exchange k= ey) + args)) + (2 (push exchange args) + (push (apply-partially #'erc-d-exchange-multi dialog exchange k= ey) + args)) + (t (error "Incompatible function: %s" func)))) + `(save-match-data (apply #',func ',args)))) + +(defun erc-d-exchange-reload (dialog exchange) + "Rebuild all bindings for EXCHANGE from those in DIALOG." + (cl-loop for (key . val) in (erc-d-dialog-vars dialog) + unless (keywordp key) do + (push (list key val) (erc-d-exchange-bindings exchange)) + ;; Massage list so it's suitable for an `rx-list' binding. + ;; IOW, handle cases in which VAL is ([ARGLIST] RX-FORM) + ;; rather than just RX-FORM. KEY becomes the binding name. + (push (if (and (listp val) + (cdr val) + (not (cddr val)) + (consp (car val))) + (cons key val) + (list key val)) + (erc-d-exchange-rx-bindings exchange)) + and when (functionp val) do + (setq val + (erc-d--wrap-func-val dialog exchange key val)) + (push (list key val) (erc-d-exchange-labels exchange)))) + +(defun erc-d-exchange-rebind (dialog exchange key val &optional export) + "Modify a binding between renders. + +Bind symbol KEY to VAL, replacing whatever existed before, which may +have been a function. A third, optional argument, if present and +non-nil, results in the DIALOG's bindings for all EXCHANGEs adopting +this binding. VAL can either be a function of the type described in +`erc-d--render-entries' or any value acceptable as an argument to the +function `concat'. + +DIALOG and EXCHANGE are the current `erc-d-dialog' and `erc-d-exchange' +objects for the request context." + (when export + (setf (alist-get key (erc-d-dialog-vars dialog)) val)) + (if (functionp val) + (setf (alist-get key (erc-d-exchange-labels exchange)) + (list (erc-d--wrap-func-val dialog exchange key val))) + (setf (alist-get key (erc-d-exchange-labels exchange) nil 'rm) nil + (alist-get key (erc-d-exchange-rx-bindings exchange)) (list val) + (alist-get key (erc-d-exchange-bindings exchange)) (list val))) + val) + +(defun erc-d-exchange-match (exchange match-number &optional tag) + "Return match portion of current or previous request. +MATCH-NUMBER is the match group number. TAG, if provided, means the +exchange tag (name) from some previously matched request." + (if tag + (pcase-let* ((dialog (erc-d-exchange-dialog exchange)) + (`(,m-d . ,req) (plist-get (erc-d-dialog-history dialog) + tag))) + (set-match-data m-d) + (match-string match-number req)) + (match-string match-number (erc-d-exchange-request exchange)))) + +(defun erc-d-exchange-multi (dialog exchange key cmd &rest args) + "Call CMD with ARGS. +This is a utility helper passed as the first argument to all template +functions. DIALOG and EXCHANGE are pre-applied. A few pseudo commands, +like `:request', are provided for convenience so that the caller's +definition doesn't have to include this file. + +Command :get-var KEY looks up an item in `erc-d-dialog-vars'. Command +:get-binding KEY looks up an item in `erc-d-exchange-bindings'. Command +:set sets the template item triggered to a new VAL, optionally EXPORTing +it to `erc-d-dialog-vars'." + ;; Parameter-based dependency injection would be nicer perhaps, but + ;; that would require actually learning how Emacs works + (pcase cmd + (:set (apply #'erc-d-exchange-rebind dialog exchange key args)) + (:reload (apply #'erc-d-exchange-reload dialog exchange args)) + (:rebind (apply #'erc-d-exchange-rebind dialog exchange args)) + (:match (apply #'erc-d-exchange-match exchange args)) + (:request (erc-d-exchange-request exchange)) + (:match-data (erc-d-exchange-match-data exchange)) + (:dialog-name (erc-d-dialog-name dialog)) + (:get-binding (cadr (assq (erc-d-exchange-bindings exchange) (car args= )))) + (:get-var (alist-get (car args) (erc-d-dialog-vars dialog))))) + +(defmacro erc-d--prep-outgoing-entry (exchange entry) + "Rewrite ENTRY for `erc-d--render-entries' using EXCHANGE." + ;; If we changed the dialog bindings from proper pairs to cons pair, + ;; we could pass it to `eval' directly and drop this `macroexp-let'. + `(macroexp-let* (cl-loop for (k v) in (erc-d-exchange-bindings ,exchange) + collect (list k (macroexp-quote v))) + `(cl-symbol-macrolet ,(erc-d-exchange-labels ,exchange) + (set-match-data ',(erc-d-exchange-match-data ,exchang= e)) + ,(cons 'concat ,entry)))) + +(defun erc-d--render-entries (dialog exchange entries) + "Return an iterator producing rendered strings from canned ENTRIES. +When an entry's CAR is an arbitrary symbol, yield that back first, and +consider the entry an \"incoming\" entry. Then, regardless of the +entry's type (incoming or outgoing), yield back the next element, which +should be a number representing either a timeout (incoming) or a +delay (outgoing). After that, yield a rendered template (outgoing) or a +regular expression (incoming). + +When evaluating a template, bind the keys in the alist stored in +DIALOG's `vars' field to its values, but skip any self-quoters, like +:foo. When an entry is incoming, replace occurrences of a key with its +value, which can be any valid `rx' form (see Info node `(elisp) +Extending Rx'). Do the same when an entry is outgoing, but expect a +value's form to be (anything that evaluates to) something acceptable by +`concat' or, alternatively, a function that returns the latter (meaning +a string or nil). + +Repeat the last two steps for the remaining entries, all of which are +assumed to be outgoing. That is, continue yielding a timeout/delay and +a rendered string for each entry, and signal `iter-end-of-sequence'. + +Once again, for an incoming entry, the yielded string is a regexp to be +matched against the raw request. For outgoing, it's the final response, +ready to be sent out (after adding the appropriate line ending). + +To help with testing, bindings are not automatically created from +DIALOG's \"vars\" alist when this function is invoked. But this can be +forced by sending a non-nil value into the generator on the second +`iter-next' call of a given iteration. This clobbers any temporary +bindings that don't exist in the DIALOG's `vars' alist, such as those +added via `erc-d-exchange-rebind' (unless \"exported\"). + +As noted earlier, template symbols can be bound to functions. When +called during rendering, the match data from the current (matched) +request is accessible by calling the function `match-data'. + +A function may ask for up to two required args, which are provided as +needed. When applicable, the first required arg is a `funcall'-able +helper that accepts various keyword-based commands, like :rebind, and a +variable number of args. See `erc-d-exchange-multi' for details. When +specified, the second required arg is the current `erc-d-exchange' +object, which has among its members its owning `erc-d-dialog' object. +This should suffice as a safety valve for any corner-case needs. +Non-required args are ignored." + (let (head + entry + (state 0)) + ;; Fake generator + (lambda (iter-cmd yield-result) + (cl-assert (eq iter-cmd :next)) + (unless entry + (setq entry (iter-next entries))) + (catch 'yield + (while entry + (cl-case state + (0 (setq state 1) + (throw 'yield + (setq head (pop entry)))) + (1 (setq state 2) + (when yield-result + (erc-d-exchange-reload dialog exchange)) + (if (numberp head) + (setq entry (erc-d--prep-outgoing-entry exchange entry)) + (throw 'yield + (prog1 (pop entry) + (setq entry + `(rx-let ,(erc-d-exchange-rx-bindings exch= ange) + (rx bos ,@entry))))))) + (2 (setq state 0) + (throw 'yield + (prog1 (funcall `(lambda () ,entry)) + (setq entry nil)))))))))) + +(defun erc-d-on-match (dialog exchange) + "Handle matched exchange request. +Allow the first handler in `erc-d-match-handlers' whose key matches TAG +to manipulate replies before they're sent to the DIALOG peer." + (when-let* ((tag (erc-d-exchange-tag exchange)) + (handler (plist-get (erc-d-dialog-match-handlers dialog) tag= ))) + (let ((md (erc-d-exchange-match-data exchange))) + (set-match-data md) + (funcall handler dialog exchange)))) + +(iter-defun erc-d--send-outgoing (dialog exchange) + "Send outgoing lines for EXCHANGE to DIALOG peer. +Assume the next spec is outgoing. If its delay value is zero, render +the template and send the resulting message straight away. Do the same +when DELAY is negative, only arrange for its message to be sent (abs +DELAY) seconds later, and then keep on processing. If DELAY is +positive, pause processing and yield DELAY." + (erc-d-on-match dialog exchange) + (let ((specs (erc-d-exchange-specs exchange)) + (process (erc-d-dialog-process dialog)) + delay) + ;; Consume till next request encountered or exhausted + (while (setq delay (iter-next specs)) + (cond ((zerop delay) (erc-d--send process (iter-next specs))) + ((< delay 0) (push (run-at-time (- delay) nil #'erc-d--send pr= ocess + (iter-next specs)) + (erc-d-dialog-timers dialog))) + (t (iter-yield delay) + (erc-d--send process (iter-next specs))))))) + +(defun erc-d--add-dialog-linger (dialog exchange) + "Add finalizer for EXCHANGE in DIALOG." + (erc-d--m (erc-d-dialog-process dialog) + "Lingering for %.2f seconds" (erc-d-exchange-timeout exchange)) + (let ((start (current-time))) + (setf (erc-d-dialog-finalizer dialog) + (lambda (&rest _) + (erc-d--m (erc-d-dialog-process dialog) + "Lingered for %.2f seconds" + (float-time (time-subtract (current-time) start))) + (erc-d--teardown-this-dialog-at-least dialog))))) + +(defun erc-d--add-dialog-drop (dialog exchange) + "Add finalizer for EXCHANGE in DIALOG." + (erc-d--m (erc-d-dialog-process dialog) + "Dropping in %.2f seconds" (erc-d-exchange-timeout exchange)) + (setf (erc-d-dialog-finalizer dialog) + (lambda (&rest _) + (erc-d--m (erc-d-dialog-process dialog) + "Dropping %S" (erc-d-dialog-name dialog)) + (erc-d--finalize-dialog dialog)))) + +(defun erc-d--create-exchange (dialog hunk) + "Initialize next exchange HUNK for DIALOG." + (let* ((exchange (make-erc-d-exchange :dialog dialog)) + (specs (erc-d--render-entries dialog exchange hunk))) + (setf (erc-d-exchange-specs exchange) specs + (erc-d-exchange-tag exchange) (iter-next specs) + (erc-d-exchange-timeout exchange) (iter-next specs t) + (erc-d-exchange-pattern exchange) (iter-next specs)) + (cond ((erc-d--linger-p exchange) + (erc-d--add-dialog-linger dialog exchange)) + ((erc-d--drop-p exchange) + (erc-d--add-dialog-drop dialog exchange))) + (setf (erc-d-exchange-timer exchange) + (run-at-time (erc-d-exchange-timeout exchange) + nil #'erc-d--expire dialog exchange)) + exchange)) + +(cl-defun erc-d--command-consider (dialog) + "Maybe return next matched exchange for DIALOG. +Upon encountering a mismatch, schedule a teardown unless only fuzzies +remain in the exchange pool, in which case, return nil." + (let* ((parsed (erc-d-dialog-message dialog)) + (line (erc-d-i-message.unparsed parsed)) + (exes (erc-d-dialog-exchanges dialog)) + ;; + matched) + (let ((elts (ring-elements exes))) + (while (and (setq matched (pop elts)) + (not (string-match (erc-d-exchange-pattern matched) line= ))) + (if (and (not elts) (erc-d--fuzzy-p matched)) + ;; Nothing to do, so advance + (cl-return-from erc-d--command-consider nil) + (cl-assert (or (not elts) (erc-d--fuzzy-p matched)))))) + (unless matched + (erc-d--teardown 'error "Match failed: %S %S" line + (list :exes (mapcar #'erc-d-exchange-pattern + (ring-elements exes)) + :dialog (erc-d-dialog-name dialog)))) + (setf (erc-d-exchange-request matched) line + (erc-d-exchange-match-data matched) (match-data) + ;; Also add current to match history, indexed by exchange tag + (plist-get (erc-d-dialog-history dialog) + (erc-d-exchange-tag matched)) + (cons (match-data) line)) ; do we need to make a copy of this? + (cancel-timer (erc-d-exchange-timer matched)) + (ring-remove exes (ring-member exes matched)))) + +(defun erc-d--active-ex-p (ring) + "Return non-nil when RING has a non-fuzzy exchange. +That is, return nil when RING is empty or when it only has exchanges +with leading-tilde tags." + (let ((i 0) + (len (ring-length ring)) + ex found) + (while (and (not found) (< i len)) + (unless (erc-d--fuzzy-p (setq ex (ring-ref ring i))) + (setq found ex)) + (cl-incf i)) + found)) + +(iter-defun erc-d--advance-or-die (dialog hunks) + "Govern the lifetime of DIALOG. +Convert raw HUNKS into exchanges and insert them into the pool of +expected matches, as produced. Run teardown when exhausted." + (let ((exes (erc-d-dialog-exchanges dialog))) + (iter-do (hunk hunks) + ;; Wait till actually needed + (while (erc-d--active-ex-p exes) + (iter-yield 'deferring)) + (let ((exchange (erc-d--create-exchange dialog hunk))) + (if (erc-d--fuzzy-p exchange) + (ring-insert exes exchange) + (ring-insert-at-beginning exes exchange)) + ;; This seems a bit safer than yielding the exchange directly + (iter-yield 'matching))) + ;; Only die after all exchanges (including fuzzies) have matched + (while (not (ring-empty-p exes)) + (iter-yield 'depleted)) + ;; Linger logic for individual dialogs is handled elsewhere + (if-let ((finalizer (erc-d-dialog-finalizer dialog))) + (funcall finalizer dialog) + (let ((d (process-get (erc-d-dialog-process dialog) + :dialog-linger-secs))) + (push (run-at-time d nil #'erc-d--teardown) + (erc-d-dialog-timers dialog)))) + (iter-yield 'done))) + +(defalias 'erc-d--iter-next #'iter-next) ; detect which timer funcs are ou= rs + +(iter-defun erc-d--command-meter-replies (dialog exchange) + "Ignore requests until all replies have been sent. +Do this for some previously matched EXCHANGE in DIALOG." + (iter-do (delay (erc-d--send-outgoing dialog exchange)) + (push (run-at-time delay nil #'erc-d--iter-next + (erc-d-dialog-handler dialog) 'resume) + (erc-d-dialog-timers dialog)) + (unless (eq 'resume (iter-yield (erc-d-dialog-state dialog))) + (while (not (eq 'resume (iter-yield (setf (erc-d-dialog-state dialog) + 'sending)))))))) + +(defun erc-d--die-unexpected (dialog) + (erc-d--teardown 'error "Received unexpected input: %S" + (erc-d-i-message.unparsed (erc-d-dialog-message dialog)= ))) + +(iter-defun erc-d--command-handle-all (dialog) + "Act as control agent and process next request for DIALOG. +Receive symbols representing IRC or control commands (lowercase). And +yield symbols indicating the most recent control state. Both are +only used for debugging." + (let ((matched t)) + (iter-do (state (erc-d-dialog-hunks dialog)) + (if matched + (cl-case (iter-yield (setf (erc-d-dialog-state dialog) state)) + ;; TODO remove these internal commands if unneeded + ('eof (erc-d--m (erc-d-dialog-process dialog) "Received an EOF= "))) + (cl-assert (memq state '(matching depleted)) t) + (when (eq 'depleted state) + (erc-d--die-unexpected dialog))) + (when (ring-empty-p (erc-d-dialog-exchanges dialog)) + (erc-d--die-unexpected dialog)) + (when (setq matched (erc-d--command-consider dialog)) + (iter-yield-from (erc-d--command-meter-replies dialog matched)))))) + + +;;;; Handlers for IRC commands + +(cl-defgeneric erc-d-command ((dialog erc-d-dialog) cmd) + "Handle new CMD from client for DIALOG. +By default, defer to this dialog's `erc-d--command-handle-all' instance, +which is stored in its `handler' field." + (condition-case _err + (when (eq 'sending (iter-next (erc-d-dialog-handler dialog) cmd)) + (ring-insert-at-beginning (erc-d-dialog-queue dialog) + (erc-d-dialog-message dialog))) + (iter-end-of-sequence (erc-d--teardown)))) ; likely never runs + +;; A similar PONG handler would be useless because we know when to +;; expect them + +(cl-defmethod erc-d-command ((dialog erc-d-dialog) (_cmd (eql PING)) + &context (erc-d-auto-pong (eql t))) + "Respond to PING request from DIALOG peer when ERC-D-AUTO-PONG is t." + (let* ((parsed (erc-d-dialog-message dialog)) + (process (erc-d-dialog-process dialog)) + (nonce (car (erc-d-i-message.command-args parsed))) + (fqdn (erc-d-dialog-server-fqdn dialog))) + (erc-d--send process (format ":%s PONG %s :%s" fqdn fqdn nonce)))) + + +;;;; Entry points + +(defun erc-d-run (host service &optional server-name &rest dialogs) + "Start serving DIALOGS on HOST at SERVICE. +Pass HOST and SERVICE directly to `make-network-process'. When present, +use string SERVER-NAME for the server-process name as well as that of +its buffer (w. surrounding asterisks). When absent, do the same with +`erc-d-server-name'. When running \"in process,\" return the server +process, otherwise sleep for the duration of the server process. + +A dialog must be a symbol matching the base name of a dialog file in +`erc-d-u-canned-dialog-dir'. + +The variable `erc-d-spec-vars' determines the common members of the +`erc-d--render-entries' ENTRIES param. Variables `erc-d-server-fqdn' +and `erc-d-linger-secs' determine the `erc-d-dialog' items +`:server-fqdn' and `:linger-secs' for all client processes. + +The variable `erc-d-spec-vars' can be used to initialize the +process's `erc-d-dialog' vars item." + (when erc-d--slow-mo + (message "Slow mo is ON")) + (when (and server-name (symbolp server-name)) + (push server-name dialogs) + (setq server-name nil)) + (let (loaded) + (dolist (dialog (nreverse dialogs)) + (let ((ex-it (erc-d-u--canned-load-dialog dialog))) + (when erc-d--slow-mo + (setq ex-it (erc-d-u--rewrite-for-slow-mo erc-d--slow-mo ex-it))) + (push (cons (erc-d-u--normalize-canned-name dialog) ex-it) loaded)= )) + (setq dialogs loaded)) + (erc-d--start host service (or server-name erc-d-server-name) + :dialog-dialogs dialogs + :dialog-vars erc-d-spec-vars + :dialog-linger-secs erc-d-linger-secs + :dialog-server-fqdn erc-d-server-fqdn + :dialog-match-handlers (erc-d-u--unkeyword + erc-d-match-handlers))) + +(defun erc-d-serve () + "Start serving canned dialogs from the command line. +Although not autoloaded, this function is meant to be summoned via the +Emacs -f flag while starting a batch session. It prints incoming and +outgoing messages to standard out. + +The main options are --host HOST and --port PORT, which default to +localhost and auto, respectively. The args are the dialogs to run. +Unlike with `erc-d-run', dialogs here *must* be file paths, meaning +Lisp-Data files adhering to the required format. (These consist of +\"specs\" detailing timing and template info; see commentary for +specifics.) + +An optional --add-time N option can also be passed to hike up timeouts +by some number of seconds N. For example, you might run: + + $ emacs -Q -batch -L . \\ + > -l erc-d.el \\ + > -f erc-d-serve \\ + > --host 192.168.124.1 \\ + > --port 16667 \\ + > --add-time 10 \\ + > ./my-dialog.lispdata + +from a Makefile or manually with \\\\[compile]. And then in +another terminal, do: + + $ nc -C 192.168.124.1 16667 ; or telnet if your nc doesn't have -C + > PASS changeme + ... + +Use `erc-d-run' instead to start the server from within Emacs." + (unless noninteractive + (error "Command-line func erc-d-serve not run in -batch session")) + (setq erc-d--in-process nil) + (let (port host dialogs erc-d--slow-mo) + (while command-line-args-left + (pcase (pop command-line-args-left) + ("--add-time" (setq erc-d--slow-mo + (string-to-number (pop command-line-args-left)= ))) + ("--linger" (setq erc-d-linger-secs + (string-to-number (pop command-line-args-left)))) + ("--host" (setq host (pop command-line-args-left))) + ("--port" (setq port (string-to-number (pop command-line-args-left= )))) + (dialog (push dialog dialogs)))) + (setq dialogs (mapcar #'erc-d-u--massage-canned-name dialogs)) + (apply #'erc-d-run (or host "localhost") port nil (nreverse dialogs)))) + +(provide 'erc-d) + +;;; erc-d.el ends here --=20 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0011-Add-user-oriented-test-scenarios-for-ERC.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Thu, 13 May 2021 05:55:22 -0700 Subject: [PATCH 11/28] Add user-oriented test scenarios for ERC XXX after review, this commit should be subsumed (squashed down upon) by the subsequent commit entitled something like "Update ERC scenarios ..." (But it can't be dropped completely because some files are simply renamed.) After that operation, the remaining single commit should be moved after/atop "Address long-standing ERC buffer-naming issues" and perhaps squashed into it in order to play nice with any future bisecting efforts. * test/lisp/erc/erc-scenarios.el: Add new placeholder file for behavioral tests. * test/lisp/erc/erc-scenarios-48598.el: Add temporary file containing expository-style tests to demonstrate existing behavior explained in bug#48598 and to contrast that with expected behavior. Squashing the updated "fixed" scenarios into this is inevitable, though doing so may keep future people from easily reviewing the evolution of these problems. * test/lisp/erc/erc-scenarios-resources: Also add accompanying directory containing canned dialog scripts needed by various tests. --- test/lisp/erc/erc-scenarios-48598.el | 988 ++++++++++++++++++ .../47522/ambiguous-join/barnet.lispdata | 23 + .../47522/ambiguous-join/foonet.lispdata | 42 + .../47522/foil-in-server-buf/barnet.lispdata | 40 + .../47522/foil-in-server-buf/foonet.lispdata | 43 + .../clash-of-chans/autojoin/barnet.lispdata | 40 + .../autojoin/foonet-again.lispdata | 39 + .../clash-of-chans/autojoin/foonet.lispdata | 36 + .../bouncer-history/barnet.lispdata | 41 + .../bouncer-history/foonet.lispdata | 45 + .../rename-buffers/barnet.lispdata | 38 + .../rename-buffers/foonet.lispdata | 43 + .../uniquify-fail/barnet.lispdata | 63 ++ .../uniquify-fail/foonet.lispdata | 63 ++ .../uniquify-litter/barnet.lispdata | 66 ++ .../uniquify-litter/foonet.lispdata | 56 + .../rebuffed/foil-rename/barnet.lispdata | 51 + .../rebuffed/foil-rename/foonet.lispdata | 48 + .../48598/rebuffed/gapless/barnet.lispdata | 49 + .../48598/rebuffed/gapless/foonet.lispdata | 5 + .../48598/rebuffed/reuseless/barnet.lispdata | 24 + .../48598/rebuffed/reuseless/foonet.lispdata | 21 + test/lisp/erc/erc-scenarios.el | 4 + 23 files changed, 1868 insertions(+) create mode 100644 test/lisp/erc/erc-scenarios-48598.el create mode 100644 test/lisp/erc/erc-scenarios-resources/47522/ambiguous-join/barnet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/47522/ambiguous-join/foonet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/47522/foil-in-server-buf/barnet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/47522/foil-in-server-buf/foonet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/barnet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/foonet-again.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/foonet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/bouncer-history/barnet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/bouncer-history/foonet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/rename-buffers/barnet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/rename-buffers/foonet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-fail/barnet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-fail/foonet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-litter/barnet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-litter/foonet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/48598/rebuffed/foil-rename/barnet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/48598/rebuffed/foil-rename/foonet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/48598/rebuffed/gapless/barnet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/48598/rebuffed/gapless/foonet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/48598/rebuffed/reuseless/barnet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/48598/rebuffed/reuseless/foonet.lispdata create mode 100644 test/lisp/erc/erc-scenarios.el diff --git a/test/lisp/erc/erc-scenarios-48598.el b/test/lisp/erc/erc-scenarios-48598.el new file mode 100644 index 0000000000..7876b08e45 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-48598.el @@ -0,0 +1,988 @@ +;;; erc-scenarios-48598.el --- e2e test cases for ERC -*- lexical-binding: t -*- + +;; Copyright (C) 2021 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 +;; . + +;;; Commentary: +;; +;; These are meant to demo unwanted behavior described in bug#48598. +;; To allow for incrementally addressing those issues, they have been +;; written to *pass* when run from a historical snapshot of the tree +;; built with libraries and tools that existed at or in the months +;; leading up to 0c7a7433dce1b93a685396986d3a560c9cc291f1. See next +;; commit for updated scenarios and layout adapted for long-term use +;; with an eye toward maintenance and refactoring. +;; +;; Because 595e506c82 "Set +i by default" constitutes a breaking +;; change and these test are meant to verify pre-0c7a7433d behavior, +;; the option `erc-user-mode' has been artificially overridden to +;; restore its original default value of nil. + +;;; Code: +(require 'ert-x) ; cl-lib + +(eval-and-compile + (when-let ((dir (getenv "EMACS_TEST_DIRECTORY"))) + (cl-pushnew (concat dir "/lisp/erc/erc-d") load-path :test #'equal))) +(require 'erc-d) +(require 'erc-d-t) +(require 'erc-backend) + +(declare-function erc-network-name "erc-networks") +(defvar erc-autojoin-channels-alist) +(defvar erc-network) + +(defvar erc-scenarios-resources-dir + (let ((ert-resource-directory-trim-right-regexp "\\(-48598\\)?\\.el")) + (ert-resource-directory))) + +(when (boundp 'process-prioritize-lower-fds) + (setq process-prioritize-lower-fds t)) + +;; When interactive, teardown is already inhibited, which precludes +;; subsequent tests. So might as well treat inspection as the goal. +(unless noninteractive + (setq erc-server-auto-reconnect nil)) + +(defvar erc-scenarios--dialog-name nil) + +(defvar erc-scenarios--extra-teardown nil) + +(defun erc-scenarios-common-buflist (prefix) + "Return list of buffers with names sharing PREFIX." + (let (case-fold-search) + (delq nil (mapcar (lambda (b) + (when (string-prefix-p prefix (buffer-name b)) b)) + (buffer-list))))) + +(defmacro erc-scenarios-common-with-cleanup (bindings &rest body) + "Provide boilerplate cleanup tasks after calling BODY with BINDINGS. +Set `erc-scenarios-resources-dir' for the current ERT test. If a +process exists with the default dumb-server name, wait for it to start +before running BODY. If `erc-autojoin-mode' mode is bound, restore it +during cleanup if negated by BODY. Other defaults common to these test +cases are added below and can be overridden, except when wanting the +\"real\" default value, which must be looked up or captured outside of +this form." + (declare (indent 1)) + (let* ((orig-autojoin-mode (make-symbol "orig-autojoin-mode")) + (get-name `(expand-file-name + (or erc-scenarios--dialog-name + (substring (symbol-name + (ert-test-name (ert-running-test))) + ,(length "erc-scenarios-"))) + erc-scenarios-resources-dir)) + (defaults `((erc-d-u-canned-dialog-dir ,get-name) + (erc-user-mode nil) + (erc-modules (copy-sequence erc-modules)) + (,orig-autojoin-mode (bound-and-true-p erc-autojoin-mode)) + (erc-autojoin-channels-alist nil) + (erc-server-auto-reconnect nil)))) + `(erc-d-t-with-cleanup (,@defaults ,@bindings) + (ert-info ("Restore autojoin kill ERC buffers") + (when erc-scenarios--extra-teardown + (ert-info ("Running extra teardown") + (funcall erc-scenarios--extra-teardown))) + (when (and (boundp 'erc-autojoin-mode) + (not (eq erc-autojoin-mode ,orig-autojoin-mode))) + (erc-autojoin-mode (if ,orig-autojoin-mode +1 -1))) + (when noninteractive + (when (and (boundp 'trace-buffer) (get-buffer trace-buffer)) + (with-current-buffer trace-buffer + (message "%S" (buffer-string)) + (kill-buffer))) + (erc-d-t-kill-related-buffers))) + (ert-info ("Wait for dumb server") + (dolist (buf (buffer-list)) + (with-current-buffer buf + (when erc-d-u--process-buffer + (erc-d-t-search-for 3 "Starting"))))) + (ert-info ("Activate erc-debug-irc-protocol") + (unless (and noninteractive (not erc-debug-irc-protocol)) + (erc-toggle-debug-irc-protocol))) + ,@body))) + +(defvar erc-scenarios--port 16667) + +(defun erc-scenarios--port() + "Set next port without checking if it's open." + (cl-incf erc-scenarios--port)) + +(defmacro erc-scenarios-with-local-watcher (found-sym target-var &rest body) + "Run BODY with mutations to TARGET-VAR recorded in FOUND-SYM." + (declare (indent 2)) + (let ((func (make-symbol "func"))) + `(let* (,found-sym + (,func (lambda (_s v op w) + (when (and (eq op 'set) + w ; buffer when buffer-local else nil + v) + (push v ,found-sym))))) + (should-not (get-variable-watchers ,target-var)) + (add-variable-watcher ,target-var ,func) + ,@body + (remove-variable-watcher ,target-var ,func) + (should-not (get-variable-watchers ,target-var))))) + +;; This test lineup should match ERT's + +(ert-deftest erc-scenarios-47522/ambiguous-join () + "Recast non-bug #47522 for regression defense." + (erc-scenarios-common-with-cleanup + ((erc-server-flood-penalty 0.1) ; see below + (dumb-server-foonet-buffer (get-buffer-create "*server-foonet*")) + (dumb-server-barnet-buffer (get-buffer-create "*server-barnet*")) + (dumb-server-foonet-port (erc-scenarios--port)) + (dumb-server-barnet-port (erc-scenarios--port)) + ;; Hmm, should maybe add name as formal param to `erc-d-run' + (dumb-server-foonet (erc-d-run "localhost" dumb-server-foonet-port + "server-foonet" 'foonet)) + (dumb-server-barnet (erc-d-run "localhost" dumb-server-barnet-port + "server-barnet" 'barnet)) + (expect (erc-d-t-make-expecter)) + erc-server-buffer-foo + erc-server-buffer-bar) + + (ert-info ("Connect to foonet") + (setq erc-server-buffer-foo (erc :server "127.0.0.1" + :port dumb-server-foonet-port + :nick "tester" + :password "changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-foo + (funcall expect 3 "debug mode") + (erc-cmd-JOIN "#chan"))) + + (erc-d-t-wait-for 2 "Buffer #chan@foonet exists" + (get-buffer "#chan")) + + (ert-info ("Connect to barnet") + (setq erc-server-buffer-bar (erc :server "127.0.0.1" + :port dumb-server-barnet-port + :nick "tester" + :password "changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-bar + (funcall expect 1 "debug mode"))) + + ;; If either of these two went through, we'd get a bad match on + ;; exchange "linger" (right?) + (ert-info ("Buffers don't exist") + (with-current-buffer erc-server-buffer-foo + (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 "Buffer #chan@foonet not replaced" + (get-buffer "#chan")) + (erc-d-t-wait-for 1 "Buffer #chan@barnet does not exist" + (= 1 (length (erc-scenarios-common-buflist "#chan")))) + ;; Still respects chine2e wall because subproc would dump same + ;; to stdout + (with-current-buffer dumb-server-barnet-buffer + (goto-char (point-min)) + (should-not (search-forward "JOIN" nil t)))) + + (ert-info ("All #chan@foonet output consumed") + (with-current-buffer "#chan" ; <- First chan joined (foonet) + (funcall expect 3 "welcome!") + (while (accept-process-output erc-server-process)) + (funcall expect 3 "husband"))))) + +(ert-deftest erc-scenarios-47522/foil-in-server-buf () + "Different spin on non-bug #47522 for regression defense." + (erc-scenarios-common-with-cleanup + ((erc-d-linger-secs 0.5) + (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-port (erc-scenarios--port)) + (dumb-server-barnet-port (erc-scenarios--port)) + (dumb-server-foonet (erc-d-run "localhost" dumb-server-foonet-port + "server-foonet" 'foonet)) + (dumb-server-barnet (erc-d-run "localhost" dumb-server-barnet-port + "server-barnet" 'barnet)) + (expect (erc-d-t-make-expecter)) + erc-server-buffer-foo + erc-server-buffer-bar) + + (ert-info ("Connect to foonet") + (setq erc-server-buffer-foo (erc :server "127.0.0.1" + :port dumb-server-foonet-port + :nick "tester" + :password "changeme" + :full-name "tester"))) + + (with-current-buffer erc-server-buffer-foo + (funcall expect 3 "debug mode") + (erc-cmd-JOIN "#chan")) + + (erc-d-t-wait-for 2 "Buffer #chan@foonet exists" + (get-buffer "#chan")) + + (ert-info ("Connect to barnet") + (setq erc-server-buffer-bar (erc :server "127.0.0.1" + :port dumb-server-barnet-port + :nick "tester" + :password "changeme" + :full-name "tester"))) + + (with-current-buffer erc-server-buffer-bar + (funcall expect 1 "debug mode") + (erc-cmd-JOIN "#chan")) + + (erc-d-t-wait-for 3 "Buffer #chan@barnet exists" + (get-buffer "#chan/127.0.0.1<2>")) + + (erc-d-t-wait-for 2 "Buffer #chan@foonet replaced" + (and (get-buffer "#chan/127.0.0.1") + (not (get-buffer "#chan")))) + + (ert-info ("All #chan@foonet output consumed") + (with-current-buffer "#chan/127.0.0.1" ; <- First chan joined (foonet) + (funcall expect 3 "bob") + (funcall expect 3 "was created on") + (while (accept-process-output erc-server-process)) + (funcall expect 3 "prosperous"))) + + (ert-info ("All #chan@barnet output consumed") + (with-current-buffer "#chan/127.0.0.1<2>" + (funcall expect 3 "mike") + (funcall expect 3 "was created on") + (while (accept-process-output erc-server-process)) + (funcall expect 3 "ingenuous"))))) + +;; On some systems, this first bunch may need some bumping of timeouts, +;; linger-secs, etc. See function `erc-d-u-rewrite-for-slow-mo'. + +;; XXX 9bb8d90cdd Allow irc network symbols in erc-autojoin-channels-alist +;; Fixes the inciting action here but not the root cause +(ert-deftest erc-scenarios-48598/clash-of-chans/autojoin () + (ert-skip "obsolete") + (should erc-reuse-buffers) + + (erc-scenarios-common-with-cleanup + ((erc-d-u-with-cleanup-sleep-secs 1) + (erc-server-flood-penalty 0.5) + (port (erc-scenarios--port)) + (dumb-server (erc-d-run "localhost" port + 'foonet 'barnet 'foonet-again)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (expect (erc-d-t-make-expecter)) + erc-server-buffer-foo erc-server-process-foo + erc-server-buffer-bar erc-server-process-bar) + + (should (memq 'autojoin erc-modules)) + + (ert-info ("Connect to foonet") + (setq erc-server-buffer-foo (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "foonet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-foo + (setq erc-server-process-foo erc-server-process) + (should (string= (buffer-name) (format "127.0.0.1:%d" port))) + (erc-d-t-wait-for 1 "foonet Network detected" + (string= (erc-network-name) "foonet")) + (funcall expect 5 "foonet"))) + + (ert-info ("Join #chan, then quit") + (with-current-buffer erc-server-buffer-foo + (erc-cmd-JOIN "#chan")) + (erc-d-t-wait-for 5 "Buffer #chan exists" + (get-buffer "#chan")) + (with-current-buffer "#chan" + (funcall expect 5 "vile thing") + (erc-cmd-QUIT ""))) + + (erc-d-t-wait-for 2 "foo death" + (not (process-live-p erc-server-process-foo))) + + (should (equal erc-autojoin-channels-alist '(("foonet.org" "#chan")))) + + (ert-info ("Connect to barnet") + (setq erc-server-buffer-bar (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "barnet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-bar + (setq erc-server-process-bar erc-server-process) + (should (string= (buffer-name) (format "127.0.0.1:%d" port))) + (erc-d-t-wait-for 5 "barnet Network detected" + (should-not (eq (process-status erc-server-process) 'failed)) + (eq erc-network 'barnet)))) + + (ert-info ("Server buffers are the same") + (should (eq erc-server-buffer-foo erc-server-buffer-bar)) + (should-not (cdr (erc-scenarios-common-buflist "127.0.0.1")))) + + (ert-info ("Only one #chan buffer exists") + (should (= 1 (length (erc-scenarios-common-buflist "#chan"))))) + + (ert-info ("#chan is auto-joined, output exclusive to barnet") + (with-current-buffer "#chan" + (funcall expect 2 "") + (erc-d-t-wait-for 3 "server-buffer is barnet" + (eq erc-server-process erc-server-process-bar)))) + + (ert-info ("Reconnect to foonet") + (setq erc-server-buffer-foo (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "foonet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-foo + (setq erc-server-process-foo erc-server-process) + (erc-d-t-wait-for 5 "foonet buffer renamed" + (string= (buffer-name) + (format "127.0.0.1:%d/127.0.0.1<2>" port))) + (erc-d-t-wait-for 2 "foonet Network detected" + (eq erc-network 'foonet)) + (funcall expect 5 "foonet"))) + + (ert-info ("#chan's server alternates as does its content") + (with-current-buffer "#chan" + (erc-scenarios-with-local-watcher procs 'erc-server-process + (erc-d-t-wait-for 3 "server buffer alternates" + (and (memq erc-server-process-foo procs) + (memq erc-server-process-bar procs)))) + (funcall expect 2 "") + (funcall expect 2 ""))) + + (ert-info ("All output received") + (with-current-buffer "#chan" + (while (accept-process-output erc-server-process-foo)) + (while (accept-process-output erc-server-process-bar)) + ;; Ordering here may not be predictable + (erc-d-t-search-for 1 "not given me") + (erc-d-t-search-for 1 "hath an uncle here"))) + + (erc-d-t-wait-for 5 "dumb-server death" + (not (eq (process-status dumb-server) 'run))))) + +(ert-deftest erc-scenarios-48598/clash-of-chans/bouncer-history () + (should erc-reuse-buffers) + + (erc-scenarios-common-with-cleanup + ((erc-d-u-with-cleanup-sleep-secs 1) + (erc-d-linger-secs 1) + (port (erc-scenarios--port)) + (dumb-server (erc-d-run "localhost" port 'foonet 'barnet)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (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") + (setq erc-server-buffer-foo (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "foonet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-foo + (setq erc-server-process-foo erc-server-process) + (should (string= (buffer-name) (format "127.0.0.1:%d" port))) + (funcall expect 5 "foonet"))) + + (ert-info ("Connect to barnet") + (setq erc-server-buffer-bar (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "barnet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-bar + (setq erc-server-process-bar erc-server-process) + ;; Prior to 88567ca8 "Fix ERC Reuse buffer behavior", this didn't + ;; feature an suffix + (erc-d-t-wait-for 5 "overshot n-suffixed redundant name" + (string= (buffer-name) (format "127.0.0.1:%d/127.0.0.1<2>" port))) + (funcall expect 5 "barnet"))) + + (ert-info ("Server buffers are unique") + (should-not (eq erc-server-buffer-foo erc-server-buffer-bar)) + (should (= 2 (length (erc-scenarios-common-buflist "127.0.0.1"))))) + + (ert-info ("Networks named correctly") + (with-current-buffer erc-server-buffer-foo + (erc-d-t-wait-for 3 "network name foonet" + (string= (erc-network-name) "foonet"))) + (with-current-buffer erc-server-buffer-bar + (erc-d-t-wait-for 3 "network name barnet" + (string= (erc-network-name) "barnet")))) + + (ert-info ("Only one #chan buffer exists") + (should (= 1 (length (erc-scenarios-common-buflist "#chan"))))) + + (ert-info ("#chan's server alternates as does its content") + (erc-scenarios-with-local-watcher procs 'erc-server-process + (with-current-buffer "#chan" + (erc-d-t-search-for 1 "") + (erc-d-t-search-for 1 "") + (erc-d-t-wait-for 3 "server buffer alternates" + (and (memq erc-server-process-foo procs) + (memq erc-server-process-bar procs)))))) + + (ert-info ("All output sent") + (with-current-buffer "#chan" + (while (accept-process-output erc-server-process-foo)) + (while (accept-process-output erc-server-process-bar)) + (erc-d-t-search-for 3 "please your lordship"))) + + (erc-d-t-wait-for 5 "dumb-server dies on its own" + (not (eq (process-status dumb-server) 'run))))) + +(ert-deftest erc-scenarios-48598/clash-of-chans/rename-buffers () + (should erc-reuse-buffers) + + (erc-scenarios-common-with-cleanup + ((erc-d-u-with-cleanup-sleep-secs 1) + (erc-server-flood-penalty 0.1) + (port (erc-scenarios--port)) + (dumb-server (erc-d-run "localhost" port 'foonet 'barnet)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (expect (erc-d-t-make-expecter)) + (erc-rename-buffers t) + erc-server-buffer-foo erc-server-process-foo + erc-server-buffer-bar erc-server-process-bar) + + (ert-info ("Connect to foonet, server briefly named nil") + (setq erc-server-buffer-foo (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "foonet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-foo + (setq erc-server-process-foo erc-server-process) + (should (string= (buffer-name) "nil")) + (erc-d-t-wait-for 3 "network name foonet" + (string= (erc-network-name) "foonet")) + (funcall expect 5 "foonet"))) + + (erc-d-t-wait-for 5 "Foonet's server buffer renamed" + (get-buffer "foonet")) + (should (eq erc-server-buffer-foo (get-buffer "foonet"))) + + (ert-info ("Join #chan@foonet") + (with-current-buffer erc-server-buffer-foo + (erc-cmd-JOIN "#chan")) + (erc-d-t-wait-for 5 "Buffer #chan created" + (get-buffer "#chan")) + (with-current-buffer "#chan" + (funcall expect 5 ""))) + + (ert-info ("Connect to barnet, server briefly named nil") + (setq erc-server-buffer-bar (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "barnet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-bar + (setq erc-server-process-bar erc-server-process) + (should (string= (buffer-name) "nil")) + (erc-d-t-wait-for 3 "network name barnet" + (string= (erc-network-name) "barnet")) + (funcall expect 5 "barnet"))) + + (erc-d-t-wait-for 5 "Barnet's server buffer renamed" + (get-buffer "barnet")) + (should (eq erc-server-buffer-bar (get-buffer "barnet"))) + + (ert-info ("Server buffers are unique, no buffer with old names") + (should-not (eq erc-server-buffer-foo erc-server-buffer-bar)) + (should-not (erc-scenarios-common-buflist "127.0.0.1"))) + + (ert-info ("Join #chan@barnet") + (with-current-buffer erc-server-buffer-bar + (erc-cmd-JOIN "#chan"))) + + (ert-info ("#chan's server alternates along with content") + (erc-scenarios-with-local-watcher procs 'erc-server-process + (with-current-buffer "#chan" + (erc-d-t-search-for 1 "") + (erc-d-t-search-for 1 "") + (erc-d-t-wait-for 3 "server buffer alternates" + (and (memq erc-server-process-foo procs) + (memq erc-server-process-bar procs)))))) + + (ert-info ("Only one #chan buffer exists") + (should (= 1 (length (erc-scenarios-common-buflist "#chan"))))) + + (ert-info ("All output sent") + (with-current-buffer "#chan" + (while (accept-process-output erc-server-process-foo)) + (while (accept-process-output erc-server-process-bar)) + (erc-d-t-search-for 1 "ape is dead") + (erc-d-t-search-for 1 "keeps you from dishonour"))) + + (erc-d-t-wait-for 5 "dumb-server death" + (not (eq (process-status dumb-server) 'run))))) + +;; This one is a temporary departure from the "assume defaults" rule +;; mentioned in the Commentary. (Which is bad.) +;; +;; TODO tag this as :unstable if ever adding to Emacs +;; TODO see if meaning is preserved when autojoin is ON (if so, adapt) + +(ert-deftest erc-scenarios-48598/clash-of-chans/uniquify-fail () + (should erc-reuse-buffers) + + (erc-scenarios-common-with-cleanup + ((erc-d-u-with-cleanup-sleep-secs 1) + (port (erc-scenarios--port)) + (dumb-server (erc-d-run "localhost" port 'foonet 'barnet)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (expect (erc-d-t-make-expecter)) + (erc-server-flood-penalty 0.1) ; hack + (erc-modules (remq 'autojoin erc-modules)) + erc-server-buffer-foo erc-server-process-foo + erc-server-buffer-bar erc-server-process-bar + erc-autojoin-channels-alist + erc-reuse-buffers) + + (when (bound-and-true-p erc-autojoin-mode) + (erc-autojoin-mode -1)) + + (ert-info ("Connect to foonet") + (setq erc-server-buffer-foo (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "foonet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-foo + (setq erc-server-process-foo erc-server-process) + ;; Compare suffixed name here to that in bouncer-history variant + ;; (which has `erc-reuse-buffers' set to the default value of t) + (should (string= (buffer-name) + (format "127.0.0.1:%d/127.0.0.1" port))) + (funcall expect 5 "foonet"))) + + (ert-info ("Connect to barnet") + (setq erc-server-buffer-bar (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "barnet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-bar + (setq erc-server-process-bar erc-server-process) + ;; Prior to 88567ca8 "Fix ERC Reuse buffer behavior", this didn't + ;; feature an suffix + (erc-d-t-wait-for 5 "overshot n-suffixed redundant name" + (string= (buffer-name) (format "127.0.0.1:%d/127.0.0.1<2>" port))) + (funcall expect 5 "barnet"))) + + (ert-info ("Server buffers are unique") + (should-not (eq erc-server-buffer-foo erc-server-buffer-bar)) + (should (= 2 (length (erc-scenarios-common-buflist "127.0.0.1"))))) + + (ert-info ("Networks named correctly") + (with-current-buffer erc-server-buffer-foo + (erc-d-t-wait-for 3 "network name foonet" + (string= (erc-network-name) "foonet"))) + (with-current-buffer erc-server-buffer-bar + (erc-d-t-wait-for 3 "network name barnet" + (string= (erc-network-name) "barnet")))) + + (ert-info ("Only one #chan buffer exists") + (let ((chan-bufs (erc-scenarios-common-buflist "#chan"))) + (should (string= (buffer-name (pop chan-bufs)) "#chan/127.0.0.1")) + (should-not chan-bufs))) + + ;; From here on diverges from "48598/clash-of-chans/bouncer-history" + + (ert-info ("#chan's server alternates along with its content") + (with-current-buffer "#chan/127.0.0.1" + (erc-scenarios-with-local-watcher procs 'erc-server-process + (erc-d-t-wait-for 3 "server buffer alternates" + (and (memq erc-server-process-foo procs) + (memq erc-server-process-bar procs)))) + ;; XXX this only works if the REPLY to this PART is received + ;; when foonet is dominant, which is out of our control. + (with-current-buffer erc-server-buffer-foo + (erc-cmd-PART "#chan")) + ;; Remaining foonet output is displayed but barnet is cut off + (erc-d-t-search-for 1 "shake my sword"))) + + (ert-info ("Somehow #chan@barnet is created") + (erc-d-t-wait-for 5 "#chan@barnet" + (get-buffer "#chan/127.0.0.1<2>")) + (with-current-buffer "#chan/127.0.0.1<2>" + (should (eq erc-server-process erc-server-process-bar)))) + + (ert-info ("Rejoin #chan@foonet") + (with-current-buffer "#chan/127.0.0.1" + (funcall expect 3 "You have left channel #chan") + (erc-cmd-JOIN "#chan") + (funcall expect 3 "You have joined channel #chan") + (funcall expect 3 "#chan was created on") + (funcall expect 3 "") + (should (eq erc-server-process erc-server-process-foo)) + (erc-d-t-search-for -0.2 "" (point)))) + + (ert-info ("Part chan@barnet") + (with-current-buffer "#chan/127.0.0.1<2>" + (let ((previous-end (point-max))) + (goto-char previous-end) + (should-not (search-forward "alice" nil t))) + (funcall expect 3 "Arm it in rags") + (erc-cmd-PART "#chan") + (funcall expect 3 "You have left channel #chan") + (erc-cmd-JOIN "#chan"))) + + (should (= 2 (length (erc-scenarios-common-buflist "#chan")))) + + (ert-info ("#chan output alternates as before") + (with-current-buffer "#chan/127.0.0.1" + (funcall expect 3 "You have joined channel #chan") + (funcall expect 1 "Users on #chan: @mike joe tester") + (funcall expect 5 "") ; bob appears after ^ + (ert-info ("All output sent") + (while (accept-process-output erc-server-process-bar)) + (funcall expect 10 "soul black")))) + + (while (accept-process-output erc-server-process-foo)) + + (erc-d-t-wait-for 5 "dumb-server dies on its own" + (not (eq (process-status dumb-server) 'run))))) + +;; This one also disables autojoin (see comment for "uniquify-fail") + +(ert-deftest erc-scenarios-48598/clash-of-chans/uniquify-litter () + (should erc-reuse-buffers) + + (erc-scenarios-common-with-cleanup + ((erc-d-u-with-cleanup-sleep-secs 1) + (expect (erc-d-t-make-expecter)) + (port (erc-scenarios--port)) + (dumb-server (erc-d-run "localhost" port 'foonet 'barnet)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (erc-server-flood-penalty 0.5) + (erc-modules (remq 'autojoin erc-modules)) + erc-reuse-buffers + erc-server-buffer-foo erc-server-process-foo + erc-server-buffer-bar erc-server-process-bar) + + (when (bound-and-true-p erc-autojoin-mode) + (erc-autojoin-mode -1)) + + (ert-info ("Connect to foonet, get uniquified buffer name") + (setq erc-server-buffer-foo (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "foonet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-foo + (setq erc-server-process-foo erc-server-process) + ;; Compare suffixed name here to that in bouncer-history variant + ;; (which has `erc-reuse-buffers' set to the default value of (t)) + (should (string= (buffer-name) + (format "127.0.0.1:%d/127.0.0.1" port))) + (erc-d-t-search-for 5 "foonet"))) + + (ert-info ("Connect to barnet, get uniquified buffer name") + (setq erc-server-buffer-bar (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "barnet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-bar + (setq erc-server-process-bar erc-server-process) + ;; Prior to 88567ca8 "Fix ERC Reuse buffer behavior", this didn't + ;; feature an suffix + (erc-d-t-wait-for 5 "overshot n-suffixed redundant name" + (string= (buffer-name) (format "127.0.0.1:%d/127.0.0.1<2>" port))) + (funcall expect 5 "barnet"))) + + (ert-info ("Server buffers are unique") + (should-not (eq erc-server-buffer-foo erc-server-buffer-bar)) + (should (= 2 (length (erc-scenarios-common-buflist "127.0.0.1"))))) + + (ert-info ("Networks named correctly") + (with-current-buffer erc-server-buffer-foo + (erc-d-t-wait-for 3 "network name foonet" + (string= (erc-network-name) "foonet"))) + (with-current-buffer erc-server-buffer-bar + (erc-d-t-wait-for 3 "network name barnet" + (string= (erc-network-name) "barnet")))) + + (ert-info ("Only one #chan buffer exists") + (let ((chan-bufs (erc-scenarios-common-buflist "#chan"))) + (should (string= (buffer-name (pop chan-bufs)) "#chan/127.0.0.1")) + (should-not chan-bufs))) + + ;; From here on diverts from other "clash-of-chans" + + (ert-info ("#chan's server alternates as does its content") + (with-current-buffer "#chan/127.0.0.1" + (erc-scenarios-with-local-watcher procs 'erc-server-process + (erc-d-t-wait-for 3 "server buffer alternates" + (and (memq erc-server-process-foo procs) + (memq erc-server-process-bar procs)))) + (with-current-buffer erc-server-buffer-foo + (erc-cmd-PART "#chan")) + (funcall expect 1 ""))) + + (ert-info ("Somehow #chan@barnet is created") + (erc-d-t-wait-for 4 "#chan@barnet" + (get-buffer "#chan/127.0.0.1<2>"))) + + (ert-info ("Part chan@barnet and rejoin") + (with-current-buffer "#chan/127.0.0.1<2>" + (should (eq erc-server-process erc-server-process-bar)) + (funcall expect 3 "Claudio as himself") + (let ((previous-end (point-max))) + (goto-char previous-end) + (should-not (search-forward "alice" nil t))) + (erc-cmd-PART "#chan") + (funcall expect 3 "You have left channel #chan") + (erc-cmd-JOIN "#chan"))) + + (ert-info ("New #chan@barnet is created") + (erc-d-t-wait-for 3 "#chan@barnet" + (get-buffer "#chan/127.0.0.1<3>")) + (with-current-buffer "#chan/127.0.0.1<3>" + (should (eq erc-server-process erc-server-process-bar)) + (funcall expect 3 "You have joined channel #chan"))) + + (ert-info ("Rejoin #chan@foonet") + (with-current-buffer "#chan/127.0.0.1" + (funcall expect 3 "You have left channel #chan") + (erc-cmd-JOIN "#chan") + (funcall expect 3 "You have joined channel #chan") + (funcall expect 3 "#chan was created on") + (let ((pos (funcall expect 3 ""))) + (should (eq erc-server-process erc-server-process-foo)) + (erc-d-t-wait-for -0.2 "exclusive to foonet" + (goto-char pos) + (search-forward "joe" nil t))))) + + (should (= 3 (length (erc-scenarios-common-buflist "#chan")))) + (should (= 2 (length (erc-scenarios-common-buflist "127.0.0.1")))) + + (while (accept-process-output erc-server-process-foo)) + (while (accept-process-output erc-server-process-bar)) + + (with-current-buffer "#chan/127.0.0.1" + (funcall expect 3 "Phebe's cruelty")) + + (with-current-buffer "#chan/127.0.0.1<3>" + (funcall expect 3 "world-without-end")) + + (erc-d-t-wait-for 5 "dumb-server dies on its own" + (not (eq (process-status dumb-server) 'run))))) + +(ert-deftest erc-scenarios-48598/rebuffed/foil-rename () + (erc-scenarios-common-with-cleanup + ((erc-d-linger-secs 0.5) + (port (erc-scenarios--port)) + ;; Again, like "gapless" above, barnet is loaded first because + ;; that's what ERC requests despite the invocation order + (dumb-server (erc-d-run "localhost" port 'barnet 'foonet)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (erc-rename-buffers t) + erc-autojoin-channels-alist + erc-server-buffer-foo + erc-server-buffer-bar) + + (ert-info ("Connect to foonet, buffer initially named nil") + (setq erc-server-buffer-foo (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "foonet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-foo + (should (string= (buffer-name) "nil")))) + + (ert-info ("Connect to barnet") + (setq erc-server-buffer-bar (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "barnet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-bar + (should (string= (buffer-name) (format "127.0.0.1:%d" port))))) + + (erc-d-t-wait-for 1 "server for foonet renamed" (get-buffer "foonet")) + (erc-d-t-wait-for 1 "server for barnet renamed" (get-buffer "barnet")) + + (ert-info ("Server buffers are unique and temp names are absent") + (should-not (eq erc-server-buffer-foo erc-server-buffer-bar)) + (should-not (erc-scenarios-common-buflist "127.0.0.1")) + (should-not (get-buffer "nil"))) + + (ert-info ("Channel buffers are both healthy") + (with-current-buffer "#foo" + (while (accept-process-output erc-server-process)) + (erc-d-t-search-for 1 "whence you are") + (delete-process erc-server-process)) + (with-current-buffer "#bar" + (while (accept-process-output erc-server-process)) + (erc-d-t-search-for 1 "his second fit") + (delete-process erc-server-process))) + + (erc-d-t-wait-for 5 "dumb-server dies naturally" + (not (process-live-p dumb-server))))) + +;; Note: when inspecting this one interactively, sometimes server buffers +;; appear as "nil" if the disconnect hook ran before the latest mode-line +;; update. + +(ert-deftest erc-scenarios-48598/rebuffed/gapless () + ;; This is stable with deterministic ordering before and just after + ;; 0c7a7433dce1b93a685396986d3a560c9cc291f1 + ;; Problem remains but would require fancier footwork to show (basically + ;; pattern matching and hot loading one of two dialogs) + :tags '(:unstable) + (ert-skip "obsolete") + (erc-scenarios-common-with-cleanup + ((erc-d-linger-secs 2) + (erc-server-flood-penalty erc-server-flood-penalty) + ;; Barnet is loaded first because that's what's requested first by + ;; the client, as shown below. + (dumb-server (erc-d-run "localhost" (erc-scenarios--port) + 'barnet 'foonet)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (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 + timeout-sentinel) + (ert-info ("Connect twice to same endpoint without pausing") + (setq erc-server-buffer-foo (erc :server "127.0.0.1" + :port erc-scenarios--port + :nick "tester" + :password "foonet:changeme" + :full-name "tester") + erc-server-buffer-bar (erc :server "127.0.0.1" + :port erc-scenarios--port + :nick "tester" + :password "barnet:changeme" + :full-name "tester"))) + + (ert-info ("Returned server buffers are identical") + (should (eq erc-server-buffer-foo erc-server-buffer-bar))) + + (ert-info ("Both connections actually happen") + (should (get-process "erc-d-server")) + (let ((name (format "erc-127.0.0.1-%d" erc-scenarios--port))) + (setq erc-server-process-foo (get-process name) + erc-server-process-bar (get-process (concat name "<1>"))))) + + (set-process-query-on-exit-flag erc-server-process-foo nil) + (set-process-query-on-exit-flag erc-server-process-bar nil) + + (with-current-buffer erc-server-buffer-bar + (funcall expect 1 "marked as being away")) + + (cl-letf (((symbol-function 'erc-d--expire) + (lambda (_ e) (push e timeout-sentinel)))) + + (erc-d-t-wait-for 20 "Buffer #bar exists" + (get-buffer "#bar")) + + (with-current-buffer erc-server-buffer-bar + ;; XXX a cheat to save some time. Verify by commenting out + ;; and bumping timeouts. Should still pass (after ~10 secs). + (ert-info ("Kludge to save some time") + (setq erc-server-flood-penalty 0) + (erc-server-send-queue erc-server-buffer-bar)) + + (erc-d-t-wait-for 5 "all messages actually sent" + (not erc-server-flood-queue))) + + (with-current-buffer "#bar" + (erc-d-t-search-for 5 "Unauthorized command") + (erc-d-t-search-for 5 "was created on")) + (erc-d-t-wait-for 2 "#foo dialog times out" timeout-sentinel) + + (let ((e (pop timeout-sentinel))) + (should-not timeout-sentinel) + (should (eq 'pass (erc-d-exchange-tag e))) + (should (string= "\\`PASS doa" (erc-d-exchange-pattern e))))) + + (while (accept-process-output erc-server-process-foo)) + (while (accept-process-output erc-server-process-bar)) + + (erc-d-t-wait-for 5 "dumb-server to die on its own" + (not (process-live-p dumb-server))))) + +(defun erc-scenarios-common--48598/rebuffed/reuseless () + (erc-scenarios-common-with-cleanup + ((erc-d-linger-secs 1) + (port (erc-scenarios--port)) + (dumb-server (erc-d-run "localhost" port 'foonet 'barnet)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + erc-autojoin-channels-alist + erc-server-buffer-foo + erc-server-buffer-bar) + + (ert-info ("Connect to foonet") + (setq erc-server-buffer-foo (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "foonet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-foo + (should (string= (buffer-name) + (if erc-reuse-buffers + (format "127.0.0.1:%d" port) + (format "127.0.0.1:%d/127.0.0.1" port)))) + (erc-d-t-search-for 1 "marked as being away"))) + + (ert-info ("Connect to barnet") + (setq erc-server-buffer-bar (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "barnet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-bar + (should (string= (buffer-name) + (if erc-reuse-buffers + (format "127.0.0.1:%d/127.0.0.1<2>" port) + (format "127.0.0.1:%d/127.0.0.1" port)))) + (erc-d-t-search-for 1 "marked as being away"))) + + (ert-info ("Server buffers are unique with option, identical without") + (if erc-reuse-buffers + (should-not (eq erc-server-buffer-foo erc-server-buffer-bar)) + (should (eq erc-server-buffer-foo erc-server-buffer-bar)))) + + (ert-info ("When the option is disabled, only one buffer survives") + (should (= (length (erc-scenarios-common-buflist "127.0.0.1")) + (if erc-reuse-buffers 2 1)))) + + ;; Sometimes we get an EOF, but it's rare + (erc-d-t-wait-for 5 "Let dumb server die on its own" + (not (process-live-p dumb-server))))) + +(ert-deftest erc-scenarios-48598/rebuffed/reuseless--enabled () + (should erc-reuse-buffers) + (let ((erc-scenarios--dialog-name "48598/rebuffed/reuseless")) + (erc-scenarios-common--48598/rebuffed/reuseless))) + +(ert-deftest erc-scenarios-48598/rebuffed/reuseless--disabled () + (should erc-reuse-buffers) + (let ((erc-scenarios--dialog-name "48598/rebuffed/reuseless") + erc-reuse-buffers) + (erc-scenarios-common--48598/rebuffed/reuseless))) + +;;; erc-scenarios-48598.el ends here diff --git a/test/lisp/erc/erc-scenarios-resources/47522/ambiguous-join/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/47522/ambiguous-join/barnet.lispdata new file mode 100644 index 0000000000..c570457ebf --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/47522/ambiguous-join/barnet.lispdata @@ -0,0 +1,23 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") + (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.barnet.org 003 tester :This server was created Wed, 05 May 2021 00:51:49 UTC") + (0 ":irc.barnet.org 004 tester irc.barnet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.barnet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.barnet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=barnet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.barnet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.barnet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.barnet.org 252 tester 0 :IRC Operators online") + (0 ":irc.barnet.org 253 tester 0 :unregistered connections") + (0 ":irc.barnet.org 254 tester 1 :channels formed") + (0 ":irc.barnet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.barnet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.barnet.org 422 tester :MOTD File is missing") + (0 ":irc.barnet.org 221 tester +i") + (0 ":irc.barnet.org NOTICE tester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) + +((linger 2 LINGER)) diff --git a/test/lisp/erc/erc-scenarios-resources/47522/ambiguous-join/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/47522/ambiguous-join/foonet.lispdata new file mode 100644 index 0000000000..140ea34541 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/47522/ambiguous-join/foonet.lispdata @@ -0,0 +1,42 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Tue, 04 May 2021 05:06:18 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 253 tester 0 :unregistered connections") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.foonet.org 422 tester :MOTD File is missing") + (0 ":irc.foonet.org 221 tester +i") + (0 ":irc.foonet.org NOTICE tester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) + +((join 1 "JOIN #chan") + (0 ":tester!~u@9hbxjx335qjjq.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :@bob alice tester") + (0 ":irc.foonet.org 366 tester #chan :End of NAMES list")) + +((mode 2 "MODE #chan") + (0 ":irc.foonet.org 324 tester #chan +nt") + (0 ":irc.foonet.org 329 tester #chan 1620175913") + (0.1 ":bob!~u@24ebq8ma57rha.irc PRIVMSG #chan :tester, welcome!") + (0.1 ":alice!~u@24ebq8ma57rha.irc PRIVMSG #chan :tester, welcome!") + (0.1 ":bob!~u@24ebq8ma57rha.irc PRIVMSG #chan :alice: Ha! now I see thou art a fool, and fit for thy master.") + (0.1 ":alice!~u@24ebq8ma57rha.irc PRIVMSG #chan :bob: Answer as I call you. Nick Bottom, the weaver.") + (0.1 ":bob!~u@24ebq8ma57rha.irc PRIVMSG #chan :alice: Have lost a brace of kinsmen: all are punish'd.") + (0.1 ":alice!~u@24ebq8ma57rha.irc PRIVMSG #chan :bob: Truly, thou art damned like an ill-roasted egg, all on one side.") + (0.1 ":bob!~u@24ebq8ma57rha.irc PRIVMSG #chan :alice: Thou wouldst else have made thy tale large.") + (0.1 ":alice!~u@24ebq8ma57rha.irc PRIVMSG #chan :bob: And even for that do I love you the more.") + (0.1 ":bob!~u@24ebq8ma57rha.irc PRIVMSG #chan :alice: And let my spleenful sons this trull deflower.") + (0.1 ":alice!~u@24ebq8ma57rha.irc PRIVMSG #chan :bob: Truly, and to cast away honesty upon a foul slut were to put good meat into an unclean dish.") + (0.1 ":bob!~u@24ebq8ma57rha.irc PRIVMSG #chan :alice: Come, let's away; the strangers are all gone.") + (0.1 ":alice!~u@24ebq8ma57rha.irc PRIVMSG #chan :bob: You shall find of the king a husband, madam; you, sir, a father. He that so generally is at all times good, must of necessity hold his virtue to you, whose worthiness would stir it up where it wanted rather than lack it where there is such abundance.")) diff --git a/test/lisp/erc/erc-scenarios-resources/47522/foil-in-server-buf/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/47522/foil-in-server-buf/barnet.lispdata new file mode 100644 index 0000000000..99329a3acc --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/47522/foil-in-server-buf/barnet.lispdata @@ -0,0 +1,40 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") + (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.barnet.org 003 tester :This server was created Tue, 04 May 2021 05:06:19 UTC") + (0 ":irc.barnet.org 004 tester irc.barnet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.barnet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.barnet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=barnet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.barnet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.barnet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.barnet.org 252 tester 0 :IRC Operators online") + (0 ":irc.barnet.org 253 tester 0 :unregistered connections") + (0 ":irc.barnet.org 254 tester 1 :channels formed") + (0 ":irc.barnet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.barnet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.barnet.org 422 tester :MOTD File is missing") + (0 ":irc.barnet.org 221 tester +i") + (0 ":irc.barnet.org NOTICE tester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) + +((join 2 "JOIN #chan") + (0 ":tester!~u@jnu48g2wrycbw.irc JOIN #chan") + (0 ":irc.barnet.org 353 tester = #chan :@mike joe tester") + (0 ":irc.barnet.org 366 tester #chan :End of NAMES list")) + +((mode 2 "MODE #chan") + (0 ":irc.barnet.org 324 tester #chan +nt") + (0 ":irc.barnet.org 329 tester #chan 1620104779") + (0.1 ":mike!~u@kd7gmjbnbkn8c.irc PRIVMSG #chan :tester, welcome!") + (0.1 ":joe!~u@kd7gmjbnbkn8c.irc PRIVMSG #chan :tester, welcome!") + (0.1 ":mike!~u@kd7gmjbnbkn8c.irc PRIVMSG #chan :joe: Whipp'd first, sir, and hang'd after.") + (0.1 ":joe!~u@kd7gmjbnbkn8c.irc PRIVMSG #chan :mike: We have yet many among us can gripe as hard as Cassibelan; I do not say I am one, but I have a hand. Why tribute ? why should we pay tribute ? If C sar can hide the sun from us with a blanket, or put the moon in his pocket, we will pay him tribute for light; else, sir, no more tribute, pray you now.") + (0.1 ":mike!~u@kd7gmjbnbkn8c.irc PRIVMSG #chan :joe: Double and treble admonition, and still forfeit in the same kind ? This would make mercy swear, and play the tyrant.") + (0.1 ":joe!~u@kd7gmjbnbkn8c.irc PRIVMSG #chan :mike: And secretly to greet the empress' friends.") + (0.1 ":mike!~u@kd7gmjbnbkn8c.irc PRIVMSG #chan :joe: You have not been inquired after: I have sat here all day.") + (0.1 ":joe!~u@kd7gmjbnbkn8c.irc PRIVMSG #chan :mike: That same Berowne I'll torture ere I go.") + (0.1 ":mike!~u@kd7gmjbnbkn8c.irc PRIVMSG #chan :joe: For mine own part,no offence to the general, nor any man of quality,I hope to be saved.") + (0.1 ":joe!~u@kd7gmjbnbkn8c.irc PRIVMSG #chan :mike: Mehercle! if their sons be ingenuous, they shall want no instruction; if their daughters be capable, I will put it to them. But, vir sapit qui pauca loquitur. A soul feminine saluteth us.")) diff --git a/test/lisp/erc/erc-scenarios-resources/47522/foil-in-server-buf/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/47522/foil-in-server-buf/foonet.lispdata new file mode 100644 index 0000000000..67fbe205c4 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/47522/foil-in-server-buf/foonet.lispdata @@ -0,0 +1,43 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Tue, 04 May 2021 05:06:18 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 253 tester 0 :unregistered connections") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.foonet.org 422 tester :MOTD File is missing") + (0 ":irc.foonet.org 221 tester +i") + (0 ":irc.foonet.org NOTICE tester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) + +((join 2 "JOIN #chan") + (0 ":tester!~u@9g6b728983yd2.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :alice tester @bob") + (0 ":irc.foonet.org 366 tester #chan :End of NAMES list")) + +((mode 2 "MODE #chan") + (0 ":irc.foonet.org 324 tester #chan +nt") + (0 ":irc.foonet.org 329 tester #chan 1620104779") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :tester, welcome!") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :tester, welcome!") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :alice: But, as it seems, did violence on herself.") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :bob: Well, this is the forest of Arden.") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :alice: Signior Iachimo will not from it. Pray, let us follow 'em.") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :bob: Our queen and all her elves come here anon.") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :alice: The ground is bloody; search about the churchyard.") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :bob: You have discharged this honestly: keep it to yourself. Many likelihoods informed me of this before, which hung so tottering in the balance that I could neither believe nor misdoubt. Pray you, leave me: stall this in your bosom; and I thank you for your honest care. I will speak with you further anon.") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :alice: Give me that mattock, and the wrenching iron.") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :bob: Stand you! You have land enough of your own; but he added to your having, gave you some ground.") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :alice: Excellent workman! Thou canst not paint a man so bad as is thyself.") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :bob: And will you, being a man of your breeding, be married under a bush, like a beggar ? Get you to church, and have a good priest that can tell you what marriage is: this fellow will but join you together as they join wainscot; then one of you will prove a shrunk panel, and like green timber, warp, warp.") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :alice: Live, and be prosperous; and farewell, good fellow.")) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/barnet.lispdata new file mode 100644 index 0000000000..c5b18cea3f --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/barnet.lispdata @@ -0,0 +1,40 @@ +;; -*- mode: lisp-data; -*- +((pass 2 "PASS :barnet:changeme")) +((nick 2 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") + (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.barnet.org 003 tester :This server was created Mon, 10 May 2021 00:58:22 UTC") + (0 ":irc.barnet.org 004 tester irc.barnet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.barnet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.barnet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=barnet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.barnet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.barnet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.barnet.org 252 tester 0 :IRC Operators online") + (0 ":irc.barnet.org 254 tester 1 :channels formed") + (0 ":irc.barnet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.barnet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.barnet.org 422 tester :MOTD File is missing")) + +((join 2 "JOIN #chan") + (0 ":tester!~u@6yximxrnkg65a.irc JOIN #chan") + (0 ":irc.barnet.org 353 tester = #chan :@joe mike tester") + (0 ":irc.barnet.org 366 tester #chan :End of NAMES list") + (0.1 ":joe!~u@6yximxrnkg65a.irc PRIVMSG #chan :tester, welcome!") + (0 ":mike!~u@6yximxrnkg65a.irc PRIVMSG #chan :tester, welcome!")) + +((mode 1 "MODE #chan") + (0 ":irc.barnet.org 324 tester #chan +nt") + (0 ":irc.barnet.org 329 tester #chan 1620608304") + ;; Wait for foonet's buffer playback + (0.1 ":mike!~u@6yximxrnkg65a.irc PRIVMSG #chan :joe: Go take her hence, and marry her instantly.") + (0.1 ":joe!~u@6yximxrnkg65a.irc PRIVMSG #chan :mike: Of all the four, or the three, or the two, or one of the four.") + (0.1 ":mike!~u@6yximxrnkg65a.irc PRIVMSG #chan :joe: And gives the crutch the cradle's infancy.") + (0.1 ":joe!~u@6yximxrnkg65a.irc PRIVMSG #chan :mike: Such is the simplicity of man to hearken after the flesh.") + (0.05 ":mike!~u@6yximxrnkg65a.irc PRIVMSG #chan :joe: The leaf to read them. Let us toward the king.") + (0.05 ":joe!~u@6yximxrnkg65a.irc PRIVMSG #chan :mike: Many can brook the weather that love not the wind.") + (0.05 ":mike!~u@6yximxrnkg65a.irc PRIVMSG #chan :joe: And now, dear maid, be you as free to us.") + (0.00 ":joe!~u@6yximxrnkg65a.irc PRIVMSG #chan :mike: He hath an uncle here in Messina will be very much glad of it.")) + +((linger 3.5 LINGER)) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/foonet-again.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/foonet-again.lispdata new file mode 100644 index 0000000000..1d62150762 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/foonet-again.lispdata @@ -0,0 +1,39 @@ +;; -*- mode: lisp-data; -*- +((pass-redux 10 "PASS :foonet:changeme")) +((nick-redux 1 "NICK tester")) + +((user-redux 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Mon, 10 May 2021 00:58:22 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.foonet.org 422 tester :MOTD File is missing") + ;; History + (0 ":tester!~u@q6ddatxcq6txy.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :@alice bob tester") + (0 ":irc.foonet.org 366 tester #chan :End of /NAMES list.") + (0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") + (0 ":bob!~u@q6ddatxcq6txy.irc PRIVMSG #chan :[02:43:23] alice: And soar with them above a common bound.") + (0 ":alice!~u@q6ddatxcq6txy.irc PRIVMSG #chan :[02:43:27] bob: And be aveng'd on cursed Tamora.") + (0 ":bob!~u@q6ddatxcq6txy.irc PRIVMSG #chan :[02:43:29] alice: He did love her, sir, as a gentleman loves a woman.") + (0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.")) + +((mode-redux 1 "MODE #chan") + (0 ":irc.foonet.org 324 tester #chan +nt") + (0 ":irc.foonet.org 329 tester #chan 1620608304") + (0.1 ":alice!~u@q6ddatxcq6txy.irc PRIVMSG #chan :bob: Ay, madam, with the swiftest wing of speed.") + (0.1 ":bob!~u@q6ddatxcq6txy.irc PRIVMSG #chan :alice: Five times in that ere once in our five wits.") + (0.1 ":alice!~u@q6ddatxcq6txy.irc PRIVMSG #chan :bob: And bid him come to take his last farewell.") + (0.1 ":bob!~u@q6ddatxcq6txy.irc PRIVMSG #chan :alice: But we are spirits of another sort.") + (0.1 ":alice!~u@q6ddatxcq6txy.irc PRIVMSG #chan :bob: It was not given me, nor I did not buy it.")) + +((linger 6 LINGER)) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/foonet.lispdata new file mode 100644 index 0000000000..b20b1e72ec --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/foonet.lispdata @@ -0,0 +1,36 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :foonet:changeme")) +((nick 1 "NICK tester")) + +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Mon, 10 May 2021 00:58:22 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((join 1 "JOIN #chan") + (0 ":tester!~u@q6ddatxcq6txy.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :@alice bob tester") + (0 ":irc.foonet.org 366 tester #chan :End of NAMES list") + (0.1 ":bob!~u@q6ddatxcq6txy.irc PRIVMSG #chan :tester, welcome!") + (0 ":alice!~u@q6ddatxcq6txy.irc PRIVMSG #chan :tester, welcome!")) + +((mode 1 "MODE #chan") + (0 ":irc.foonet.org 324 tester #chan +nt") + (0 ":irc.foonet.org 329 tester #chan 1620608304") + (0.1 ":bob!~u@q6ddatxcq6txy.irc PRIVMSG #chan :alice: Pray you, sir, deliver me this paper.") + (0.1 ":alice!~u@q6ddatxcq6txy.irc PRIVMSG #chan :bob: Wake when some vile thing is near.")) + +((quit 1 "QUIT :\2ERC\2")) + +((drop 0 DROP)) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/bouncer-history/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/bouncer-history/barnet.lispdata new file mode 100644 index 0000000000..cba56e6ccf --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/bouncer-history/barnet.lispdata @@ -0,0 +1,41 @@ +;; -*- mode: lisp-data; -*- +((pass 2 "PASS :barnet:changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") + (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.barnet.org 003 tester :This server was created Wed, 28 Apr 2021 06:59:59 UTC") + (0 ":irc.barnet.org 004 tester irc.barnet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.barnet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.barnet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=barnet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.barnet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.barnet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.barnet.org 252 tester 0 :IRC Operators online") + (0 ":irc.barnet.org 254 tester 1 :channels formed") + (0 ":irc.barnet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.barnet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.barnet.org 422 tester :MOTD File is missing") + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":tester!~u@xrir8fpe4d7ak.irc JOIN #chan") + (0 ":irc.barnet.org 353 tester = #chan :joe @mike tester") + (0 ":irc.barnet.org 366 tester #chan :End of /NAMES list.") + (0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") + (0 ":joe!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :[07:04:25] mike: Belike, for joy the emperor hath a son.") + (0 ":mike!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :[07:04:27] joe: Protest their first of manhood.") + (0 ":joe!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :[07:04:29] mike: As frozen water to a starved snake.") + (0 ":mike!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :[07:04:34] joe: My mirth it much displeas'd, but pleas'd my woe.") + (0 ":joe!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :[07:04:38] mike: Why, Marcus, no man should be mad but I.") + (0 ":mike!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :[07:04:44] joe: Faith, I have heard too much, for your words and performances are no kin together.") + (0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.") + (0 ":irc.barnet.org NOTICE tester :[07:00:01] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":irc.barnet.org 305 tester :You are no longer marked as being away")) + +((mode 3 "MODE #chan") + (0 ":irc.barnet.org 324 tester #chan +nt") + (0 ":irc.barnet.org 329 tester #chan 1619593200") + (0.25 ":joe!~u@svpn88yjcdj42.irc PRIVMSG #chan :mike: But, in defence, by mercy, 'tis most just.") + (0.25 ":mike!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :joe: The Marshal of France, Monsieur la Far.") + (0.25 ":joe!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :mike: And bide the penance of each three years' day.") + (0.25 ":mike!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :joe: Madam, within; but never man so chang'd.") + (0.25 ":joe!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :mike: As much in private, and I'll bid adieu.")) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/bouncer-history/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/bouncer-history/foonet.lispdata new file mode 100644 index 0000000000..6af26038d9 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/bouncer-history/foonet.lispdata @@ -0,0 +1,45 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :foonet:changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Wed, 28 Apr 2021 07:00:00 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.foonet.org 422 tester :MOTD File is missing") + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":tester!~u@nvfhxvqm92rm6.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :alice @bob tester") + (0 ":irc.foonet.org 366 tester #chan :End of /NAMES list.") + (0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") + (0 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #chan :[07:04:02] alice: Here come the lovers, full of joy and mirth.") + (0 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #chan :[07:04:07] bob: According to the fool's bolt, sir, and such dulcet diseases.") + (0 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #chan :[07:04:10] alice: And hang himself. I pray you, do my greeting.") + (0 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #chan :[07:04:18] bob: And you sat smiling at his cruel prey.") + (0 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #chan :[07:04:21] alice: Or never after look me in the face.") + (0 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #chan :[07:04:25] bob: If that may be, than all is well. Come, sit down, every mother's son, and rehearse your parts. Pyramus, you begin: when you have spoken your speech, enter into that brake; and so every one according to his cue.") + (0 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #chan :[07:04:30] alice: Where I espied the panther fast asleep.") + (0 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #chan :[07:04:32] bob: Alas! he is too young: yet he looks successfully.") + (0 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #chan :[07:04:37] alice: Here, at your lordship's service.") + (0 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #chan :[07:04:42] bob: By my troth, and in good earnest, and so God mend me, and by all pretty oaths that are not dangerous, if you break one jot of your promise or come one minute behind your hour, I will think you the most pathetical break-promise, and the most hollow lover, and the most unworthy of her you call Rosalind, that may be chosen out of the gross band of the unfaithful. Therefore, beware my censure, and keep your promise.") + (0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.") + (0 ":irc.foonet.org NOTICE tester :[07:00:32] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":irc.foonet.org 305 tester :You are no longer marked as being away")) + +((mode 3 "MODE #chan") + (0 ":irc.foonet.org 324 tester #chan +nt") + (0 ":irc.foonet.org 329 tester #chan 1619593200") + (0.9 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #chan :bob: Grows, lives, and dies, in single blessedness.") + (0.25 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #chan :alice: For these two hours, Rosalind, I will leave thee.") + (0.25 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #chan :bob: By this hand, it will not kill a fly. But come, now I will be your Rosalind in a more coming-on disposition; and ask me what you will, I will grant it.") + (0.25 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #chan :alice: That I must love a loathed enemy.") + (0.25 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #chan :bob: As't please your lordship: I'll leave you.")) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/rename-buffers/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/rename-buffers/barnet.lispdata new file mode 100644 index 0000000000..4c2e9f209b --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/rename-buffers/barnet.lispdata @@ -0,0 +1,38 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :barnet:changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") + (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.barnet.org 003 tester :This server was created Wed, 12 May 2021 07:41:08 UTC") + (0 ":irc.barnet.org 004 tester irc.barnet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.barnet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.barnet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=barnet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.barnet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.barnet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.barnet.org 252 tester 0 :IRC Operators online") + (0 ":irc.barnet.org 254 tester 1 :channels formed") + (0 ":irc.barnet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.barnet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.barnet.org 422 tester :MOTD File is missing") + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":irc.barnet.org 305 tester :You are no longer marked as being away")) + +((join 1 "JOIN #chan") + (0 ":tester!~u@awyxgybtkx7uq.irc JOIN #chan") + (0 ":irc.barnet.org 353 tester = #chan :@joe mike tester") + (0 ":irc.barnet.org 366 tester #chan :End of NAMES list") + (0.1 ":joe!~u@awyxgybtkx7uq.irc PRIVMSG #chan :tester, welcome!") + (0 ":mike!~u@awyxgybtkx7uq.irc PRIVMSG #chan :tester, welcome!")) + +((mode 1 "MODE #chan") + (0 ":irc.barnet.org 324 tester #chan +nt") + (0 ":irc.barnet.org 329 tester #chan 1620805269") + (0.1 ":mike!~u@awyxgybtkx7uq.irc PRIVMSG #chan :joe: But you have outfaced them all.") + (0.1 ":joe!~u@awyxgybtkx7uq.irc PRIVMSG #chan :mike: Why, will shall break it; will, and nothing else.") + (0.1 ":mike!~u@awyxgybtkx7uq.irc PRIVMSG #chan :joe: Yes, a dozen; and as many to the vantage, as would store the world they played for.") + (0.05 ":joe!~u@awyxgybtkx7uq.irc PRIVMSG #chan :mike: As he regards his aged father's life.") + (0.05 ":mike!~u@awyxgybtkx7uq.irc PRIVMSG #chan :joe: It is a rupture that you may easily heal; and the cure of it not only saves your brother, but keeps you from dishonour in doing it.")) + +((linger 1 LINGER)) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/rename-buffers/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/rename-buffers/foonet.lispdata new file mode 100644 index 0000000000..b4fcd1985a --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/rename-buffers/foonet.lispdata @@ -0,0 +1,43 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :foonet:changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Wed, 12 May 2021 07:41:09 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.foonet.org 422 tester :MOTD File is missing") + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":irc.foonet.org 305 tester :You are no longer marked as being away")) + +((join 1 "JOIN #chan") + (0 ":tester!~u@ertp7idh9jtgi.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :@alice bob tester") + (0 ":irc.foonet.org 366 tester #chan :End of NAMES list") + (0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :tester, welcome!") + (0 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :tester, welcome!")) + +((mode 1 "MODE #chan") + (0 ":irc.foonet.org 324 tester #chan +nt") + (0 ":irc.foonet.org 329 tester #chan 1620805271") + (0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :bob: He cannot be heard of. Out of doubt he is transported.") + (0.1 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :alice: More evident than this; for this was stol'n.") + (0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :bob: Sell when you can; you are not for all markets.") + (0.1 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :alice: There's the fool hangs on your back already.") + (0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :bob: Why, if you have a stomach to't, monsieur, if you think your mystery in stratagem can bring this instrument of honour again into its native quarter, be magnanimous in the enterprise and go on; I will grace the attempt for a worthy exploit: if you speed well in it, the duke shall both speak of it, and extend to you what further becomes his greatness, even to the utmost syllable of your worthiness.") + (0.1 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :alice: For he hath still been tried a holy man.") + (0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :bob: To have the touches dearest priz'd.") + (0.1 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :alice: And must advise the emperor for his good.") + (0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :bob: Orlando, my liege; the youngest son of Sir Rowland de Boys.") + (0.1 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :alice: The ape is dead, and I must conjure him.")) + +((linger 1 LINGER)) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-fail/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-fail/barnet.lispdata new file mode 100644 index 0000000000..d6555d3fc4 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-fail/barnet.lispdata @@ -0,0 +1,63 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :barnet:changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") + (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.barnet.org 003 tester :This server was created Wed, 05 May 2021 09:05:33 UTC") + (0 ":irc.barnet.org 004 tester irc.barnet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.barnet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.barnet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=barnet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.barnet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.barnet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.barnet.org 252 tester 0 :IRC Operators online") + (0 ":irc.barnet.org 254 tester 1 :channels formed") + (0 ":irc.barnet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.barnet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.barnet.org 422 tester :MOTD File is missing") + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":tester!~u@wvys46tx8tpmk.irc JOIN #chan") + (0 ":irc.barnet.org 353 tester = #chan :joe @mike tester") + (0 ":irc.barnet.org 366 tester #chan :End of /NAMES list.") + (0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") + (0 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:16] joe: Tush! none but minstrels like of sonneting.") + (0 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:19] mike: Prithee, nuncle, be contented; 'tis a naughty night to swim in. Now a little fire in a wide field were like an old lecher's heart; a small spark, all the rest on's body cold. Look! here comes a walking fire.") + (0 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:22] joe: My name is Edgar, and thy father's son.") + (0 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:26] mike: Good my lord, be good to me; your honour is accounted a merciful man; good my lord.") + (0 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:31] joe: Thy child shall live, and I will see it nourish'd.") + (0 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:33] mike: Quick, quick; fear nothing; I'll be at thy elbow.") + (0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.") + (0 ":irc.barnet.org NOTICE tester :[09:05:35] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":irc.barnet.org 305 tester :You are no longer marked as being away")) + +((mode 1 "MODE #chan") + (0 ":irc.barnet.org 324 tester #chan +nt") + (0 ":irc.barnet.org 329 tester #chan 1620205534") + (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: That will be given to the loudest noise we make.") + (0.1 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: If it please your honour, I am the poor duke's constable, and my name is Elbow: I do lean upon justice, sir; and do bring in here before your good honour two notorious benefactors.") + (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: Following the signs, woo'd but the sign of she.") + (0.5 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: That, sir, which I will not report after her.") + (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: Boyet, prepare: I will away to-night.") + (0.1 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: If the man be a bachelor, sir, I can; but if he be a married man, he is his wife's head, and I can never cut off a woman's head.") + (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: Thyself upon thy virtues, they on thee.") + (0.1 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: Arm it in rags, a pigmy's straw doth pierce it.")) + +((part 5.1 "PART #chan :\2ERC\2") + (0 ":tester!~u@wvys46tx8tpmk.irc PART #chan :\2ERC\2 (IRC client for Emacs " emacs-version ")")) + +((join 10.1 "JOIN #chan") + (0 ":tester!~u@wvys46tx8tpmk.irc JOIN #chan") + (0 ":irc.barnet.org 353 tester = #chan :@mike joe tester") + (0 ":irc.barnet.org 366 tester #chan :End of NAMES list") + (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :tester, welcome!") + (0 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :tester, welcome!")) + +((mode 1 "MODE #chan") + (0 ":irc.barnet.org 324 tester #chan +nt") + (0 ":irc.barnet.org 329 tester #chan 1620205534") + (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: Chi non te vede, non te pretia.") + (0.1 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: Well, if ever thou dost fall from this faith, thou wilt prove a notable argument.") + (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: Of heavenly oaths, vow'd with integrity.") + (0.1 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: These herblets shall, which we upon you strew.") + (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: Aaron will have his soul black like his face.")) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-fail/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-fail/foonet.lispdata new file mode 100644 index 0000000000..84daf7aec7 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-fail/foonet.lispdata @@ -0,0 +1,63 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :foonet:changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Wed, 05 May 2021 09:05:34 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.foonet.org 422 tester :MOTD File is missing") + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":tester!~u@247eaxkrufj44.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :alice @bob tester") + (0 ":irc.foonet.org 366 tester #chan :End of /NAMES list.") + (0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") + (0 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :[09:07:19] bob: Is this; she hath bought the name of whore thus dearly.") + (0 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :[09:07:24] alice: He sent to me, sir,Here he comes.") + (0 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :[09:07:26] bob: Till I torment thee for this injury.") + (0 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :[09:07:29] alice: There's an Italian come; and 'tis thought, one of Leonatus' friends.") + (0 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :[09:09:33] bob: Ay, and the particular confirmations, point from point, to the full arming of the verity.") + (0 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :[09:09:35] alice: Kneel in the streets and beg for grace in vain.") + (0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.") + (0 ":irc.foonet.org NOTICE tester :[09:06:05] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":irc.foonet.org 305 tester :You are no longer marked as being away")) + +((mode 1 "MODE #chan") + (0 ":irc.foonet.org 324 tester #chan +nt") + (0 ":irc.foonet.org 329 tester #chan 1620205534") + (0.5 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :alice: Nor I no strength to climb without thy help.") + (0.1 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :bob: Nothing, but let him have thanks. Demand of him my condition, and what credit I have with the duke.") + (0.1 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :alice: Show me this piece. I am joyful of your sights.") + (0.2 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :bob: Whilst I can shake my sword or hear the drum.")) + +((part 5 "PART #chan :\2ERC\2") + (0 ":tester!~u@247eaxkrufj44.irc PART #chan :\2ERC\2 (IRC client for Emacs " emacs-version ")")) + +((join 10 "JOIN #chan") + (0 ":tester!~u@247eaxkrufj44.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :@bob alice tester") + (0 ":irc.foonet.org 366 tester #chan :End of NAMES list") + (0.1 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :tester, welcome!") + (0 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :tester, welcome!")) + +((mode 1 "MODE #chan") + (0 ":irc.foonet.org 324 tester #chan +nt") + (0 ":irc.foonet.org 329 tester #chan 1620205534") + (0.8 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :alice: Thou desirest me to stop in my tale against the hair.") + (0.1 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :bob: And dar'st not stand, nor look me in the face.") + (0.1 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :alice: It should not be, by the persuasion of his new feasting.") + (0.1 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :bob: It was not given me, nor I did not buy it.") + (0.1 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :alice: He that would vouch it in any place but here.") + (0.1 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :bob: In everything I wait upon his will.") + (0.1 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :alice: Thou counterfeit'st most lively.")) + +((linger 1 LINGER)) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-litter/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-litter/barnet.lispdata new file mode 100644 index 0000000000..2b821bf8f0 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-litter/barnet.lispdata @@ -0,0 +1,66 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :barnet:changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") + (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.barnet.org 003 tester :This server was created Thu, 06 May 2021 02:02:40 UTC") + (0 ":irc.barnet.org 004 tester irc.barnet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.barnet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.barnet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=barnet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.barnet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.barnet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.barnet.org 252 tester 0 :IRC Operators online") + (0 ":irc.barnet.org 254 tester 1 :channels formed") + (0 ":irc.barnet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.barnet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.barnet.org 422 tester :MOTD File is missing") + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":tester!~u@43inc6hukdiwg.irc JOIN #chan") + (0 ":irc.barnet.org 353 tester = #chan :@joe mike tester") + (0 ":irc.barnet.org 366 tester #chan :End of /NAMES list.") + (0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") + (0 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :[02:06:20] joe: Marry, it is your brother's right hand.") + (0 ":joe!~u@43inc6hukdiwg.irc PRIVMSG #chan :[02:06:23] mike: If it be prov'd! you see it is apparent.") + (0 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :[02:06:28] joe: Than would make up his message.") + (0 ":joe!~u@43inc6hukdiwg.irc PRIVMSG #chan :[02:06:59] mike: And almost broke my heart with extreme laughter.") + (0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.") + (0 ":irc.barnet.org NOTICE tester :[02:02:43] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":irc.barnet.org 305 tester :You are no longer marked as being away")) + +((mode 1.2 "MODE #chan") + (0 ":irc.barnet.org 324 tester #chan +nt") + (0 ":irc.barnet.org 329 tester #chan 1620266561") + (0.2 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :joe: Why, by making him uncapable of Othello's place; knocking out his brains.") + ;; This stuff shows up in the automatically created uniquified buffer + (0.5 ":joe!~u@43inc6hukdiwg.irc PRIVMSG #chan :mike: Berowne did swear himself out of all suit.") + (0.1 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :joe: Go to, go to: no matter for the dish, sir.") + (0.1 ":joe!~u@43inc6hukdiwg.irc PRIVMSG #chan :mike: We will have, if this fadge not, an antick. I beseech you, follow.") + (0.1 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :joe: As like almost to Claudio as himself.")) + +((part 4.2 "PART #chan :\2ERC\2") + (0 ":tester!~u@43inc6hukdiwg.irc PART #chan :\2ERC\2")) + +((join 5.2 "JOIN #chan") + (0 ":tester!~u@43inc6hukdiwg.irc JOIN #chan") + (0 ":irc.barnet.org 353 tester = #chan :@joe mike tester") + (0 ":irc.barnet.org 366 tester #chan :End of NAMES list") + (0.1 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :tester, welcome!") + (0 ":joe!~u@43inc6hukdiwg.irc PRIVMSG #chan :tester, welcome!")) + +((mode-b 1.2 "MODE #chan") + (0 ":irc.barnet.org 324 tester #chan +nt") + (0 ":irc.barnet.org 329 tester #chan 1620266561") + (0.1 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :joe: To wake and wage a danger profitless.") + (0.1 ":joe!~u@43inc6hukdiwg.irc PRIVMSG #chan :mike: And beauty's crest becomes the heavens well.") + (0.1 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :joe: Call up my brother. O! that you had had her.") + (0.1 ":joe!~u@43inc6hukdiwg.irc PRIVMSG #chan :mike: Most honourably doth uphold his word.") + (0.1 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :joe: But that he's well, and will be shortly here.") + (0.1 ":joe!~u@43inc6hukdiwg.irc PRIVMSG #chan :mike: Samson, master: he was a man of good carriage, great carriage, for he carried the towngates on his back like a porter; and he was in love.") + (0.1 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :joe: And yet seem cold, the time you may so hoodwink.") + (0.1 ":joe!~u@43inc6hukdiwg.irc PRIVMSG #chan :mike: To teach a teacher ill beseemeth me.") + (0.1 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :joe: If you swear, my lord, you shall not be forsworn.") + (0.1 ":joe!~u@43inc6hukdiwg.irc PRIVMSG #chan :mike: To make a world-without-end bargain in.")) + +((linger 1 LINGER)) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-litter/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-litter/foonet.lispdata new file mode 100644 index 0000000000..44175d2a9c --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-litter/foonet.lispdata @@ -0,0 +1,56 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :foonet:changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Thu, 06 May 2021 02:02:40 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.foonet.org 422 tester :MOTD File is missing") + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":tester!~u@megraseia93w4.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :@alice bob tester") + (0 ":irc.foonet.org 366 tester #chan :End of /NAMES list.") + (0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") + (0 ":bob!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :[02:06:42] alice: Romeo slew Tybalt, Romeo must not live.") + (0 ":alice!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :[02:06:47] bob: Signior Martino and his wife and daughters; County Anselme and his beauteous sisters; the lady widow of Vitruvio; Signior Placentio, and his lovely nieces; Mercutio and his brother Valentine; mine uncle Capulet, his wife and daughters; my fair niece Rosaline; Livia; Signior Valentio and his cousin Tybalt; Lucio and the lively Helena.") + (0 ":bob!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :[02:06:51] alice: Of nothing so much as that I am not like Timon.") + (0 ":alice!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :[02:06:55] bob: Something browner than Judas's; marry, his kisses are Judas's own children.") + (0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.") + (0 ":irc.foonet.org NOTICE tester :[02:03:13] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":irc.foonet.org 305 tester :You are no longer marked as being away")) + +((mode 1 "MODE #chan") + (0 ":irc.foonet.org 324 tester #chan +nt") + (0 ":irc.foonet.org 329 tester #chan 1620266561") + (0.5 ":bob!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :alice: His looks I fear, and his intents I doubt.") + (0.3 ":alice!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :bob: But never hope to know why I should marry her.")) + +((part 2.1 "PART #chan") + (0 ":tester!~u@megraseia93w4.irc PART #chan")) + +((join 5.1 "JOIN #chan") + (0 ":tester!~u@megraseia93w4.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :@alice bob tester") + (0 ":irc.foonet.org 366 tester #chan :End of NAMES list") + (0.1 ":alice!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :tester, welcome!") + (0 ":bob!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :tester, welcome!")) + +((mode-b 1 "MODE #chan") + (0 ":irc.foonet.org 324 tester #chan +nt") + (0 ":irc.foonet.org 329 tester #chan 1620266561") + (0.1 ":bob!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :alice: Indeed, I should have asked you that before.") + (0.1 ":alice!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :bob: Her eye is sick on't: I observe her now.") + (0.1 ":bob!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :alice: For no name fits thy nature but thy own.") + (0.1 ":alice!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :bob: Yet heard too much of Phebe's cruelty.")) + +((linger 1 LINGER)) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/foil-rename/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/foil-rename/barnet.lispdata new file mode 100644 index 0000000000..5652d322fc --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/foil-rename/barnet.lispdata @@ -0,0 +1,51 @@ +;; -*- mode: lisp-data; -*- +((pass 10 "PASS :barnet:changeme")) +((nick 0.2 "NICK tester")) +((user 0.2 "USER user 0 * :tester") + (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") + (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.5.1-4860c5cad0179db1") + (0 ":irc.barnet.org 003 tester :This server was created Fri, 19 Mar 2021 10:23:19 UTC") + (0 ":irc.barnet.org 004 tester irc.barnet.org oragono-2.5.1-4860c5cad0179db1 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.barnet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m INVEX KICKLEN=390 MAXLIST=beI:60 :are supported by this server") + (0 ":irc.barnet.org 005 tester MAXTARGETS=4 MODES MONITOR=100 NETWORK=barnet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.barnet.org 251 tester :There are 0 users and 1 invisible on 1 server(s)") + (0 ":irc.barnet.org 252 tester 0 :IRC Operators online") + (0 ":irc.barnet.org 254 tester 0 :channels formed") + (0 ":irc.barnet.org 255 tester :I have 1 clients and 0 servers") + (0 ":irc.barnet.org 265 tester 1 1 :Current local users 1, max 1") + (0 ":irc.barnet.org 266 tester 1 1 :Current global users 1, max 1") + (0 ":irc.barnet.org 422 tester :MOTD File is missing") + (0 ":irc.znc.in 306 tester :You have been marked as being away") + + (0 ":tester!~u@8cgjyczyrjgby.irc JOIN #bar") + (0 ":irc.barnet.org 353 tester = #bar :@mike joe tester") + (0 ":irc.barnet.org 366 tester #bar :End of /NAMES list.") + + (0 ":***!znc@znc.in PRIVMSG #bar :Buffer Playback...") + (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:23:28] tester, welcome!") + (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:23:28] tester, welcome!") + (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:04] mike: Marry, sir, by my wife; who, if she had been a woman cardinally given, might have been accused in fornication, adultery, and all uncleanliness there.") + (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:07] joe: Look, how you butt yourself in these sharp mocks.") + (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:10] mike: Who ? not the duke ? yes, your beggar of fifty, and his use was to put a ducat in her clack-dish; the duke had crotchets in him. He would be drunk too; that let me inform you.") + (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:15] joe: Look you what I have from the loving king.") + (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:19] mike: Sir, I know him, and I love him.") + (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:22] joe: Dictynna, goodman Dull: Dictynna, goodman Dull.") + (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:24] mike: Varlet, thou liest: thou liest, wicked varlet. The time is yet to come that she was ever respected with man, woman, or child.") + (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:28] joe: Nothing but peace and gentle visitation.") + (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:31] mike: What he hath lost noble Macbeth hath won.") + (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:34] joe: Patience, dear niece. Good Titus, dry thine eyes.") + (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:39] mike: And hear the sentence of your moved prince.") + (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:44] joe: To be whipped; and yet a better love than my master.") + (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:49] mike: Bid me farewell, and let me hear thee going.") + (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:54] joe: By heaven, thy love is black as ebony.") + (0 ":***!znc@znc.in PRIVMSG #bar :Playback Complete.") + + (0 ":irc.barnet.org NOTICE tester :[10:23:22] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":irc.barnet.org 305 tester :You are no longer marked as being away")) + +((mode 10 "MODE #bar") + (0 ":irc.barnet.org 324 tester #bar +nt") + (0 ":irc.barnet.org 329 tester #bar 1616149403") + (0.1 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :mike: Friar, thou knowest not the duke so well as I do: he's a better woodman than thou takest him for.") + (0.1 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :joe: Like the sequel, I. Signior Costard, adieu.") + (0.1 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :mike: This is his second fit; he had one yesterday.")) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/foil-rename/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/foil-rename/foonet.lispdata new file mode 100644 index 0000000000..cb77503244 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/foil-rename/foonet.lispdata @@ -0,0 +1,48 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :foonet:changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Sun, 25 Apr 2021 11:28:28 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.foonet.org 422 tester :MOTD File is missing") + (0 ":irc.znc.in 306 tester :You have been marked as being away") + + (0 ":tester!~u@8cgjyczyrjgby.irc JOIN #foo") + (0 ":irc.foonet.org 353 tester = #foo :@bob alice tester") + (0 ":irc.foonet.org 366 tester #foo :End of /NAMES list.") + + (0 ":***!znc@znc.in PRIVMSG #foo :Buffer Playback...") + (0 ":alice!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:28] tester, welcome!") + (0 ":bob!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:28] tester, welcome!") + (0 ":bob!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:29] alice: Pardon, sir; error: he is not quantity enough for that Worthy's thumb: he is not so big as the end of his club.") + (0 ":alice!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:34] bob: Go, fetch him hither: let me look upon him.") + (0 ":bob!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:37] alice: Over-roasted rather; ready long ago.") + (0 ":alice!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:39] bob: Sir, there is especial commission come from Venice to depute Cassio in Othello's place.") + (0 ":bob!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:41] alice: In any proportion or in any language.") + (0 ":alice!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:46] bob: Come, bring them away: if these be good people in a common-weal that do nothing but use their abuses in common houses, I know no law: bring them away.") + (0 ":bob!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:51] alice: Wish'd himself the heaven's breath.") + (0 ":alice!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:53] bob: My general will forget my love and service.") + (0 ":bob!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:55] alice: Madam, all joy befall your Grace.") + (0 ":alice!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:58] bob: To be suspected; framed to make women false.") + (0 ":bob!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:24:00] alice: Ay, of my pigeons, sir; nothing else.") + (0 ":***!znc@znc.in PRIVMSG #foo :Playback Complete.") + + (0 ":irc.foonet.org NOTICE tester :[11:29:00] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":irc.foonet.org 305 tester :You are no longer marked as being away")) + +((mode 10 "MODE #foo") + (0 ":irc.foonet.org 324 tester #foo +nt") + (0 ":irc.foonet.org 329 tester #foo 1616149403") + (0.1 ":alice!~u@8cgjyczyrjgby.irc PRIVMSG #foo :bob: To old Free-town, our common judgment-place.") + (0.1 ":bob!~u@8cgjyczyrjgby.irc PRIVMSG #foo :alice: To ask of whence you are: report it.")) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/gapless/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/gapless/barnet.lispdata new file mode 100644 index 0000000000..dcf630902e --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/gapless/barnet.lispdata @@ -0,0 +1,49 @@ +;; -*- mode: lisp-data; -*- +((pass 10 "PASS :barnet:changeme")) +((nick 0.2 "NICK tester")) + +((user 0.2 "USER user 0 * :tester") + (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") + (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.5.1-4860c5cad0179db1") + (0 ":irc.barnet.org 003 tester :This server was created Fri, 19 Mar 2021 10:23:19 UTC") + (0 ":irc.barnet.org 004 tester irc.barnet.org oragono-2.5.1-4860c5cad0179db1 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.barnet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m INVEX KICKLEN=390 MAXLIST=beI:60 :are supported by this server") + (0 ":irc.barnet.org 005 tester MAXTARGETS=4 MODES MONITOR=100 NETWORK=barnet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.barnet.org 251 tester :There are 0 users and 1 invisible on 1 server(s)") + (0 ":irc.barnet.org 252 tester 0 :IRC Operators online") + (0 ":irc.barnet.org 254 tester 0 :channels formed") + (0 ":irc.barnet.org 255 tester :I have 1 clients and 0 servers") + (0 ":irc.barnet.org 265 tester 1 1 :Current local users 1, max 1") + (0 ":irc.barnet.org 266 tester 1 1 :Current global users 1, max 1") + (0 ":irc.barnet.org 422 tester :MOTD File is missing") + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":tester!~u@8cgjyczyrjgby.irc JOIN #bar") + (0 ":irc.barnet.org 353 tester = #bar :@mike joe tester") + (0 ":irc.barnet.org 366 tester #bar :End of /NAMES list.") + (0 ":***!znc@znc.in PRIVMSG #bar :Buffer Playback...") + (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:23:28] tester, welcome!") + (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:23:28] tester, welcome!") + (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:23:29] joe: Pardon, sir; error: he is not quantity enough for that Worthy's thumb: he is not so big as the end of his club.") + (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:31] mike: What he hath lost noble Macbeth hath won.") + (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:44] joe: To be whipped; and yet a better love than my master.") + (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:49] mike: Bid me farewell, and let me hear thee going.") + (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:54] joe: By heaven, thy love is black as ebony.") + (0 ":***!znc@znc.in PRIVMSG #bar :Playback Complete.") + (0 ":irc.barnet.org NOTICE tester :[10:23:22] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":irc.barnet.org 305 tester :You are no longer marked as being away")) + +((~pass-extra 10 "PASS barnet:changeme") + (0 ":irc.barnet.org 462 tester :You may not reregister")) + +((~nick-extra 5 "NICK tester")) + +((~user-extra 10 "USER user 0 * :tester") + (0 ":irc.barnet.org 462 tester :You may not reregister")) + +((mode 20 "MODE #bar") + (0 ":irc.barnet.org 324 tester #bar +nt") + (0 ":irc.barnet.org 329 tester #bar 1616149403") + (0.1 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :joe: To ask of whence you are: report it.") + (0.1 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :mike: Friar, thou knowest not the duke so well as I do: he's a better woodman than thou takest him for.") + (0.1 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :joe: Like the sequel, I. Signior Costard, adieu.") + (0.1 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :mike: This is his second fit; he had one yesterday.")) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/gapless/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/gapless/foonet.lispdata new file mode 100644 index 0000000000..67234e26bc --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/gapless/foonet.lispdata @@ -0,0 +1,5 @@ +;;; -*- mode: lisp-data -*- + +((pass 2.0 "PASS doa")) +((nick 0.2 "NICK tester")) +((user 0.2 "USER user 0 * :I never run!")) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/reuseless/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/reuseless/barnet.lispdata new file mode 100644 index 0000000000..1e30e9e0b2 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/reuseless/barnet.lispdata @@ -0,0 +1,24 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :barnet:changeme")) +((nick 1 "NICK tester")) + +((~user 2 "USER user 0 * :tester") + (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") + (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.barnet.org 003 tester :This server was created Sun, 25 Apr 2021 11:28:28 UTC") + (0 ":irc.barnet.org 004 tester irc.barnet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.barnet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.barnet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=barnet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.barnet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.barnet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.barnet.org 252 tester 0 :IRC Operators online") + (0 ":irc.barnet.org 254 tester 1 :channels formed") + (0 ":irc.barnet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.barnet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.barnet.org 422 tester :MOTD File is missing") + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":irc.barnet.org NOTICE tester :[11:29:00] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":irc.barnet.org 305 tester :You are no longer marked as being away")) + +((~eof 2 EOF)) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/reuseless/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/reuseless/foonet.lispdata new file mode 100644 index 0000000000..7952fb1d6e --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/reuseless/foonet.lispdata @@ -0,0 +1,21 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :foonet:changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Sun, 25 Apr 2021 11:28:28 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.foonet.org 422 tester :MOTD File is missing") + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":irc.foonet.org NOTICE tester :[11:29:00] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":irc.foonet.org 305 tester :You are no longer marked as being away")) diff --git a/test/lisp/erc/erc-scenarios.el b/test/lisp/erc/erc-scenarios.el new file mode 100644 index 0000000000..19d4a33fdd --- /dev/null +++ b/test/lisp/erc/erc-scenarios.el @@ -0,0 +1,4 @@ +;;; erc-scenarios.el --- e2e test cases for ERC -*- lexical-binding: t -*- +;;; Commentary: +;;; Code: +;;; erc-scenarios.el ends here -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0012-Update-ERC-scenarios-with-session-centric-naming.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Wed, 19 May 2021 06:06:58 -0700 Subject: [PATCH 12/28] Update ERC scenarios with session-centric naming * test/lisp/erc/erc-scenarios.el: Update scenario-based tests to assert collision-resistant buffer-naming behavior favoring declared session IDs and advertised network names. Update test data in test/lisp/erc/erc-scenarios-resources to reflect these changes. See bug#48598 for background. * test/lisp/erc/erc-scenarios-common.el: Add new file with helpers for scenario-based tests. This is currently only used in-tree by erc-scenarios.el, but it's needed by at least one other bug's WIP patch set and will presumably be shared among other erc-scenario-*.el files in the future. --- test/lisp/erc/erc-scenarios-48598.el | 988 ---------- test/lisp/erc/erc-scenarios-common.el | 151 ++ .../47522/ambiguous-join/barnet.lispdata | 23 - .../autojoin/foonet-again.lispdata | 39 - .../clash-of-chans/autojoin/foonet.lispdata | 36 - .../uniquify-fail/barnet.lispdata | 63 - .../uniquify-fail/foonet.lispdata | 63 - .../uniquify-litter/barnet.lispdata | 66 - .../uniquify-litter/foonet.lispdata | 56 - .../rebuffed/foil-rename/barnet.lispdata | 51 - .../48598/rebuffed/gapless/foonet.lispdata | 5 - .../aborted-reconnect/foonet-dupe.lispdata | 28 + .../base/aborted-reconnect/foonet.lispdata | 45 + .../bouncer-history/barnet.lispdata | 7 +- .../bouncer-history/foonet.lispdata | 7 +- .../association/multi-net}/barnet.lispdata | 4 +- .../association/multi-net}/foonet.lispdata | 4 +- .../nick-bump/renicked-again.lispdata | 30 + .../association/nick-bump/renicked.lispdata | 30 + .../reconnect-playback/foonet-again.lispdata | 42 + .../reconnect-playback/foonet.lispdata | 52 + .../association/same-network/chester.lispdata | 40 + .../same-network/tester-again.lispdata | 37 + .../association/same-network/tester.lispdata | 42 + .../channel-buffer-revival/foonet.lispdata | 45 + .../gapless-connect}/barnet.lispdata | 19 +- .../gapless-connect}/foonet.lispdata | 39 +- .../base/gapless-connect/pass-stub.lispdata | 4 + .../legacy-autojoin}/foonet.lispdata | 34 +- .../base/reconnect-timer/foonet-last.lispdata | 5 + .../base/reconnect-timer/foonet.lispdata | 6 + .../renick/queries/bouncer-barnet.lispdata | 54 + .../renick/queries/bouncer-foonet.lispdata | 52 + .../base/renick/queries/solo.lispdata | 55 + .../base/renick/self/auto.lispdata | 46 + .../base/renick/self/manual.lispdata | 50 + .../base/renick/self/qual-chester.lispdata | 40 + .../base/renick/self/qual-tester.lispdata | 46 + .../server-buffers}/barnet.lispdata | 10 +- .../server-buffers}/foonet.lispdata | 5 +- .../session-id/bouncer/barnet-again.lispdata | 50 + .../session-id/bouncer/barnet-drop.lispdata} | 37 +- .../session-id/bouncer}/barnet.lispdata | 5 +- .../session-id/bouncer/foonet-again.lispdata | 50 + .../session-id/bouncer/foonet-drop.lispdata | 46 + .../session-id/bouncer}/foonet.lispdata | 5 +- .../session-id/bouncer/stub-again.lispdata | 4 + .../session-id/same-network/chester.lispdata | 48 + .../session-id/same-network/tester.lispdata | 52 + .../announced-missing/foonet.lispdata | 8 + .../services/password/libera.lispdata | 49 + test/lisp/erc/erc-scenarios.el | 1677 ++++++++++++++++- 52 files changed, 2971 insertions(+), 1479 deletions(-) delete mode 100644 test/lisp/erc/erc-scenarios-48598.el create mode 100644 test/lisp/erc/erc-scenarios-common.el delete mode 100644 test/lisp/erc/erc-scenarios-resources/47522/ambiguous-join/barnet.lispdata delete mode 100644 test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/foonet-again.lispdata delete mode 100644 test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/foonet.lispdata delete mode 100644 test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-fail/barnet.lispdata delete mode 100644 test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-fail/foonet.lispdata delete mode 100644 test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-litter/barnet.lispdata delete mode 100644 test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-litter/foonet.lispdata delete mode 100644 test/lisp/erc/erc-scenarios-resources/48598/rebuffed/foil-rename/barnet.lispdata delete mode 100644 test/lisp/erc/erc-scenarios-resources/48598/rebuffed/gapless/foonet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/aborted-reconnect/foonet-dupe.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/aborted-reconnect/foonet.lispdata rename test/lisp/erc/erc-scenarios-resources/{48598/clash-of-chans => base/association}/bouncer-history/barnet.lispdata (96%) rename test/lisp/erc/erc-scenarios-resources/{48598/clash-of-chans => base/association}/bouncer-history/foonet.lispdata (97%) rename test/lisp/erc/erc-scenarios-resources/{47522/foil-in-server-buf => base/association/multi-net}/barnet.lispdata (97%) rename test/lisp/erc/erc-scenarios-resources/{47522/foil-in-server-buf => base/association/multi-net}/foonet.lispdata (97%) create mode 100644 test/lisp/erc/erc-scenarios-resources/base/association/nick-bump/renicked-again.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/association/nick-bump/renicked.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/association/reconnect-playback/foonet-again.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/association/reconnect-playback/foonet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/association/same-network/chester.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/association/same-network/tester-again.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/association/same-network/tester.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/channel-buffer-revival/foonet.lispdata rename test/lisp/erc/erc-scenarios-resources/{48598/rebuffed/gapless => base/gapless-connect}/barnet.lispdata (80%) rename test/lisp/erc/erc-scenarios-resources/{48598/rebuffed/foil-rename => base/gapless-connect}/foonet.lispdata (51%) create mode 100644 test/lisp/erc/erc-scenarios-resources/base/gapless-connect/pass-stub.lispdata rename test/lisp/erc/erc-scenarios-resources/{47522/ambiguous-join => base/legacy-autojoin}/foonet.lispdata (51%) create mode 100644 test/lisp/erc/erc-scenarios-resources/base/reconnect-timer/foonet-last.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/reconnect-timer/foonet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/renick/queries/bouncer-barnet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/renick/queries/bouncer-foonet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/renick/queries/solo.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/renick/self/auto.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/renick/self/manual.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/renick/self/qual-chester.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/renick/self/qual-tester.lispdata rename test/lisp/erc/erc-scenarios-resources/{48598/rebuffed/reuseless => base/reuse-buffers/server-buffers}/barnet.lispdata (92%) rename test/lisp/erc/erc-scenarios-resources/{48598/rebuffed/reuseless => base/reuse-buffers/server-buffers}/foonet.lispdata (94%) create mode 100644 test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/barnet-again.lispdata rename test/lisp/erc/erc-scenarios-resources/{48598/clash-of-chans/autojoin/barnet.lispdata => base/session-id/bouncer/barnet-drop.lispdata} (55%) rename test/lisp/erc/erc-scenarios-resources/{48598/clash-of-chans/rename-buffers => base/session-id/bouncer}/barnet.lispdata (96%) create mode 100644 test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/foonet-again.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/foonet-drop.lispdata rename test/lisp/erc/erc-scenarios-resources/{48598/clash-of-chans/rename-buffers => base/session-id/bouncer}/foonet.lispdata (96%) create mode 100644 test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/stub-again.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/session-id/same-network/chester.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/session-id/same-network/tester.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/networks/announced-missing/foonet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/services/password/libera.lispdata diff --git a/test/lisp/erc/erc-scenarios-48598.el b/test/lisp/erc/erc-scenarios-48598.el deleted file mode 100644 index 7876b08e45..0000000000 --- a/test/lisp/erc/erc-scenarios-48598.el +++ /dev/null @@ -1,988 +0,0 @@ -;;; erc-scenarios-48598.el --- e2e test cases for ERC -*- lexical-binding: t -*- - -;; Copyright (C) 2021 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 -;; . - -;;; Commentary: -;; -;; These are meant to demo unwanted behavior described in bug#48598. -;; To allow for incrementally addressing those issues, they have been -;; written to *pass* when run from a historical snapshot of the tree -;; built with libraries and tools that existed at or in the months -;; leading up to 0c7a7433dce1b93a685396986d3a560c9cc291f1. See next -;; commit for updated scenarios and layout adapted for long-term use -;; with an eye toward maintenance and refactoring. -;; -;; Because 595e506c82 "Set +i by default" constitutes a breaking -;; change and these test are meant to verify pre-0c7a7433d behavior, -;; the option `erc-user-mode' has been artificially overridden to -;; restore its original default value of nil. - -;;; Code: -(require 'ert-x) ; cl-lib - -(eval-and-compile - (when-let ((dir (getenv "EMACS_TEST_DIRECTORY"))) - (cl-pushnew (concat dir "/lisp/erc/erc-d") load-path :test #'equal))) -(require 'erc-d) -(require 'erc-d-t) -(require 'erc-backend) - -(declare-function erc-network-name "erc-networks") -(defvar erc-autojoin-channels-alist) -(defvar erc-network) - -(defvar erc-scenarios-resources-dir - (let ((ert-resource-directory-trim-right-regexp "\\(-48598\\)?\\.el")) - (ert-resource-directory))) - -(when (boundp 'process-prioritize-lower-fds) - (setq process-prioritize-lower-fds t)) - -;; When interactive, teardown is already inhibited, which precludes -;; subsequent tests. So might as well treat inspection as the goal. -(unless noninteractive - (setq erc-server-auto-reconnect nil)) - -(defvar erc-scenarios--dialog-name nil) - -(defvar erc-scenarios--extra-teardown nil) - -(defun erc-scenarios-common-buflist (prefix) - "Return list of buffers with names sharing PREFIX." - (let (case-fold-search) - (delq nil (mapcar (lambda (b) - (when (string-prefix-p prefix (buffer-name b)) b)) - (buffer-list))))) - -(defmacro erc-scenarios-common-with-cleanup (bindings &rest body) - "Provide boilerplate cleanup tasks after calling BODY with BINDINGS. -Set `erc-scenarios-resources-dir' for the current ERT test. If a -process exists with the default dumb-server name, wait for it to start -before running BODY. If `erc-autojoin-mode' mode is bound, restore it -during cleanup if negated by BODY. Other defaults common to these test -cases are added below and can be overridden, except when wanting the -\"real\" default value, which must be looked up or captured outside of -this form." - (declare (indent 1)) - (let* ((orig-autojoin-mode (make-symbol "orig-autojoin-mode")) - (get-name `(expand-file-name - (or erc-scenarios--dialog-name - (substring (symbol-name - (ert-test-name (ert-running-test))) - ,(length "erc-scenarios-"))) - erc-scenarios-resources-dir)) - (defaults `((erc-d-u-canned-dialog-dir ,get-name) - (erc-user-mode nil) - (erc-modules (copy-sequence erc-modules)) - (,orig-autojoin-mode (bound-and-true-p erc-autojoin-mode)) - (erc-autojoin-channels-alist nil) - (erc-server-auto-reconnect nil)))) - `(erc-d-t-with-cleanup (,@defaults ,@bindings) - (ert-info ("Restore autojoin kill ERC buffers") - (when erc-scenarios--extra-teardown - (ert-info ("Running extra teardown") - (funcall erc-scenarios--extra-teardown))) - (when (and (boundp 'erc-autojoin-mode) - (not (eq erc-autojoin-mode ,orig-autojoin-mode))) - (erc-autojoin-mode (if ,orig-autojoin-mode +1 -1))) - (when noninteractive - (when (and (boundp 'trace-buffer) (get-buffer trace-buffer)) - (with-current-buffer trace-buffer - (message "%S" (buffer-string)) - (kill-buffer))) - (erc-d-t-kill-related-buffers))) - (ert-info ("Wait for dumb server") - (dolist (buf (buffer-list)) - (with-current-buffer buf - (when erc-d-u--process-buffer - (erc-d-t-search-for 3 "Starting"))))) - (ert-info ("Activate erc-debug-irc-protocol") - (unless (and noninteractive (not erc-debug-irc-protocol)) - (erc-toggle-debug-irc-protocol))) - ,@body))) - -(defvar erc-scenarios--port 16667) - -(defun erc-scenarios--port() - "Set next port without checking if it's open." - (cl-incf erc-scenarios--port)) - -(defmacro erc-scenarios-with-local-watcher (found-sym target-var &rest body) - "Run BODY with mutations to TARGET-VAR recorded in FOUND-SYM." - (declare (indent 2)) - (let ((func (make-symbol "func"))) - `(let* (,found-sym - (,func (lambda (_s v op w) - (when (and (eq op 'set) - w ; buffer when buffer-local else nil - v) - (push v ,found-sym))))) - (should-not (get-variable-watchers ,target-var)) - (add-variable-watcher ,target-var ,func) - ,@body - (remove-variable-watcher ,target-var ,func) - (should-not (get-variable-watchers ,target-var))))) - -;; This test lineup should match ERT's - -(ert-deftest erc-scenarios-47522/ambiguous-join () - "Recast non-bug #47522 for regression defense." - (erc-scenarios-common-with-cleanup - ((erc-server-flood-penalty 0.1) ; see below - (dumb-server-foonet-buffer (get-buffer-create "*server-foonet*")) - (dumb-server-barnet-buffer (get-buffer-create "*server-barnet*")) - (dumb-server-foonet-port (erc-scenarios--port)) - (dumb-server-barnet-port (erc-scenarios--port)) - ;; Hmm, should maybe add name as formal param to `erc-d-run' - (dumb-server-foonet (erc-d-run "localhost" dumb-server-foonet-port - "server-foonet" 'foonet)) - (dumb-server-barnet (erc-d-run "localhost" dumb-server-barnet-port - "server-barnet" 'barnet)) - (expect (erc-d-t-make-expecter)) - erc-server-buffer-foo - erc-server-buffer-bar) - - (ert-info ("Connect to foonet") - (setq erc-server-buffer-foo (erc :server "127.0.0.1" - :port dumb-server-foonet-port - :nick "tester" - :password "changeme" - :full-name "tester")) - (with-current-buffer erc-server-buffer-foo - (funcall expect 3 "debug mode") - (erc-cmd-JOIN "#chan"))) - - (erc-d-t-wait-for 2 "Buffer #chan@foonet exists" - (get-buffer "#chan")) - - (ert-info ("Connect to barnet") - (setq erc-server-buffer-bar (erc :server "127.0.0.1" - :port dumb-server-barnet-port - :nick "tester" - :password "changeme" - :full-name "tester")) - (with-current-buffer erc-server-buffer-bar - (funcall expect 1 "debug mode"))) - - ;; If either of these two went through, we'd get a bad match on - ;; exchange "linger" (right?) - (ert-info ("Buffers don't exist") - (with-current-buffer erc-server-buffer-foo - (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 "Buffer #chan@foonet not replaced" - (get-buffer "#chan")) - (erc-d-t-wait-for 1 "Buffer #chan@barnet does not exist" - (= 1 (length (erc-scenarios-common-buflist "#chan")))) - ;; Still respects chine2e wall because subproc would dump same - ;; to stdout - (with-current-buffer dumb-server-barnet-buffer - (goto-char (point-min)) - (should-not (search-forward "JOIN" nil t)))) - - (ert-info ("All #chan@foonet output consumed") - (with-current-buffer "#chan" ; <- First chan joined (foonet) - (funcall expect 3 "welcome!") - (while (accept-process-output erc-server-process)) - (funcall expect 3 "husband"))))) - -(ert-deftest erc-scenarios-47522/foil-in-server-buf () - "Different spin on non-bug #47522 for regression defense." - (erc-scenarios-common-with-cleanup - ((erc-d-linger-secs 0.5) - (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-port (erc-scenarios--port)) - (dumb-server-barnet-port (erc-scenarios--port)) - (dumb-server-foonet (erc-d-run "localhost" dumb-server-foonet-port - "server-foonet" 'foonet)) - (dumb-server-barnet (erc-d-run "localhost" dumb-server-barnet-port - "server-barnet" 'barnet)) - (expect (erc-d-t-make-expecter)) - erc-server-buffer-foo - erc-server-buffer-bar) - - (ert-info ("Connect to foonet") - (setq erc-server-buffer-foo (erc :server "127.0.0.1" - :port dumb-server-foonet-port - :nick "tester" - :password "changeme" - :full-name "tester"))) - - (with-current-buffer erc-server-buffer-foo - (funcall expect 3 "debug mode") - (erc-cmd-JOIN "#chan")) - - (erc-d-t-wait-for 2 "Buffer #chan@foonet exists" - (get-buffer "#chan")) - - (ert-info ("Connect to barnet") - (setq erc-server-buffer-bar (erc :server "127.0.0.1" - :port dumb-server-barnet-port - :nick "tester" - :password "changeme" - :full-name "tester"))) - - (with-current-buffer erc-server-buffer-bar - (funcall expect 1 "debug mode") - (erc-cmd-JOIN "#chan")) - - (erc-d-t-wait-for 3 "Buffer #chan@barnet exists" - (get-buffer "#chan/127.0.0.1<2>")) - - (erc-d-t-wait-for 2 "Buffer #chan@foonet replaced" - (and (get-buffer "#chan/127.0.0.1") - (not (get-buffer "#chan")))) - - (ert-info ("All #chan@foonet output consumed") - (with-current-buffer "#chan/127.0.0.1" ; <- First chan joined (foonet) - (funcall expect 3 "bob") - (funcall expect 3 "was created on") - (while (accept-process-output erc-server-process)) - (funcall expect 3 "prosperous"))) - - (ert-info ("All #chan@barnet output consumed") - (with-current-buffer "#chan/127.0.0.1<2>" - (funcall expect 3 "mike") - (funcall expect 3 "was created on") - (while (accept-process-output erc-server-process)) - (funcall expect 3 "ingenuous"))))) - -;; On some systems, this first bunch may need some bumping of timeouts, -;; linger-secs, etc. See function `erc-d-u-rewrite-for-slow-mo'. - -;; XXX 9bb8d90cdd Allow irc network symbols in erc-autojoin-channels-alist -;; Fixes the inciting action here but not the root cause -(ert-deftest erc-scenarios-48598/clash-of-chans/autojoin () - (ert-skip "obsolete") - (should erc-reuse-buffers) - - (erc-scenarios-common-with-cleanup - ((erc-d-u-with-cleanup-sleep-secs 1) - (erc-server-flood-penalty 0.5) - (port (erc-scenarios--port)) - (dumb-server (erc-d-run "localhost" port - 'foonet 'barnet 'foonet-again)) - (dumb-server-buffer (get-buffer "*erc-d-server*")) - (expect (erc-d-t-make-expecter)) - erc-server-buffer-foo erc-server-process-foo - erc-server-buffer-bar erc-server-process-bar) - - (should (memq 'autojoin erc-modules)) - - (ert-info ("Connect to foonet") - (setq erc-server-buffer-foo (erc :server "127.0.0.1" - :port port - :nick "tester" - :password "foonet:changeme" - :full-name "tester")) - (with-current-buffer erc-server-buffer-foo - (setq erc-server-process-foo erc-server-process) - (should (string= (buffer-name) (format "127.0.0.1:%d" port))) - (erc-d-t-wait-for 1 "foonet Network detected" - (string= (erc-network-name) "foonet")) - (funcall expect 5 "foonet"))) - - (ert-info ("Join #chan, then quit") - (with-current-buffer erc-server-buffer-foo - (erc-cmd-JOIN "#chan")) - (erc-d-t-wait-for 5 "Buffer #chan exists" - (get-buffer "#chan")) - (with-current-buffer "#chan" - (funcall expect 5 "vile thing") - (erc-cmd-QUIT ""))) - - (erc-d-t-wait-for 2 "foo death" - (not (process-live-p erc-server-process-foo))) - - (should (equal erc-autojoin-channels-alist '(("foonet.org" "#chan")))) - - (ert-info ("Connect to barnet") - (setq erc-server-buffer-bar (erc :server "127.0.0.1" - :port port - :nick "tester" - :password "barnet:changeme" - :full-name "tester")) - (with-current-buffer erc-server-buffer-bar - (setq erc-server-process-bar erc-server-process) - (should (string= (buffer-name) (format "127.0.0.1:%d" port))) - (erc-d-t-wait-for 5 "barnet Network detected" - (should-not (eq (process-status erc-server-process) 'failed)) - (eq erc-network 'barnet)))) - - (ert-info ("Server buffers are the same") - (should (eq erc-server-buffer-foo erc-server-buffer-bar)) - (should-not (cdr (erc-scenarios-common-buflist "127.0.0.1")))) - - (ert-info ("Only one #chan buffer exists") - (should (= 1 (length (erc-scenarios-common-buflist "#chan"))))) - - (ert-info ("#chan is auto-joined, output exclusive to barnet") - (with-current-buffer "#chan" - (funcall expect 2 "") - (erc-d-t-wait-for 3 "server-buffer is barnet" - (eq erc-server-process erc-server-process-bar)))) - - (ert-info ("Reconnect to foonet") - (setq erc-server-buffer-foo (erc :server "127.0.0.1" - :port port - :nick "tester" - :password "foonet:changeme" - :full-name "tester")) - (with-current-buffer erc-server-buffer-foo - (setq erc-server-process-foo erc-server-process) - (erc-d-t-wait-for 5 "foonet buffer renamed" - (string= (buffer-name) - (format "127.0.0.1:%d/127.0.0.1<2>" port))) - (erc-d-t-wait-for 2 "foonet Network detected" - (eq erc-network 'foonet)) - (funcall expect 5 "foonet"))) - - (ert-info ("#chan's server alternates as does its content") - (with-current-buffer "#chan" - (erc-scenarios-with-local-watcher procs 'erc-server-process - (erc-d-t-wait-for 3 "server buffer alternates" - (and (memq erc-server-process-foo procs) - (memq erc-server-process-bar procs)))) - (funcall expect 2 "") - (funcall expect 2 ""))) - - (ert-info ("All output received") - (with-current-buffer "#chan" - (while (accept-process-output erc-server-process-foo)) - (while (accept-process-output erc-server-process-bar)) - ;; Ordering here may not be predictable - (erc-d-t-search-for 1 "not given me") - (erc-d-t-search-for 1 "hath an uncle here"))) - - (erc-d-t-wait-for 5 "dumb-server death" - (not (eq (process-status dumb-server) 'run))))) - -(ert-deftest erc-scenarios-48598/clash-of-chans/bouncer-history () - (should erc-reuse-buffers) - - (erc-scenarios-common-with-cleanup - ((erc-d-u-with-cleanup-sleep-secs 1) - (erc-d-linger-secs 1) - (port (erc-scenarios--port)) - (dumb-server (erc-d-run "localhost" port 'foonet 'barnet)) - (dumb-server-buffer (get-buffer "*erc-d-server*")) - (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") - (setq erc-server-buffer-foo (erc :server "127.0.0.1" - :port port - :nick "tester" - :password "foonet:changeme" - :full-name "tester")) - (with-current-buffer erc-server-buffer-foo - (setq erc-server-process-foo erc-server-process) - (should (string= (buffer-name) (format "127.0.0.1:%d" port))) - (funcall expect 5 "foonet"))) - - (ert-info ("Connect to barnet") - (setq erc-server-buffer-bar (erc :server "127.0.0.1" - :port port - :nick "tester" - :password "barnet:changeme" - :full-name "tester")) - (with-current-buffer erc-server-buffer-bar - (setq erc-server-process-bar erc-server-process) - ;; Prior to 88567ca8 "Fix ERC Reuse buffer behavior", this didn't - ;; feature an suffix - (erc-d-t-wait-for 5 "overshot n-suffixed redundant name" - (string= (buffer-name) (format "127.0.0.1:%d/127.0.0.1<2>" port))) - (funcall expect 5 "barnet"))) - - (ert-info ("Server buffers are unique") - (should-not (eq erc-server-buffer-foo erc-server-buffer-bar)) - (should (= 2 (length (erc-scenarios-common-buflist "127.0.0.1"))))) - - (ert-info ("Networks named correctly") - (with-current-buffer erc-server-buffer-foo - (erc-d-t-wait-for 3 "network name foonet" - (string= (erc-network-name) "foonet"))) - (with-current-buffer erc-server-buffer-bar - (erc-d-t-wait-for 3 "network name barnet" - (string= (erc-network-name) "barnet")))) - - (ert-info ("Only one #chan buffer exists") - (should (= 1 (length (erc-scenarios-common-buflist "#chan"))))) - - (ert-info ("#chan's server alternates as does its content") - (erc-scenarios-with-local-watcher procs 'erc-server-process - (with-current-buffer "#chan" - (erc-d-t-search-for 1 "") - (erc-d-t-search-for 1 "") - (erc-d-t-wait-for 3 "server buffer alternates" - (and (memq erc-server-process-foo procs) - (memq erc-server-process-bar procs)))))) - - (ert-info ("All output sent") - (with-current-buffer "#chan" - (while (accept-process-output erc-server-process-foo)) - (while (accept-process-output erc-server-process-bar)) - (erc-d-t-search-for 3 "please your lordship"))) - - (erc-d-t-wait-for 5 "dumb-server dies on its own" - (not (eq (process-status dumb-server) 'run))))) - -(ert-deftest erc-scenarios-48598/clash-of-chans/rename-buffers () - (should erc-reuse-buffers) - - (erc-scenarios-common-with-cleanup - ((erc-d-u-with-cleanup-sleep-secs 1) - (erc-server-flood-penalty 0.1) - (port (erc-scenarios--port)) - (dumb-server (erc-d-run "localhost" port 'foonet 'barnet)) - (dumb-server-buffer (get-buffer "*erc-d-server*")) - (expect (erc-d-t-make-expecter)) - (erc-rename-buffers t) - erc-server-buffer-foo erc-server-process-foo - erc-server-buffer-bar erc-server-process-bar) - - (ert-info ("Connect to foonet, server briefly named nil") - (setq erc-server-buffer-foo (erc :server "127.0.0.1" - :port port - :nick "tester" - :password "foonet:changeme" - :full-name "tester")) - (with-current-buffer erc-server-buffer-foo - (setq erc-server-process-foo erc-server-process) - (should (string= (buffer-name) "nil")) - (erc-d-t-wait-for 3 "network name foonet" - (string= (erc-network-name) "foonet")) - (funcall expect 5 "foonet"))) - - (erc-d-t-wait-for 5 "Foonet's server buffer renamed" - (get-buffer "foonet")) - (should (eq erc-server-buffer-foo (get-buffer "foonet"))) - - (ert-info ("Join #chan@foonet") - (with-current-buffer erc-server-buffer-foo - (erc-cmd-JOIN "#chan")) - (erc-d-t-wait-for 5 "Buffer #chan created" - (get-buffer "#chan")) - (with-current-buffer "#chan" - (funcall expect 5 ""))) - - (ert-info ("Connect to barnet, server briefly named nil") - (setq erc-server-buffer-bar (erc :server "127.0.0.1" - :port port - :nick "tester" - :password "barnet:changeme" - :full-name "tester")) - (with-current-buffer erc-server-buffer-bar - (setq erc-server-process-bar erc-server-process) - (should (string= (buffer-name) "nil")) - (erc-d-t-wait-for 3 "network name barnet" - (string= (erc-network-name) "barnet")) - (funcall expect 5 "barnet"))) - - (erc-d-t-wait-for 5 "Barnet's server buffer renamed" - (get-buffer "barnet")) - (should (eq erc-server-buffer-bar (get-buffer "barnet"))) - - (ert-info ("Server buffers are unique, no buffer with old names") - (should-not (eq erc-server-buffer-foo erc-server-buffer-bar)) - (should-not (erc-scenarios-common-buflist "127.0.0.1"))) - - (ert-info ("Join #chan@barnet") - (with-current-buffer erc-server-buffer-bar - (erc-cmd-JOIN "#chan"))) - - (ert-info ("#chan's server alternates along with content") - (erc-scenarios-with-local-watcher procs 'erc-server-process - (with-current-buffer "#chan" - (erc-d-t-search-for 1 "") - (erc-d-t-search-for 1 "") - (erc-d-t-wait-for 3 "server buffer alternates" - (and (memq erc-server-process-foo procs) - (memq erc-server-process-bar procs)))))) - - (ert-info ("Only one #chan buffer exists") - (should (= 1 (length (erc-scenarios-common-buflist "#chan"))))) - - (ert-info ("All output sent") - (with-current-buffer "#chan" - (while (accept-process-output erc-server-process-foo)) - (while (accept-process-output erc-server-process-bar)) - (erc-d-t-search-for 1 "ape is dead") - (erc-d-t-search-for 1 "keeps you from dishonour"))) - - (erc-d-t-wait-for 5 "dumb-server death" - (not (eq (process-status dumb-server) 'run))))) - -;; This one is a temporary departure from the "assume defaults" rule -;; mentioned in the Commentary. (Which is bad.) -;; -;; TODO tag this as :unstable if ever adding to Emacs -;; TODO see if meaning is preserved when autojoin is ON (if so, adapt) - -(ert-deftest erc-scenarios-48598/clash-of-chans/uniquify-fail () - (should erc-reuse-buffers) - - (erc-scenarios-common-with-cleanup - ((erc-d-u-with-cleanup-sleep-secs 1) - (port (erc-scenarios--port)) - (dumb-server (erc-d-run "localhost" port 'foonet 'barnet)) - (dumb-server-buffer (get-buffer "*erc-d-server*")) - (expect (erc-d-t-make-expecter)) - (erc-server-flood-penalty 0.1) ; hack - (erc-modules (remq 'autojoin erc-modules)) - erc-server-buffer-foo erc-server-process-foo - erc-server-buffer-bar erc-server-process-bar - erc-autojoin-channels-alist - erc-reuse-buffers) - - (when (bound-and-true-p erc-autojoin-mode) - (erc-autojoin-mode -1)) - - (ert-info ("Connect to foonet") - (setq erc-server-buffer-foo (erc :server "127.0.0.1" - :port port - :nick "tester" - :password "foonet:changeme" - :full-name "tester")) - (with-current-buffer erc-server-buffer-foo - (setq erc-server-process-foo erc-server-process) - ;; Compare suffixed name here to that in bouncer-history variant - ;; (which has `erc-reuse-buffers' set to the default value of t) - (should (string= (buffer-name) - (format "127.0.0.1:%d/127.0.0.1" port))) - (funcall expect 5 "foonet"))) - - (ert-info ("Connect to barnet") - (setq erc-server-buffer-bar (erc :server "127.0.0.1" - :port port - :nick "tester" - :password "barnet:changeme" - :full-name "tester")) - (with-current-buffer erc-server-buffer-bar - (setq erc-server-process-bar erc-server-process) - ;; Prior to 88567ca8 "Fix ERC Reuse buffer behavior", this didn't - ;; feature an suffix - (erc-d-t-wait-for 5 "overshot n-suffixed redundant name" - (string= (buffer-name) (format "127.0.0.1:%d/127.0.0.1<2>" port))) - (funcall expect 5 "barnet"))) - - (ert-info ("Server buffers are unique") - (should-not (eq erc-server-buffer-foo erc-server-buffer-bar)) - (should (= 2 (length (erc-scenarios-common-buflist "127.0.0.1"))))) - - (ert-info ("Networks named correctly") - (with-current-buffer erc-server-buffer-foo - (erc-d-t-wait-for 3 "network name foonet" - (string= (erc-network-name) "foonet"))) - (with-current-buffer erc-server-buffer-bar - (erc-d-t-wait-for 3 "network name barnet" - (string= (erc-network-name) "barnet")))) - - (ert-info ("Only one #chan buffer exists") - (let ((chan-bufs (erc-scenarios-common-buflist "#chan"))) - (should (string= (buffer-name (pop chan-bufs)) "#chan/127.0.0.1")) - (should-not chan-bufs))) - - ;; From here on diverges from "48598/clash-of-chans/bouncer-history" - - (ert-info ("#chan's server alternates along with its content") - (with-current-buffer "#chan/127.0.0.1" - (erc-scenarios-with-local-watcher procs 'erc-server-process - (erc-d-t-wait-for 3 "server buffer alternates" - (and (memq erc-server-process-foo procs) - (memq erc-server-process-bar procs)))) - ;; XXX this only works if the REPLY to this PART is received - ;; when foonet is dominant, which is out of our control. - (with-current-buffer erc-server-buffer-foo - (erc-cmd-PART "#chan")) - ;; Remaining foonet output is displayed but barnet is cut off - (erc-d-t-search-for 1 "shake my sword"))) - - (ert-info ("Somehow #chan@barnet is created") - (erc-d-t-wait-for 5 "#chan@barnet" - (get-buffer "#chan/127.0.0.1<2>")) - (with-current-buffer "#chan/127.0.0.1<2>" - (should (eq erc-server-process erc-server-process-bar)))) - - (ert-info ("Rejoin #chan@foonet") - (with-current-buffer "#chan/127.0.0.1" - (funcall expect 3 "You have left channel #chan") - (erc-cmd-JOIN "#chan") - (funcall expect 3 "You have joined channel #chan") - (funcall expect 3 "#chan was created on") - (funcall expect 3 "") - (should (eq erc-server-process erc-server-process-foo)) - (erc-d-t-search-for -0.2 "" (point)))) - - (ert-info ("Part chan@barnet") - (with-current-buffer "#chan/127.0.0.1<2>" - (let ((previous-end (point-max))) - (goto-char previous-end) - (should-not (search-forward "alice" nil t))) - (funcall expect 3 "Arm it in rags") - (erc-cmd-PART "#chan") - (funcall expect 3 "You have left channel #chan") - (erc-cmd-JOIN "#chan"))) - - (should (= 2 (length (erc-scenarios-common-buflist "#chan")))) - - (ert-info ("#chan output alternates as before") - (with-current-buffer "#chan/127.0.0.1" - (funcall expect 3 "You have joined channel #chan") - (funcall expect 1 "Users on #chan: @mike joe tester") - (funcall expect 5 "") ; bob appears after ^ - (ert-info ("All output sent") - (while (accept-process-output erc-server-process-bar)) - (funcall expect 10 "soul black")))) - - (while (accept-process-output erc-server-process-foo)) - - (erc-d-t-wait-for 5 "dumb-server dies on its own" - (not (eq (process-status dumb-server) 'run))))) - -;; This one also disables autojoin (see comment for "uniquify-fail") - -(ert-deftest erc-scenarios-48598/clash-of-chans/uniquify-litter () - (should erc-reuse-buffers) - - (erc-scenarios-common-with-cleanup - ((erc-d-u-with-cleanup-sleep-secs 1) - (expect (erc-d-t-make-expecter)) - (port (erc-scenarios--port)) - (dumb-server (erc-d-run "localhost" port 'foonet 'barnet)) - (dumb-server-buffer (get-buffer "*erc-d-server*")) - (erc-server-flood-penalty 0.5) - (erc-modules (remq 'autojoin erc-modules)) - erc-reuse-buffers - erc-server-buffer-foo erc-server-process-foo - erc-server-buffer-bar erc-server-process-bar) - - (when (bound-and-true-p erc-autojoin-mode) - (erc-autojoin-mode -1)) - - (ert-info ("Connect to foonet, get uniquified buffer name") - (setq erc-server-buffer-foo (erc :server "127.0.0.1" - :port port - :nick "tester" - :password "foonet:changeme" - :full-name "tester")) - (with-current-buffer erc-server-buffer-foo - (setq erc-server-process-foo erc-server-process) - ;; Compare suffixed name here to that in bouncer-history variant - ;; (which has `erc-reuse-buffers' set to the default value of (t)) - (should (string= (buffer-name) - (format "127.0.0.1:%d/127.0.0.1" port))) - (erc-d-t-search-for 5 "foonet"))) - - (ert-info ("Connect to barnet, get uniquified buffer name") - (setq erc-server-buffer-bar (erc :server "127.0.0.1" - :port port - :nick "tester" - :password "barnet:changeme" - :full-name "tester")) - (with-current-buffer erc-server-buffer-bar - (setq erc-server-process-bar erc-server-process) - ;; Prior to 88567ca8 "Fix ERC Reuse buffer behavior", this didn't - ;; feature an suffix - (erc-d-t-wait-for 5 "overshot n-suffixed redundant name" - (string= (buffer-name) (format "127.0.0.1:%d/127.0.0.1<2>" port))) - (funcall expect 5 "barnet"))) - - (ert-info ("Server buffers are unique") - (should-not (eq erc-server-buffer-foo erc-server-buffer-bar)) - (should (= 2 (length (erc-scenarios-common-buflist "127.0.0.1"))))) - - (ert-info ("Networks named correctly") - (with-current-buffer erc-server-buffer-foo - (erc-d-t-wait-for 3 "network name foonet" - (string= (erc-network-name) "foonet"))) - (with-current-buffer erc-server-buffer-bar - (erc-d-t-wait-for 3 "network name barnet" - (string= (erc-network-name) "barnet")))) - - (ert-info ("Only one #chan buffer exists") - (let ((chan-bufs (erc-scenarios-common-buflist "#chan"))) - (should (string= (buffer-name (pop chan-bufs)) "#chan/127.0.0.1")) - (should-not chan-bufs))) - - ;; From here on diverts from other "clash-of-chans" - - (ert-info ("#chan's server alternates as does its content") - (with-current-buffer "#chan/127.0.0.1" - (erc-scenarios-with-local-watcher procs 'erc-server-process - (erc-d-t-wait-for 3 "server buffer alternates" - (and (memq erc-server-process-foo procs) - (memq erc-server-process-bar procs)))) - (with-current-buffer erc-server-buffer-foo - (erc-cmd-PART "#chan")) - (funcall expect 1 ""))) - - (ert-info ("Somehow #chan@barnet is created") - (erc-d-t-wait-for 4 "#chan@barnet" - (get-buffer "#chan/127.0.0.1<2>"))) - - (ert-info ("Part chan@barnet and rejoin") - (with-current-buffer "#chan/127.0.0.1<2>" - (should (eq erc-server-process erc-server-process-bar)) - (funcall expect 3 "Claudio as himself") - (let ((previous-end (point-max))) - (goto-char previous-end) - (should-not (search-forward "alice" nil t))) - (erc-cmd-PART "#chan") - (funcall expect 3 "You have left channel #chan") - (erc-cmd-JOIN "#chan"))) - - (ert-info ("New #chan@barnet is created") - (erc-d-t-wait-for 3 "#chan@barnet" - (get-buffer "#chan/127.0.0.1<3>")) - (with-current-buffer "#chan/127.0.0.1<3>" - (should (eq erc-server-process erc-server-process-bar)) - (funcall expect 3 "You have joined channel #chan"))) - - (ert-info ("Rejoin #chan@foonet") - (with-current-buffer "#chan/127.0.0.1" - (funcall expect 3 "You have left channel #chan") - (erc-cmd-JOIN "#chan") - (funcall expect 3 "You have joined channel #chan") - (funcall expect 3 "#chan was created on") - (let ((pos (funcall expect 3 ""))) - (should (eq erc-server-process erc-server-process-foo)) - (erc-d-t-wait-for -0.2 "exclusive to foonet" - (goto-char pos) - (search-forward "joe" nil t))))) - - (should (= 3 (length (erc-scenarios-common-buflist "#chan")))) - (should (= 2 (length (erc-scenarios-common-buflist "127.0.0.1")))) - - (while (accept-process-output erc-server-process-foo)) - (while (accept-process-output erc-server-process-bar)) - - (with-current-buffer "#chan/127.0.0.1" - (funcall expect 3 "Phebe's cruelty")) - - (with-current-buffer "#chan/127.0.0.1<3>" - (funcall expect 3 "world-without-end")) - - (erc-d-t-wait-for 5 "dumb-server dies on its own" - (not (eq (process-status dumb-server) 'run))))) - -(ert-deftest erc-scenarios-48598/rebuffed/foil-rename () - (erc-scenarios-common-with-cleanup - ((erc-d-linger-secs 0.5) - (port (erc-scenarios--port)) - ;; Again, like "gapless" above, barnet is loaded first because - ;; that's what ERC requests despite the invocation order - (dumb-server (erc-d-run "localhost" port 'barnet 'foonet)) - (dumb-server-buffer (get-buffer "*erc-d-server*")) - (erc-rename-buffers t) - erc-autojoin-channels-alist - erc-server-buffer-foo - erc-server-buffer-bar) - - (ert-info ("Connect to foonet, buffer initially named nil") - (setq erc-server-buffer-foo (erc :server "127.0.0.1" - :port port - :nick "tester" - :password "foonet:changeme" - :full-name "tester")) - (with-current-buffer erc-server-buffer-foo - (should (string= (buffer-name) "nil")))) - - (ert-info ("Connect to barnet") - (setq erc-server-buffer-bar (erc :server "127.0.0.1" - :port port - :nick "tester" - :password "barnet:changeme" - :full-name "tester")) - (with-current-buffer erc-server-buffer-bar - (should (string= (buffer-name) (format "127.0.0.1:%d" port))))) - - (erc-d-t-wait-for 1 "server for foonet renamed" (get-buffer "foonet")) - (erc-d-t-wait-for 1 "server for barnet renamed" (get-buffer "barnet")) - - (ert-info ("Server buffers are unique and temp names are absent") - (should-not (eq erc-server-buffer-foo erc-server-buffer-bar)) - (should-not (erc-scenarios-common-buflist "127.0.0.1")) - (should-not (get-buffer "nil"))) - - (ert-info ("Channel buffers are both healthy") - (with-current-buffer "#foo" - (while (accept-process-output erc-server-process)) - (erc-d-t-search-for 1 "whence you are") - (delete-process erc-server-process)) - (with-current-buffer "#bar" - (while (accept-process-output erc-server-process)) - (erc-d-t-search-for 1 "his second fit") - (delete-process erc-server-process))) - - (erc-d-t-wait-for 5 "dumb-server dies naturally" - (not (process-live-p dumb-server))))) - -;; Note: when inspecting this one interactively, sometimes server buffers -;; appear as "nil" if the disconnect hook ran before the latest mode-line -;; update. - -(ert-deftest erc-scenarios-48598/rebuffed/gapless () - ;; This is stable with deterministic ordering before and just after - ;; 0c7a7433dce1b93a685396986d3a560c9cc291f1 - ;; Problem remains but would require fancier footwork to show (basically - ;; pattern matching and hot loading one of two dialogs) - :tags '(:unstable) - (ert-skip "obsolete") - (erc-scenarios-common-with-cleanup - ((erc-d-linger-secs 2) - (erc-server-flood-penalty erc-server-flood-penalty) - ;; Barnet is loaded first because that's what's requested first by - ;; the client, as shown below. - (dumb-server (erc-d-run "localhost" (erc-scenarios--port) - 'barnet 'foonet)) - (dumb-server-buffer (get-buffer "*erc-d-server*")) - (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 - timeout-sentinel) - (ert-info ("Connect twice to same endpoint without pausing") - (setq erc-server-buffer-foo (erc :server "127.0.0.1" - :port erc-scenarios--port - :nick "tester" - :password "foonet:changeme" - :full-name "tester") - erc-server-buffer-bar (erc :server "127.0.0.1" - :port erc-scenarios--port - :nick "tester" - :password "barnet:changeme" - :full-name "tester"))) - - (ert-info ("Returned server buffers are identical") - (should (eq erc-server-buffer-foo erc-server-buffer-bar))) - - (ert-info ("Both connections actually happen") - (should (get-process "erc-d-server")) - (let ((name (format "erc-127.0.0.1-%d" erc-scenarios--port))) - (setq erc-server-process-foo (get-process name) - erc-server-process-bar (get-process (concat name "<1>"))))) - - (set-process-query-on-exit-flag erc-server-process-foo nil) - (set-process-query-on-exit-flag erc-server-process-bar nil) - - (with-current-buffer erc-server-buffer-bar - (funcall expect 1 "marked as being away")) - - (cl-letf (((symbol-function 'erc-d--expire) - (lambda (_ e) (push e timeout-sentinel)))) - - (erc-d-t-wait-for 20 "Buffer #bar exists" - (get-buffer "#bar")) - - (with-current-buffer erc-server-buffer-bar - ;; XXX a cheat to save some time. Verify by commenting out - ;; and bumping timeouts. Should still pass (after ~10 secs). - (ert-info ("Kludge to save some time") - (setq erc-server-flood-penalty 0) - (erc-server-send-queue erc-server-buffer-bar)) - - (erc-d-t-wait-for 5 "all messages actually sent" - (not erc-server-flood-queue))) - - (with-current-buffer "#bar" - (erc-d-t-search-for 5 "Unauthorized command") - (erc-d-t-search-for 5 "was created on")) - (erc-d-t-wait-for 2 "#foo dialog times out" timeout-sentinel) - - (let ((e (pop timeout-sentinel))) - (should-not timeout-sentinel) - (should (eq 'pass (erc-d-exchange-tag e))) - (should (string= "\\`PASS doa" (erc-d-exchange-pattern e))))) - - (while (accept-process-output erc-server-process-foo)) - (while (accept-process-output erc-server-process-bar)) - - (erc-d-t-wait-for 5 "dumb-server to die on its own" - (not (process-live-p dumb-server))))) - -(defun erc-scenarios-common--48598/rebuffed/reuseless () - (erc-scenarios-common-with-cleanup - ((erc-d-linger-secs 1) - (port (erc-scenarios--port)) - (dumb-server (erc-d-run "localhost" port 'foonet 'barnet)) - (dumb-server-buffer (get-buffer "*erc-d-server*")) - erc-autojoin-channels-alist - erc-server-buffer-foo - erc-server-buffer-bar) - - (ert-info ("Connect to foonet") - (setq erc-server-buffer-foo (erc :server "127.0.0.1" - :port port - :nick "tester" - :password "foonet:changeme" - :full-name "tester")) - (with-current-buffer erc-server-buffer-foo - (should (string= (buffer-name) - (if erc-reuse-buffers - (format "127.0.0.1:%d" port) - (format "127.0.0.1:%d/127.0.0.1" port)))) - (erc-d-t-search-for 1 "marked as being away"))) - - (ert-info ("Connect to barnet") - (setq erc-server-buffer-bar (erc :server "127.0.0.1" - :port port - :nick "tester" - :password "barnet:changeme" - :full-name "tester")) - (with-current-buffer erc-server-buffer-bar - (should (string= (buffer-name) - (if erc-reuse-buffers - (format "127.0.0.1:%d/127.0.0.1<2>" port) - (format "127.0.0.1:%d/127.0.0.1" port)))) - (erc-d-t-search-for 1 "marked as being away"))) - - (ert-info ("Server buffers are unique with option, identical without") - (if erc-reuse-buffers - (should-not (eq erc-server-buffer-foo erc-server-buffer-bar)) - (should (eq erc-server-buffer-foo erc-server-buffer-bar)))) - - (ert-info ("When the option is disabled, only one buffer survives") - (should (= (length (erc-scenarios-common-buflist "127.0.0.1")) - (if erc-reuse-buffers 2 1)))) - - ;; Sometimes we get an EOF, but it's rare - (erc-d-t-wait-for 5 "Let dumb server die on its own" - (not (process-live-p dumb-server))))) - -(ert-deftest erc-scenarios-48598/rebuffed/reuseless--enabled () - (should erc-reuse-buffers) - (let ((erc-scenarios--dialog-name "48598/rebuffed/reuseless")) - (erc-scenarios-common--48598/rebuffed/reuseless))) - -(ert-deftest erc-scenarios-48598/rebuffed/reuseless--disabled () - (should erc-reuse-buffers) - (let ((erc-scenarios--dialog-name "48598/rebuffed/reuseless") - erc-reuse-buffers) - (erc-scenarios-common--48598/rebuffed/reuseless))) - -;;; erc-scenarios-48598.el ends here diff --git a/test/lisp/erc/erc-scenarios-common.el b/test/lisp/erc/erc-scenarios-common.el new file mode 100644 index 0000000000..a77833e8ae --- /dev/null +++ b/test/lisp/erc/erc-scenarios-common.el @@ -0,0 +1,151 @@ +;;; erc-scenarios-common.el --- common helpers for ERC scenarios -*- lexical-binding: t -*- + +;; Copyright (C) 2021 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 +;; . + +;;; Commentary: + +;; This file should not contain any test cases. + +(require 'ert-x) ; cl-lib + +(eval-and-compile (let ((dir (getenv "EMACS_TEST_DIRECTORY"))) + (when dir + (load (concat dir "/lisp/erc/erc-d/erc-d-t") nil t) + (load (concat dir "/lisp/erc/erc-d/erc-d") nil t)))) +(require 'erc-d) +(require 'erc-d-t) +(require 'erc-backend) + +(defvar erc-scenarios-common--resources-dir + (expand-file-name (concat (ert-resource-directory) + "../erc-scenarios-resources/"))) + +;; Because teardown is already inhibited when running interactively, +;; which prevents subsequent tests from succeeding, we might as well +;; treat inspection as the goal. +(unless noninteractive + (setq erc-server-auto-reconnect nil)) + +(defvar erc-scenarios-common-dialog nil) +(defvar erc-scenarios-common-extra-teardown nil) + +(defun erc-scenarios-common--add-silence () + (advice-add #'erc-login :around #'erc-d-t-silence-around) + (advice-add #'erc-handle-login :around #'erc-d-t-silence-around) + (advice-add #'erc-server-connect :around #'erc-d-t-silence-around)) + +(defun erc-scenarios-common--remove-silence () + (advice-remove #'erc-login #'erc-d-t-silence-around) + (advice-remove #'erc-handle-login #'erc-d-t-silence-around) + (advice-remove #'erc-server-connect #'erc-d-t-silence-around)) + +(defun erc-scenarios-common--print-trace () + (when (and (boundp 'trace-buffer) (get-buffer trace-buffer)) + (with-current-buffer trace-buffer + (message "%S" (buffer-string)) + (kill-buffer)))) + +(defun erc-scenarios-common--make-bindings (bindings) + `((erc-d-u-canned-dialog-dir (expand-file-name + (or erc-scenarios-common-dialog + (cadr (assq 'erc-scenarios-common-dialog + ',bindings))) + erc-scenarios-common--resources-dir)) + (erc-d-spec-vars `(,@erc-d-spec-vars + (quit . ,(erc-quit/part-reason-default)) + (erc-version . ,erc-version))) + (erc-modules (copy-sequence erc-modules)) + (auth-source-do-cache nil) + (erc-autojoin-channels-alist nil) + (erc-server-auto-reconnect nil) + ,@bindings)) + +(defmacro erc-scenarios-common-with-cleanup (bindings &rest body) + "Provide boilerplate cleanup tasks after calling BODY with BINDINGS. + +If an `erc-d' process exists, wait for it to start before running BODY. +If `erc-autojoin-mode' mode is bound, restore it during cleanup if +disabled by BODY. Other defaults common to these test cases are added +below and can be overridden, except when wanting the \"real\" default +value, which must be looked up or captured outside of the calling form. + +Dialog resource directories are located by expanding the variable +`erc-scenarios-common-dialog' or its value in BINDINGS." + (declare (indent 1)) + + (let* ((orig-autojoin-mode (make-symbol "orig-autojoin-mode")) + (combind `((,orig-autojoin-mode (bound-and-true-p erc-autojoin-mode)) + ,@(erc-scenarios-common--make-bindings bindings)))) + + `(erc-d-t-with-cleanup (,@combind) + + (ert-info ("Restore autojoin, etc., kill ERC buffers") + (dolist (buf (buffer-list)) + (when-let ((erc-d-u--process-buffer) + (proc (get-buffer-process buf))) + (erc-d-t-wait-for 5 "Dumb server dies on its own" + (not (process-live-p proc))))) + + (erc-scenarios-common--remove-silence) + + (when erc-scenarios-common-extra-teardown + (ert-info ("Running extra teardown") + (funcall erc-scenarios-common-extra-teardown))) + + (when (and (boundp 'erc-autojoin-mode) + (not (eq erc-autojoin-mode ,orig-autojoin-mode))) + (erc-autojoin-mode (if ,orig-autojoin-mode +1 -1))) + + (when noninteractive + (erc-scenarios-common--print-trace) + (erc-d-t-kill-related-buffers))) + + (erc-scenarios-common--add-silence) + + (ert-info ("Wait for dumb server") + (dolist (buf (buffer-list)) + (with-current-buffer buf + (when erc-d-u--process-buffer + (erc-d-t-search-for 3 "Starting"))))) + + (ert-info ("Activate erc-debug-irc-protocol") + (unless (and noninteractive (not erc-debug-irc-protocol)) + (erc-toggle-debug-irc-protocol))) + + ,@body))) + +(defun erc-scenarios-common-assert-initial-buf-name (id port) + ;; Assert no limbo period when explicit ID given + (should (string= (if id + (symbol-name id) + (format "127.0.0.1:%d" port)) + (buffer-name)))) + +(defun erc-scenarios-common-buflist (prefix) + "Return list of buffers with names sharing PREFIX." + (let (case-fold-search) + (erc--sid-sort-buffers + (delq nil + (mapcar (lambda (b) + (when (string-prefix-p prefix (buffer-name b)) b)) + (buffer-list)))))) + +(provide 'erc-scenarios-common) + +;;; erc-scenarios-common.el ends here diff --git a/test/lisp/erc/erc-scenarios-resources/47522/ambiguous-join/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/47522/ambiguous-join/barnet.lispdata deleted file mode 100644 index c570457ebf..0000000000 --- a/test/lisp/erc/erc-scenarios-resources/47522/ambiguous-join/barnet.lispdata +++ /dev/null @@ -1,23 +0,0 @@ -;; -*- mode: lisp-data; -*- -((pass 1 "PASS :changeme")) -((nick 1 "NICK tester")) -((user 1 "USER user 0 * :tester") - (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") - (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.6.0-7481bf0385b95b16") - (0 ":irc.barnet.org 003 tester :This server was created Wed, 05 May 2021 00:51:49 UTC") - (0 ":irc.barnet.org 004 tester irc.barnet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") - (0 ":irc.barnet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") - (0 ":irc.barnet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=barnet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") - (0 ":irc.barnet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") - (0 ":irc.barnet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") - (0 ":irc.barnet.org 252 tester 0 :IRC Operators online") - (0 ":irc.barnet.org 253 tester 0 :unregistered connections") - (0 ":irc.barnet.org 254 tester 1 :channels formed") - (0 ":irc.barnet.org 255 tester :I have 3 clients and 0 servers") - (0 ":irc.barnet.org 265 tester 3 3 :Current local users 3, max 3") - (0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") - (0 ":irc.barnet.org 422 tester :MOTD File is missing") - (0 ":irc.barnet.org 221 tester +i") - (0 ":irc.barnet.org NOTICE tester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) - -((linger 2 LINGER)) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/foonet-again.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/foonet-again.lispdata deleted file mode 100644 index 1d62150762..0000000000 --- a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/foonet-again.lispdata +++ /dev/null @@ -1,39 +0,0 @@ -;; -*- mode: lisp-data; -*- -((pass-redux 10 "PASS :foonet:changeme")) -((nick-redux 1 "NICK tester")) - -((user-redux 1 "USER user 0 * :tester") - (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") - (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") - (0 ":irc.foonet.org 003 tester :This server was created Mon, 10 May 2021 00:58:22 UTC") - (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") - (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") - (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") - (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") - (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") - (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") - (0 ":irc.foonet.org 254 tester 1 :channels formed") - (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") - (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") - (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") - (0 ":irc.foonet.org 422 tester :MOTD File is missing") - ;; History - (0 ":tester!~u@q6ddatxcq6txy.irc JOIN #chan") - (0 ":irc.foonet.org 353 tester = #chan :@alice bob tester") - (0 ":irc.foonet.org 366 tester #chan :End of /NAMES list.") - (0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") - (0 ":bob!~u@q6ddatxcq6txy.irc PRIVMSG #chan :[02:43:23] alice: And soar with them above a common bound.") - (0 ":alice!~u@q6ddatxcq6txy.irc PRIVMSG #chan :[02:43:27] bob: And be aveng'd on cursed Tamora.") - (0 ":bob!~u@q6ddatxcq6txy.irc PRIVMSG #chan :[02:43:29] alice: He did love her, sir, as a gentleman loves a woman.") - (0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.")) - -((mode-redux 1 "MODE #chan") - (0 ":irc.foonet.org 324 tester #chan +nt") - (0 ":irc.foonet.org 329 tester #chan 1620608304") - (0.1 ":alice!~u@q6ddatxcq6txy.irc PRIVMSG #chan :bob: Ay, madam, with the swiftest wing of speed.") - (0.1 ":bob!~u@q6ddatxcq6txy.irc PRIVMSG #chan :alice: Five times in that ere once in our five wits.") - (0.1 ":alice!~u@q6ddatxcq6txy.irc PRIVMSG #chan :bob: And bid him come to take his last farewell.") - (0.1 ":bob!~u@q6ddatxcq6txy.irc PRIVMSG #chan :alice: But we are spirits of another sort.") - (0.1 ":alice!~u@q6ddatxcq6txy.irc PRIVMSG #chan :bob: It was not given me, nor I did not buy it.")) - -((linger 6 LINGER)) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/foonet.lispdata deleted file mode 100644 index b20b1e72ec..0000000000 --- a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/foonet.lispdata +++ /dev/null @@ -1,36 +0,0 @@ -;; -*- mode: lisp-data; -*- -((pass 1 "PASS :foonet:changeme")) -((nick 1 "NICK tester")) - -((user 1 "USER user 0 * :tester") - (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") - (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") - (0 ":irc.foonet.org 003 tester :This server was created Mon, 10 May 2021 00:58:22 UTC") - (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") - (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") - (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") - (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") - (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") - (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") - (0 ":irc.foonet.org 254 tester 1 :channels formed") - (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") - (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") - (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") - (0 ":irc.foonet.org 422 tester :MOTD File is missing")) - -((join 1 "JOIN #chan") - (0 ":tester!~u@q6ddatxcq6txy.irc JOIN #chan") - (0 ":irc.foonet.org 353 tester = #chan :@alice bob tester") - (0 ":irc.foonet.org 366 tester #chan :End of NAMES list") - (0.1 ":bob!~u@q6ddatxcq6txy.irc PRIVMSG #chan :tester, welcome!") - (0 ":alice!~u@q6ddatxcq6txy.irc PRIVMSG #chan :tester, welcome!")) - -((mode 1 "MODE #chan") - (0 ":irc.foonet.org 324 tester #chan +nt") - (0 ":irc.foonet.org 329 tester #chan 1620608304") - (0.1 ":bob!~u@q6ddatxcq6txy.irc PRIVMSG #chan :alice: Pray you, sir, deliver me this paper.") - (0.1 ":alice!~u@q6ddatxcq6txy.irc PRIVMSG #chan :bob: Wake when some vile thing is near.")) - -((quit 1 "QUIT :\2ERC\2")) - -((drop 0 DROP)) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-fail/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-fail/barnet.lispdata deleted file mode 100644 index d6555d3fc4..0000000000 --- a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-fail/barnet.lispdata +++ /dev/null @@ -1,63 +0,0 @@ -;; -*- mode: lisp-data; -*- -((pass 1 "PASS :barnet:changeme")) -((nick 1 "NICK tester")) -((user 1 "USER user 0 * :tester") - (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") - (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.6.0-7481bf0385b95b16") - (0 ":irc.barnet.org 003 tester :This server was created Wed, 05 May 2021 09:05:33 UTC") - (0 ":irc.barnet.org 004 tester irc.barnet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") - (0 ":irc.barnet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") - (0 ":irc.barnet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=barnet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") - (0 ":irc.barnet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") - (0 ":irc.barnet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") - (0 ":irc.barnet.org 252 tester 0 :IRC Operators online") - (0 ":irc.barnet.org 254 tester 1 :channels formed") - (0 ":irc.barnet.org 255 tester :I have 3 clients and 0 servers") - (0 ":irc.barnet.org 265 tester 3 3 :Current local users 3, max 3") - (0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") - (0 ":irc.barnet.org 422 tester :MOTD File is missing") - (0 ":irc.znc.in 306 tester :You have been marked as being away") - (0 ":tester!~u@wvys46tx8tpmk.irc JOIN #chan") - (0 ":irc.barnet.org 353 tester = #chan :joe @mike tester") - (0 ":irc.barnet.org 366 tester #chan :End of /NAMES list.") - (0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") - (0 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:16] joe: Tush! none but minstrels like of sonneting.") - (0 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:19] mike: Prithee, nuncle, be contented; 'tis a naughty night to swim in. Now a little fire in a wide field were like an old lecher's heart; a small spark, all the rest on's body cold. Look! here comes a walking fire.") - (0 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:22] joe: My name is Edgar, and thy father's son.") - (0 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:26] mike: Good my lord, be good to me; your honour is accounted a merciful man; good my lord.") - (0 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:31] joe: Thy child shall live, and I will see it nourish'd.") - (0 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:33] mike: Quick, quick; fear nothing; I'll be at thy elbow.") - (0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.") - (0 ":irc.barnet.org NOTICE tester :[09:05:35] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") - (0 ":irc.barnet.org 305 tester :You are no longer marked as being away")) - -((mode 1 "MODE #chan") - (0 ":irc.barnet.org 324 tester #chan +nt") - (0 ":irc.barnet.org 329 tester #chan 1620205534") - (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: That will be given to the loudest noise we make.") - (0.1 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: If it please your honour, I am the poor duke's constable, and my name is Elbow: I do lean upon justice, sir; and do bring in here before your good honour two notorious benefactors.") - (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: Following the signs, woo'd but the sign of she.") - (0.5 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: That, sir, which I will not report after her.") - (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: Boyet, prepare: I will away to-night.") - (0.1 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: If the man be a bachelor, sir, I can; but if he be a married man, he is his wife's head, and I can never cut off a woman's head.") - (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: Thyself upon thy virtues, they on thee.") - (0.1 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: Arm it in rags, a pigmy's straw doth pierce it.")) - -((part 5.1 "PART #chan :\2ERC\2") - (0 ":tester!~u@wvys46tx8tpmk.irc PART #chan :\2ERC\2 (IRC client for Emacs " emacs-version ")")) - -((join 10.1 "JOIN #chan") - (0 ":tester!~u@wvys46tx8tpmk.irc JOIN #chan") - (0 ":irc.barnet.org 353 tester = #chan :@mike joe tester") - (0 ":irc.barnet.org 366 tester #chan :End of NAMES list") - (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :tester, welcome!") - (0 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :tester, welcome!")) - -((mode 1 "MODE #chan") - (0 ":irc.barnet.org 324 tester #chan +nt") - (0 ":irc.barnet.org 329 tester #chan 1620205534") - (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: Chi non te vede, non te pretia.") - (0.1 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: Well, if ever thou dost fall from this faith, thou wilt prove a notable argument.") - (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: Of heavenly oaths, vow'd with integrity.") - (0.1 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: These herblets shall, which we upon you strew.") - (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: Aaron will have his soul black like his face.")) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-fail/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-fail/foonet.lispdata deleted file mode 100644 index 84daf7aec7..0000000000 --- a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-fail/foonet.lispdata +++ /dev/null @@ -1,63 +0,0 @@ -;; -*- mode: lisp-data; -*- -((pass 1 "PASS :foonet:changeme")) -((nick 1 "NICK tester")) -((user 1 "USER user 0 * :tester") - (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") - (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") - (0 ":irc.foonet.org 003 tester :This server was created Wed, 05 May 2021 09:05:34 UTC") - (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") - (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") - (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") - (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") - (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") - (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") - (0 ":irc.foonet.org 254 tester 1 :channels formed") - (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") - (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") - (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") - (0 ":irc.foonet.org 422 tester :MOTD File is missing") - (0 ":irc.znc.in 306 tester :You have been marked as being away") - (0 ":tester!~u@247eaxkrufj44.irc JOIN #chan") - (0 ":irc.foonet.org 353 tester = #chan :alice @bob tester") - (0 ":irc.foonet.org 366 tester #chan :End of /NAMES list.") - (0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") - (0 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :[09:07:19] bob: Is this; she hath bought the name of whore thus dearly.") - (0 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :[09:07:24] alice: He sent to me, sir,Here he comes.") - (0 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :[09:07:26] bob: Till I torment thee for this injury.") - (0 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :[09:07:29] alice: There's an Italian come; and 'tis thought, one of Leonatus' friends.") - (0 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :[09:09:33] bob: Ay, and the particular confirmations, point from point, to the full arming of the verity.") - (0 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :[09:09:35] alice: Kneel in the streets and beg for grace in vain.") - (0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.") - (0 ":irc.foonet.org NOTICE tester :[09:06:05] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") - (0 ":irc.foonet.org 305 tester :You are no longer marked as being away")) - -((mode 1 "MODE #chan") - (0 ":irc.foonet.org 324 tester #chan +nt") - (0 ":irc.foonet.org 329 tester #chan 1620205534") - (0.5 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :alice: Nor I no strength to climb without thy help.") - (0.1 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :bob: Nothing, but let him have thanks. Demand of him my condition, and what credit I have with the duke.") - (0.1 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :alice: Show me this piece. I am joyful of your sights.") - (0.2 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :bob: Whilst I can shake my sword or hear the drum.")) - -((part 5 "PART #chan :\2ERC\2") - (0 ":tester!~u@247eaxkrufj44.irc PART #chan :\2ERC\2 (IRC client for Emacs " emacs-version ")")) - -((join 10 "JOIN #chan") - (0 ":tester!~u@247eaxkrufj44.irc JOIN #chan") - (0 ":irc.foonet.org 353 tester = #chan :@bob alice tester") - (0 ":irc.foonet.org 366 tester #chan :End of NAMES list") - (0.1 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :tester, welcome!") - (0 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :tester, welcome!")) - -((mode 1 "MODE #chan") - (0 ":irc.foonet.org 324 tester #chan +nt") - (0 ":irc.foonet.org 329 tester #chan 1620205534") - (0.8 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :alice: Thou desirest me to stop in my tale against the hair.") - (0.1 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :bob: And dar'st not stand, nor look me in the face.") - (0.1 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :alice: It should not be, by the persuasion of his new feasting.") - (0.1 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :bob: It was not given me, nor I did not buy it.") - (0.1 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :alice: He that would vouch it in any place but here.") - (0.1 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :bob: In everything I wait upon his will.") - (0.1 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :alice: Thou counterfeit'st most lively.")) - -((linger 1 LINGER)) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-litter/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-litter/barnet.lispdata deleted file mode 100644 index 2b821bf8f0..0000000000 --- a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-litter/barnet.lispdata +++ /dev/null @@ -1,66 +0,0 @@ -;; -*- mode: lisp-data; -*- -((pass 1 "PASS :barnet:changeme")) -((nick 1 "NICK tester")) -((user 1 "USER user 0 * :tester") - (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") - (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.6.0-7481bf0385b95b16") - (0 ":irc.barnet.org 003 tester :This server was created Thu, 06 May 2021 02:02:40 UTC") - (0 ":irc.barnet.org 004 tester irc.barnet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") - (0 ":irc.barnet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") - (0 ":irc.barnet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=barnet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") - (0 ":irc.barnet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") - (0 ":irc.barnet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") - (0 ":irc.barnet.org 252 tester 0 :IRC Operators online") - (0 ":irc.barnet.org 254 tester 1 :channels formed") - (0 ":irc.barnet.org 255 tester :I have 3 clients and 0 servers") - (0 ":irc.barnet.org 265 tester 3 3 :Current local users 3, max 3") - (0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") - (0 ":irc.barnet.org 422 tester :MOTD File is missing") - (0 ":irc.znc.in 306 tester :You have been marked as being away") - (0 ":tester!~u@43inc6hukdiwg.irc JOIN #chan") - (0 ":irc.barnet.org 353 tester = #chan :@joe mike tester") - (0 ":irc.barnet.org 366 tester #chan :End of /NAMES list.") - (0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") - (0 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :[02:06:20] joe: Marry, it is your brother's right hand.") - (0 ":joe!~u@43inc6hukdiwg.irc PRIVMSG #chan :[02:06:23] mike: If it be prov'd! you see it is apparent.") - (0 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :[02:06:28] joe: Than would make up his message.") - (0 ":joe!~u@43inc6hukdiwg.irc PRIVMSG #chan :[02:06:59] mike: And almost broke my heart with extreme laughter.") - (0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.") - (0 ":irc.barnet.org NOTICE tester :[02:02:43] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") - (0 ":irc.barnet.org 305 tester :You are no longer marked as being away")) - -((mode 1.2 "MODE #chan") - (0 ":irc.barnet.org 324 tester #chan +nt") - (0 ":irc.barnet.org 329 tester #chan 1620266561") - (0.2 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :joe: Why, by making him uncapable of Othello's place; knocking out his brains.") - ;; This stuff shows up in the automatically created uniquified buffer - (0.5 ":joe!~u@43inc6hukdiwg.irc PRIVMSG #chan :mike: Berowne did swear himself out of all suit.") - (0.1 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :joe: Go to, go to: no matter for the dish, sir.") - (0.1 ":joe!~u@43inc6hukdiwg.irc PRIVMSG #chan :mike: We will have, if this fadge not, an antick. I beseech you, follow.") - (0.1 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :joe: As like almost to Claudio as himself.")) - -((part 4.2 "PART #chan :\2ERC\2") - (0 ":tester!~u@43inc6hukdiwg.irc PART #chan :\2ERC\2")) - -((join 5.2 "JOIN #chan") - (0 ":tester!~u@43inc6hukdiwg.irc JOIN #chan") - (0 ":irc.barnet.org 353 tester = #chan :@joe mike tester") - (0 ":irc.barnet.org 366 tester #chan :End of NAMES list") - (0.1 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :tester, welcome!") - (0 ":joe!~u@43inc6hukdiwg.irc PRIVMSG #chan :tester, welcome!")) - -((mode-b 1.2 "MODE #chan") - (0 ":irc.barnet.org 324 tester #chan +nt") - (0 ":irc.barnet.org 329 tester #chan 1620266561") - (0.1 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :joe: To wake and wage a danger profitless.") - (0.1 ":joe!~u@43inc6hukdiwg.irc PRIVMSG #chan :mike: And beauty's crest becomes the heavens well.") - (0.1 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :joe: Call up my brother. O! that you had had her.") - (0.1 ":joe!~u@43inc6hukdiwg.irc PRIVMSG #chan :mike: Most honourably doth uphold his word.") - (0.1 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :joe: But that he's well, and will be shortly here.") - (0.1 ":joe!~u@43inc6hukdiwg.irc PRIVMSG #chan :mike: Samson, master: he was a man of good carriage, great carriage, for he carried the towngates on his back like a porter; and he was in love.") - (0.1 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :joe: And yet seem cold, the time you may so hoodwink.") - (0.1 ":joe!~u@43inc6hukdiwg.irc PRIVMSG #chan :mike: To teach a teacher ill beseemeth me.") - (0.1 ":mike!~u@43inc6hukdiwg.irc PRIVMSG #chan :joe: If you swear, my lord, you shall not be forsworn.") - (0.1 ":joe!~u@43inc6hukdiwg.irc PRIVMSG #chan :mike: To make a world-without-end bargain in.")) - -((linger 1 LINGER)) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-litter/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-litter/foonet.lispdata deleted file mode 100644 index 44175d2a9c..0000000000 --- a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/uniquify-litter/foonet.lispdata +++ /dev/null @@ -1,56 +0,0 @@ -;; -*- mode: lisp-data; -*- -((pass 1 "PASS :foonet:changeme")) -((nick 1 "NICK tester")) -((user 1 "USER user 0 * :tester") - (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") - (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") - (0 ":irc.foonet.org 003 tester :This server was created Thu, 06 May 2021 02:02:40 UTC") - (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") - (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") - (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") - (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") - (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") - (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") - (0 ":irc.foonet.org 254 tester 1 :channels formed") - (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") - (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") - (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") - (0 ":irc.foonet.org 422 tester :MOTD File is missing") - (0 ":irc.znc.in 306 tester :You have been marked as being away") - (0 ":tester!~u@megraseia93w4.irc JOIN #chan") - (0 ":irc.foonet.org 353 tester = #chan :@alice bob tester") - (0 ":irc.foonet.org 366 tester #chan :End of /NAMES list.") - (0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") - (0 ":bob!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :[02:06:42] alice: Romeo slew Tybalt, Romeo must not live.") - (0 ":alice!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :[02:06:47] bob: Signior Martino and his wife and daughters; County Anselme and his beauteous sisters; the lady widow of Vitruvio; Signior Placentio, and his lovely nieces; Mercutio and his brother Valentine; mine uncle Capulet, his wife and daughters; my fair niece Rosaline; Livia; Signior Valentio and his cousin Tybalt; Lucio and the lively Helena.") - (0 ":bob!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :[02:06:51] alice: Of nothing so much as that I am not like Timon.") - (0 ":alice!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :[02:06:55] bob: Something browner than Judas's; marry, his kisses are Judas's own children.") - (0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.") - (0 ":irc.foonet.org NOTICE tester :[02:03:13] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") - (0 ":irc.foonet.org 305 tester :You are no longer marked as being away")) - -((mode 1 "MODE #chan") - (0 ":irc.foonet.org 324 tester #chan +nt") - (0 ":irc.foonet.org 329 tester #chan 1620266561") - (0.5 ":bob!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :alice: His looks I fear, and his intents I doubt.") - (0.3 ":alice!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :bob: But never hope to know why I should marry her.")) - -((part 2.1 "PART #chan") - (0 ":tester!~u@megraseia93w4.irc PART #chan")) - -((join 5.1 "JOIN #chan") - (0 ":tester!~u@megraseia93w4.irc JOIN #chan") - (0 ":irc.foonet.org 353 tester = #chan :@alice bob tester") - (0 ":irc.foonet.org 366 tester #chan :End of NAMES list") - (0.1 ":alice!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :tester, welcome!") - (0 ":bob!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :tester, welcome!")) - -((mode-b 1 "MODE #chan") - (0 ":irc.foonet.org 324 tester #chan +nt") - (0 ":irc.foonet.org 329 tester #chan 1620266561") - (0.1 ":bob!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :alice: Indeed, I should have asked you that before.") - (0.1 ":alice!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :bob: Her eye is sick on't: I observe her now.") - (0.1 ":bob!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :alice: For no name fits thy nature but thy own.") - (0.1 ":alice!~u@qyqgpz6tu76j6.irc PRIVMSG #chan :bob: Yet heard too much of Phebe's cruelty.")) - -((linger 1 LINGER)) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/foil-rename/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/foil-rename/barnet.lispdata deleted file mode 100644 index 5652d322fc..0000000000 --- a/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/foil-rename/barnet.lispdata +++ /dev/null @@ -1,51 +0,0 @@ -;; -*- mode: lisp-data; -*- -((pass 10 "PASS :barnet:changeme")) -((nick 0.2 "NICK tester")) -((user 0.2 "USER user 0 * :tester") - (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") - (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.5.1-4860c5cad0179db1") - (0 ":irc.barnet.org 003 tester :This server was created Fri, 19 Mar 2021 10:23:19 UTC") - (0 ":irc.barnet.org 004 tester irc.barnet.org oragono-2.5.1-4860c5cad0179db1 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") - (0 ":irc.barnet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m INVEX KICKLEN=390 MAXLIST=beI:60 :are supported by this server") - (0 ":irc.barnet.org 005 tester MAXTARGETS=4 MODES MONITOR=100 NETWORK=barnet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX draft/CHATHISTORY=100 :are supported by this server") - (0 ":irc.barnet.org 251 tester :There are 0 users and 1 invisible on 1 server(s)") - (0 ":irc.barnet.org 252 tester 0 :IRC Operators online") - (0 ":irc.barnet.org 254 tester 0 :channels formed") - (0 ":irc.barnet.org 255 tester :I have 1 clients and 0 servers") - (0 ":irc.barnet.org 265 tester 1 1 :Current local users 1, max 1") - (0 ":irc.barnet.org 266 tester 1 1 :Current global users 1, max 1") - (0 ":irc.barnet.org 422 tester :MOTD File is missing") - (0 ":irc.znc.in 306 tester :You have been marked as being away") - - (0 ":tester!~u@8cgjyczyrjgby.irc JOIN #bar") - (0 ":irc.barnet.org 353 tester = #bar :@mike joe tester") - (0 ":irc.barnet.org 366 tester #bar :End of /NAMES list.") - - (0 ":***!znc@znc.in PRIVMSG #bar :Buffer Playback...") - (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:23:28] tester, welcome!") - (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:23:28] tester, welcome!") - (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:04] mike: Marry, sir, by my wife; who, if she had been a woman cardinally given, might have been accused in fornication, adultery, and all uncleanliness there.") - (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:07] joe: Look, how you butt yourself in these sharp mocks.") - (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:10] mike: Who ? not the duke ? yes, your beggar of fifty, and his use was to put a ducat in her clack-dish; the duke had crotchets in him. He would be drunk too; that let me inform you.") - (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:15] joe: Look you what I have from the loving king.") - (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:19] mike: Sir, I know him, and I love him.") - (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:22] joe: Dictynna, goodman Dull: Dictynna, goodman Dull.") - (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:24] mike: Varlet, thou liest: thou liest, wicked varlet. The time is yet to come that she was ever respected with man, woman, or child.") - (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:28] joe: Nothing but peace and gentle visitation.") - (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:31] mike: What he hath lost noble Macbeth hath won.") - (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:34] joe: Patience, dear niece. Good Titus, dry thine eyes.") - (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:39] mike: And hear the sentence of your moved prince.") - (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:44] joe: To be whipped; and yet a better love than my master.") - (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:49] mike: Bid me farewell, and let me hear thee going.") - (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:54] joe: By heaven, thy love is black as ebony.") - (0 ":***!znc@znc.in PRIVMSG #bar :Playback Complete.") - - (0 ":irc.barnet.org NOTICE tester :[10:23:22] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") - (0 ":irc.barnet.org 305 tester :You are no longer marked as being away")) - -((mode 10 "MODE #bar") - (0 ":irc.barnet.org 324 tester #bar +nt") - (0 ":irc.barnet.org 329 tester #bar 1616149403") - (0.1 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :mike: Friar, thou knowest not the duke so well as I do: he's a better woodman than thou takest him for.") - (0.1 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :joe: Like the sequel, I. Signior Costard, adieu.") - (0.1 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :mike: This is his second fit; he had one yesterday.")) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/gapless/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/gapless/foonet.lispdata deleted file mode 100644 index 67234e26bc..0000000000 --- a/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/gapless/foonet.lispdata +++ /dev/null @@ -1,5 +0,0 @@ -;;; -*- mode: lisp-data -*- - -((pass 2.0 "PASS doa")) -((nick 0.2 "NICK tester")) -((user 0.2 "USER user 0 * :I never run!")) diff --git a/test/lisp/erc/erc-scenarios-resources/base/aborted-reconnect/foonet-dupe.lispdata b/test/lisp/erc/erc-scenarios-resources/base/aborted-reconnect/foonet-dupe.lispdata new file mode 100644 index 0000000000..8e299ec44c --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/aborted-reconnect/foonet-dupe.lispdata @@ -0,0 +1,28 @@ +;; -*- mode: lisp-data; -*- +((pass 3 "PASS :changeme")) +((nick 1 "NICK tester")) + +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Tue, 04 May 2021 05:06:18 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=FooNet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (-0.02 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (-0.02 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (-0.02 ":irc.foonet.org 253 tester 0 :unregistered connections") + (-0.02 ":irc.foonet.org 254 tester 1 :channels formed") + (-0.02 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (-0.02 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (-0.02 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (-0.02 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((~mode-user 3.2 "MODE tester +i") + (-0.02 ":irc.foonet.org 221 tester +i") + (-0.02 ":irc.foonet.org NOTICE tester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) + +((~join 10 "JOIN #chan")) +((eof 5 EOF)) +((drop 0 DROP)) diff --git a/test/lisp/erc/erc-scenarios-resources/base/aborted-reconnect/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/aborted-reconnect/foonet.lispdata new file mode 100644 index 0000000000..39bec93901 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/aborted-reconnect/foonet.lispdata @@ -0,0 +1,45 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Tue, 04 May 2021 05:06:18 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=FooNet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 253 tester 0 :unregistered connections") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 3.2 "MODE tester +i") + (0 ":irc.foonet.org 221 tester +i") + (0 ":irc.foonet.org NOTICE tester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) + +((join 12 "JOIN #chan") + (0 ":tester!~u@9g6b728983yd2.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :alice tester @bob") + (0 ":irc.foonet.org 366 tester #chan :End of NAMES list")) + +((mode 4 "MODE #chan") + (0 ":irc.foonet.org 324 tester #chan +nt") + (0 ":irc.foonet.org 329 tester #chan 1620104779") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :tester, welcome!") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :tester, welcome!") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :alice: But, as it seems, did violence on herself.") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :bob: Well, this is the forest of Arden.") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :alice: Signior Iachimo will not from it. Pray, let us follow 'em.") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :bob: Our queen and all her elves come here anon.") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :alice: The ground is bloody; search about the churchyard.") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :bob: You have discharged this honestly: keep it to yourself. Many likelihoods informed me of this before, which hung so tottering in the balance that I could neither believe nor misdoubt. Pray you, leave me: stall this in your bosom; and I thank you for your honest care. I will speak with you further anon.") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :alice: Give me that mattock, and the wrenching iron.") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :bob: Stand you! You have land enough of your own; but he added to your having, gave you some ground.") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :alice: Excellent workman! Thou canst not paint a man so bad as is thyself.") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :bob: And will you, being a man of your breeding, be married under a bush, like a beggar ? Get you to church, and have a good priest that can tell you what marriage is: this fellow will but join you together as they join wainscot; then one of you will prove a shrunk panel, and like green timber, warp, warp.") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :alice: Live, and be prosperous; and farewell, good fellow.")) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/bouncer-history/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/association/bouncer-history/barnet.lispdata similarity index 96% rename from test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/bouncer-history/barnet.lispdata rename to test/lisp/erc/erc-scenarios-resources/base/association/bouncer-history/barnet.lispdata index cba56e6ccf..9a8408ad6a 100644 --- a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/bouncer-history/barnet.lispdata +++ b/test/lisp/erc/erc-scenarios-resources/base/association/bouncer-history/barnet.lispdata @@ -15,7 +15,10 @@ (0 ":irc.barnet.org 255 tester :I have 3 clients and 0 servers") (0 ":irc.barnet.org 265 tester 3 3 :Current local users 3, max 3") (0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") - (0 ":irc.barnet.org 422 tester :MOTD File is missing") + (0 ":irc.barnet.org 422 tester :MOTD File is missing")) + +((mode-user 3.2 "MODE tester +i") + ;; No mode answer ^ (0 ":irc.znc.in 306 tester :You have been marked as being away") (0 ":tester!~u@xrir8fpe4d7ak.irc JOIN #chan") (0 ":irc.barnet.org 353 tester = #chan :joe @mike tester") @@ -31,7 +34,7 @@ (0 ":irc.barnet.org NOTICE tester :[07:00:01] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") (0 ":irc.barnet.org 305 tester :You are no longer marked as being away")) -((mode 3 "MODE #chan") +((mode 6 "MODE #chan") (0 ":irc.barnet.org 324 tester #chan +nt") (0 ":irc.barnet.org 329 tester #chan 1619593200") (0.25 ":joe!~u@svpn88yjcdj42.irc PRIVMSG #chan :mike: But, in defence, by mercy, 'tis most just.") diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/bouncer-history/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/association/bouncer-history/foonet.lispdata similarity index 97% rename from test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/bouncer-history/foonet.lispdata rename to test/lisp/erc/erc-scenarios-resources/base/association/bouncer-history/foonet.lispdata index 6af26038d9..58df79e19f 100644 --- a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/bouncer-history/foonet.lispdata +++ b/test/lisp/erc/erc-scenarios-resources/base/association/bouncer-history/foonet.lispdata @@ -15,7 +15,10 @@ (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") - (0 ":irc.foonet.org 422 tester :MOTD File is missing") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 3.2 "MODE tester +i") + ;; No mode answer ^ (0 ":irc.znc.in 306 tester :You have been marked as being away") (0 ":tester!~u@nvfhxvqm92rm6.irc JOIN #chan") (0 ":irc.foonet.org 353 tester = #chan :alice @bob tester") @@ -35,7 +38,7 @@ (0 ":irc.foonet.org NOTICE tester :[07:00:32] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") (0 ":irc.foonet.org 305 tester :You are no longer marked as being away")) -((mode 3 "MODE #chan") +((mode 6 "MODE #chan") (0 ":irc.foonet.org 324 tester #chan +nt") (0 ":irc.foonet.org 329 tester #chan 1619593200") (0.9 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #chan :bob: Grows, lives, and dies, in single blessedness.") diff --git a/test/lisp/erc/erc-scenarios-resources/47522/foil-in-server-buf/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/association/multi-net/barnet.lispdata similarity index 97% rename from test/lisp/erc/erc-scenarios-resources/47522/foil-in-server-buf/barnet.lispdata rename to test/lisp/erc/erc-scenarios-resources/base/association/multi-net/barnet.lispdata index 99329a3acc..9aa2f2821c 100644 --- a/test/lisp/erc/erc-scenarios-resources/47522/foil-in-server-buf/barnet.lispdata +++ b/test/lisp/erc/erc-scenarios-resources/base/association/multi-net/barnet.lispdata @@ -16,7 +16,9 @@ (0 ":irc.barnet.org 255 tester :I have 3 clients and 0 servers") (0 ":irc.barnet.org 265 tester 3 3 :Current local users 3, max 3") (0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") - (0 ":irc.barnet.org 422 tester :MOTD File is missing") + (0 ":irc.barnet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") (0 ":irc.barnet.org 221 tester +i") (0 ":irc.barnet.org NOTICE tester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) diff --git a/test/lisp/erc/erc-scenarios-resources/47522/foil-in-server-buf/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/association/multi-net/foonet.lispdata similarity index 97% rename from test/lisp/erc/erc-scenarios-resources/47522/foil-in-server-buf/foonet.lispdata rename to test/lisp/erc/erc-scenarios-resources/base/association/multi-net/foonet.lispdata index 67fbe205c4..79661a0fd2 100644 --- a/test/lisp/erc/erc-scenarios-resources/47522/foil-in-server-buf/foonet.lispdata +++ b/test/lisp/erc/erc-scenarios-resources/base/association/multi-net/foonet.lispdata @@ -16,7 +16,9 @@ (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") - (0 ":irc.foonet.org 422 tester :MOTD File is missing") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") (0 ":irc.foonet.org 221 tester +i") (0 ":irc.foonet.org NOTICE tester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) diff --git a/test/lisp/erc/erc-scenarios-resources/base/association/nick-bump/renicked-again.lispdata b/test/lisp/erc/erc-scenarios-resources/base/association/nick-bump/renicked-again.lispdata new file mode 100644 index 0000000000..c533d19dc1 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/association/nick-bump/renicked-again.lispdata @@ -0,0 +1,30 @@ +;; -*- mode: lisp-data; -*- +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0.0 ":irc.foonet.org 433 * tester :Nickname is reserved by a different account") + (0.0 ":irc.foonet.org FAIL NICK NICKNAME_RESERVED tester :Nickname is reserved by a different account")) + +((nick 1 "NICK tester`") + (0.1 ":irc.foonet.org 001 tester` :Welcome to the foonet IRC Network tester`") + (0.0 ":irc.foonet.org 002 tester` :Your host is irc.foonet.org, running version oragono-2.6.1-937b9b02368748e5") + (0.0 ":irc.foonet.org 003 tester` :This server was created Fri, 24 Sep 2021 01:38:36 UTC") + (0.0 ":irc.foonet.org 004 tester` irc.foonet.org oragono-2.6.1-937b9b02368748e5 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0.0 ":irc.foonet.org 005 tester` AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0.1 ":irc.foonet.org 005 tester` MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0.1 ":irc.foonet.org 005 tester` draft/CHATHISTORY=100 :are supported by this server") + (0.0 ":irc.foonet.org 251 tester` :There are 0 users and 3 invisible on 1 server(s)") + (0.0 ":irc.foonet.org 252 tester` 0 :IRC Operators online") + (0.0 ":irc.foonet.org 253 tester` 0 :unregistered connections") + (0.0 ":irc.foonet.org 254 tester` 1 :channels formed") + (0.0 ":irc.foonet.org 255 tester` :I have 3 clients and 0 servers") + (0.0 ":irc.foonet.org 265 tester` 3 3 :Current local users 3, max 3") + (0.2 ":irc.foonet.org 266 tester` 3 3 :Current global users 3, max 3") + (0.0 ":irc.foonet.org 422 tester` :MOTD File is missing")) + +((mode-user 1.2 "MODE tester` +i") + (0.0 ":irc.foonet.org 221 tester` +i") + (0.0 ":irc.foonet.org NOTICE tester` :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) + +((privmsg 42.6 "PRIVMSG NickServ :IDENTIFY tester changeme") + (0.01 ":tester`!~u@rpaau95je67ci.irc NICK tester") + (0.0 ":NickServ!NickServ@localhost NOTICE tester :You're now logged in as tester")) diff --git a/test/lisp/erc/erc-scenarios-resources/base/association/nick-bump/renicked.lispdata b/test/lisp/erc/erc-scenarios-resources/base/association/nick-bump/renicked.lispdata new file mode 100644 index 0000000000..c4aff9db5f --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/association/nick-bump/renicked.lispdata @@ -0,0 +1,30 @@ +;; -*- mode: lisp-data; -*- +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0.0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0.0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.1-937b9b02368748e5") + (0.0 ":irc.foonet.org 003 tester :This server was created Fri, 24 Sep 2021 01:38:36 UTC") + (0.0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.1-937b9b02368748e5 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0.0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0.01 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0.01 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0.0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0.0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0.0 ":irc.foonet.org 253 tester 0 :unregistered connections") + (0.0 ":irc.foonet.org 254 tester 1 :channels formed") + (0.0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0.0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0.0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0.0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + (0.0 ":irc.foonet.org 221 tester +i") + (0.0 ":irc.foonet.org NOTICE tester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) + +((privmsg 17.21 "PRIVMSG NickServ :REGISTER changeme") + (0.02 ":NickServ!NickServ@localhost NOTICE tester :Account created") + (0.01 ":NickServ!NickServ@localhost NOTICE tester :You're now logged in as tester")) + +((quit 18.19 "QUIT :" quit) + (0.01 ":tester!~u@rpaau95je67ci.irc QUIT :Quit: " quit)) +((drop 1 DROP)) diff --git a/test/lisp/erc/erc-scenarios-resources/base/association/reconnect-playback/foonet-again.lispdata b/test/lisp/erc/erc-scenarios-resources/base/association/reconnect-playback/foonet-again.lispdata new file mode 100644 index 0000000000..1eb633260c --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/association/reconnect-playback/foonet-again.lispdata @@ -0,0 +1,42 @@ +;; -*- mode: lisp-data; -*- +((pass 4.0 "PASS :changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0.0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0.0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0.0 ":irc.foonet.org 003 tester :This server was created Wed, 16 Jun 2021 04:15:00 UTC") + (0.0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0.0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0.0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0.0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0.0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0.0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0.0 ":irc.foonet.org 254 tester 1 :channels formed") + (0.0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0.0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0.0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0.0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + ;; No mode answer + (0.0 ":tester!~u@mw6kegwt77kwe.irc JOIN #chan") + (0.0 ":irc.foonet.org 353 tester = #chan :alice @bob tester") + (0.0 ":irc.foonet.org 366 tester #chan :End of /NAMES list.") + (0.0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") + (0.0 ":alice!~u@mw6kegwt77kwe.irc PRIVMSG #chan :[10:37:52] bob: Thou pout'st upon thy fortune and thy love.") + (0.0 ":bob!~u@mw6kegwt77kwe.irc PRIVMSG #chan :[10:37:56] alice: With these mortals on the ground.") + (0.0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.")) + +((mode 1 "MODE #chan") + (0.0 ":irc.foonet.org 324 tester #chan +nt") + (0.0 ":irc.foonet.org 329 tester #chan 1623816901") + (0.1 ":bob!~u@mw6kegwt77kwe.irc PRIVMSG #chan :alice: My name, my good lord, is Parolles.") + (0.1 ":alice!~u@mw6kegwt77kwe.irc PRIVMSG #chan :bob: Wilt thou rest damned ? God help thee, shallow man! God make incision in thee! thou art raw.")) + +((privmsg 3.0 "PRIVMSG *status :help") + (0.0 ":*status!znc@znc.in PRIVMSG tester :In the following list all occurrences of <#chan> support wildcards (* and ?) except ListNicks") + (0.0 ":*status!znc@znc.in PRIVMSG tester :\2Version\17: Print which version of ZNC this is") + (0.0 ":*status!znc@znc.in PRIVMSG tester :\2Shutdown [message]\17: Shut down ZNC completely") + (0.0 ":*status!znc@znc.in PRIVMSG tester :\2Restart [message]\17: Restart ZNC") + (0.1 ":bob!~u@mw6kegwt77kwe.irc PRIVMSG #chan :alice: In that word's death; no words can that woe sound.") + (0.1 ":alice!~u@mw6kegwt77kwe.irc PRIVMSG #chan :bob: Look, sir, here comes the lady towards my cell.")) diff --git a/test/lisp/erc/erc-scenarios-resources/base/association/reconnect-playback/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/association/reconnect-playback/foonet.lispdata new file mode 100644 index 0000000000..347e565498 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/association/reconnect-playback/foonet.lispdata @@ -0,0 +1,52 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0.0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0.0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0.0 ":irc.foonet.org 003 tester :This server was created Wed, 16 Jun 2021 04:15:00 UTC") + (0.0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0.0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0.0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0.0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0.0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0.0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0.0 ":irc.foonet.org 254 tester 1 :channels formed") + (0.0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0.0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0.0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0.0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + ;; No mode answer + (0.0 ":irc.znc.in 306 tester :You have been marked as being away") + (0.0 ":tester!~u@mw6kegwt77kwe.irc JOIN #chan") + (0.0 ":irc.foonet.org 353 tester = #chan :alice @bob tester") + (0.0 ":irc.foonet.org 366 tester #chan :End of /NAMES list.") + (0.0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") + (0.0 ":alice!~u@mw6kegwt77kwe.irc PRIVMSG #chan :[10:35:50] bob: To Laced mon did my land extend.") + (0.0 ":bob!~u@mw6kegwt77kwe.irc PRIVMSG #chan :[10:35:55] alice: This is but a custom in your tongue; you bear a graver purpose, I hope.") + (0.0 ":alice!~u@mw6kegwt77kwe.irc PRIVMSG #chan :[10:37:16] bob: To imitate them; faults that are rich are fair.") + (0.0 ":bob!~u@mw6kegwt77kwe.irc PRIVMSG #chan :[10:37:18] alice: Our Romeo hath not been in bed to-night.") + (0.0 ":alice!~u@mw6kegwt77kwe.irc PRIVMSG #chan :[10:37:21] bob: But, in defence, by mercy, 'tis most just.") + (0.0 ":bob!~u@mw6kegwt77kwe.irc PRIVMSG #chan :[10:37:25] alice: Younger than she are happy mothers made.") + (0.0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.") + (0.0 ":irc.foonet.org 305 tester :You are no longer marked as being away")) + +((mode 1 "MODE #chan") + (1.0 ":irc.foonet.org 324 tester #chan +nt") + (0.0 ":irc.foonet.org 329 tester #chan 1623816901") + (0.1 ":alice!~u@mw6kegwt77kwe.irc PRIVMSG #chan :bob: At thy good heart's oppression.") + (0.1 ":bob!~u@mw6kegwt77kwe.irc PRIVMSG #chan :alice: But purgatory, torture, hell itself.")) + +((privmsg 3 "PRIVMSG *status :help") + (0.0 ":*status!znc@znc.in PRIVMSG tester :In the following list all occurrences of <#chan> support wildcards (* and ?) except ListNicks") + (0.0 ":*status!znc@znc.in PRIVMSG tester :\2AddPort <[+]port> [bindhost [uriprefix]]\17: Add another port for ZNC to listen on") + (0.0 ":*status!znc@znc.in PRIVMSG tester :\2DelPort [bindhost]\17: Remove a port from ZNC") + (0.0 ":*status!znc@znc.in PRIVMSG tester :\2Rehash\17: Reload global settings, modules, and listeners from znc.conf") + (0.1 ":alice!~u@mw6kegwt77kwe.irc PRIVMSG #chan :bob: And at my suit, sweet, pardon what is past.") + (0.1 ":bob!~u@mw6kegwt77kwe.irc PRIVMSG #chan :alice: My lord, you give me most egregious indignity.")) + +((quit 1 "QUIT :\2ERC\2")) + +((drop 0 DROP)) diff --git a/test/lisp/erc/erc-scenarios-resources/base/association/same-network/chester.lispdata b/test/lisp/erc/erc-scenarios-resources/base/association/same-network/chester.lispdata new file mode 100644 index 0000000000..e51cc590b0 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/association/same-network/chester.lispdata @@ -0,0 +1,40 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :changeme")) +((nick 1 "NICK chester")) +((user 1 "USER user 0 * :chester") + (0 ":irc.foonet.org 001 chester :Welcome to the foonet IRC Network chester") + (0 ":irc.foonet.org 002 chester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 chester :This server was created Sun, 13 Jun 2021 05:45:20 UTC") + (0 ":irc.foonet.org 004 chester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 chester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 chester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 chester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 chester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 chester 0 :IRC Operators online") + (0 ":irc.foonet.org 253 chester 1 :unregistered connections") + (0 ":irc.foonet.org 254 chester 1 :channels formed") + (0 ":irc.foonet.org 255 chester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 chester 3 4 :Current local users 3, max 4") + (0 ":irc.foonet.org 266 chester 3 4 :Current global users 3, max 4") + (0 ":irc.foonet.org 422 chester :MOTD File is missing")) + +((mode-user 2.2 "MODE chester +i") + (0 ":irc.foonet.org 221 chester +i") + (0 ":chester!~u@yuvqisyu7m7qs.irc JOIN #chan") + (0 ":irc.foonet.org 353 chester = #chan :tester chester @alice bob") + (0 ":irc.foonet.org 366 chester #chan :End of NAMES list") + (0 ":irc.foonet.org NOTICE chester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) + +((mode 10 "MODE #chan") + (0.0 ":irc.foonet.org 324 chester #chan +nt") + (0.0 ":irc.foonet.org 329 chester #chan 1623563121") + (0.0 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :chester, welcome!") + (0.0 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :chester, welcome!") + (0.1 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :alice: Dispatch, I say, and find the forester.") + (0.0 ":tester!~u@yuvqisyu7m7qs.irc QUIT :Quit: " quit) + (0.5 ":tester!~u@yuvqisyu7m7qs.irc JOIN #chan") + (0.1 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :tester, welcome again!") + (0.1 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :tester, welcome again!")) + +((quit 20 "QUIT :" quit) + (0.0 ":chester!~u@yuvqisyu7m7qs.irc QUIT :Quit: " quit)) diff --git a/test/lisp/erc/erc-scenarios-resources/base/association/same-network/tester-again.lispdata b/test/lisp/erc/erc-scenarios-resources/base/association/same-network/tester-again.lispdata new file mode 100644 index 0000000000..e4bbae2b45 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/association/same-network/tester-again.lispdata @@ -0,0 +1,37 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Sun, 13 Jun 2021 05:45:20 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 4 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 253 tester 0 :unregistered connections") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 4 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 4 4 :Current local users 4, max 4") + (0 ":irc.foonet.org 266 tester 4 4 :Current global users 4, max 4") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 2.2 "MODE tester +i") + (0 ":irc.foonet.org 221 tester +i") + (0 ":irc.foonet.org NOTICE tester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":tester!~u@yuvqisyu7m7qs.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :tester @alice bob chester") + (0 ":irc.foonet.org 366 tester #chan :End of NAMES list")) + +((mode 10 "MODE #chan") + (0.0 ":irc.foonet.org 324 tester #chan +nt") + (0.0 ":irc.foonet.org 329 tester #chan 1623563121") + (0.0 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :tester, welcome again!") + (0.0 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :tester, welcome again!")) + +((quit 4 "QUIT :" quit) + (0 ":tester!~u@yuvqisyu7m7qs.irc QUIT :Quit: " quit)) + +((linger 5 LINGER)) diff --git a/test/lisp/erc/erc-scenarios-resources/base/association/same-network/tester.lispdata b/test/lisp/erc/erc-scenarios-resources/base/association/same-network/tester.lispdata new file mode 100644 index 0000000000..333658fe94 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/association/same-network/tester.lispdata @@ -0,0 +1,42 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Sun, 13 Jun 2021 05:45:20 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 4 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 253 tester 0 :unregistered connections") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 4 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 4 4 :Current local users 4, max 4") + (0 ":irc.foonet.org 266 tester 4 4 :Current global users 4, max 4") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 2.2 "MODE tester +i") + (0 ":irc.foonet.org 221 tester +i") + (0 ":irc.foonet.org NOTICE tester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) + +((join 15 "JOIN #chan") + (0 ":tester!~u@yuvqisyu7m7qs.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :tester @alice bob") + (0 ":irc.foonet.org 366 tester #chan :End of NAMES list")) + +((mode 10 "MODE #chan") + (0.0 ":irc.foonet.org 324 tester #chan +nt") + (0.0 ":irc.foonet.org 329 tester #chan 1623563121") + (0.0 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :tester, welcome!") + (0.0 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :tester, welcome!") + (0.0 ":chester!~u@yuvqisyu7m7qs.irc JOIN #chan") + (0.1 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :chester, welcome!") + (0.0 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :chester, welcome!") + (0.1 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :alice: Dispatch, I say, and find the forester.")) + +((quit 4 "QUIT ")) + +((drop 0 DROP)) diff --git a/test/lisp/erc/erc-scenarios-resources/base/channel-buffer-revival/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/channel-buffer-revival/foonet.lispdata new file mode 100644 index 0000000000..cc719d275f --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/channel-buffer-revival/foonet.lispdata @@ -0,0 +1,45 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Tue, 04 May 2021 05:06:18 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=FooNet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 253 tester 0 :unregistered connections") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 3.2 "MODE tester +i") + (0 ":irc.foonet.org 221 tester +i") + (0 ":irc.foonet.org NOTICE tester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) + +((join 6 "JOIN #chan") + (0 ":tester!~u@9g6b728983yd2.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :alice tester @bob") + (0 ":irc.foonet.org 366 tester #chan :End of NAMES list")) + +((mode 8 "MODE #chan") + (0 ":irc.foonet.org 324 tester #chan +nt") + (0 ":irc.foonet.org 329 tester #chan 1620104779") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :tester, welcome!") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :tester, welcome!") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :alice: But, as it seems, did violence on herself.") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :bob: Well, this is the forest of Arden.") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :alice: Signior Iachimo will not from it. Pray, let us follow 'em.") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :bob: Our queen and all her elves come here anon.") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :alice: The ground is bloody; search about the churchyard.") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :bob: You have discharged this honestly: keep it to yourself. Many likelihoods informed me of this before, which hung so tottering in the balance that I could neither believe nor misdoubt. Pray you, leave me: stall this in your bosom; and I thank you for your honest care. I will speak with you further anon.") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :alice: Give me that mattock, and the wrenching iron.") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :bob: Stand you! You have land enough of your own; but he added to your having, gave you some ground.") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :alice: Excellent workman! Thou canst not paint a man so bad as is thyself.") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :bob: And will you, being a man of your breeding, be married under a bush, like a beggar ? Get you to church, and have a good priest that can tell you what marriage is: this fellow will but join you together as they join wainscot; then one of you will prove a shrunk panel, and like green timber, warp, warp.") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :alice: Live, and be prosperous; and farewell, good fellow.")) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/gapless/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/gapless-connect/barnet.lispdata similarity index 80% rename from test/lisp/erc/erc-scenarios-resources/48598/rebuffed/gapless/barnet.lispdata rename to test/lisp/erc/erc-scenarios-resources/base/gapless-connect/barnet.lispdata index dcf630902e..a819e81775 100644 --- a/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/gapless/barnet.lispdata +++ b/test/lisp/erc/erc-scenarios-resources/base/gapless-connect/barnet.lispdata @@ -1,7 +1,6 @@ ;; -*- mode: lisp-data; -*- ((pass 10 "PASS :barnet:changeme")) -((nick 0.2 "NICK tester")) - +((nick 10 "NICK tester")) ((user 0.2 "USER user 0 * :tester") (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.5.1-4860c5cad0179db1") @@ -15,7 +14,10 @@ (0 ":irc.barnet.org 255 tester :I have 1 clients and 0 servers") (0 ":irc.barnet.org 265 tester 1 1 :Current local users 1, max 1") (0 ":irc.barnet.org 266 tester 1 1 :Current global users 1, max 1") - (0 ":irc.barnet.org 422 tester :MOTD File is missing") + (0 ":irc.barnet.org 422 tester :MOTD File is missing")) + +((mode-user 3.2 "MODE tester +i") + ;; No mode answer (0 ":irc.znc.in 306 tester :You have been marked as being away") (0 ":tester!~u@8cgjyczyrjgby.irc JOIN #bar") (0 ":irc.barnet.org 353 tester = #bar :@mike joe tester") @@ -23,23 +25,12 @@ (0 ":***!znc@znc.in PRIVMSG #bar :Buffer Playback...") (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:23:28] tester, welcome!") (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:23:28] tester, welcome!") - (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:23:29] joe: Pardon, sir; error: he is not quantity enough for that Worthy's thumb: he is not so big as the end of his club.") - (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:31] mike: What he hath lost noble Macbeth hath won.") - (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:44] joe: To be whipped; and yet a better love than my master.") (0 ":joe!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:49] mike: Bid me farewell, and let me hear thee going.") (0 ":mike!~u@8cgjyczyrjgby.irc PRIVMSG #bar :[10:24:54] joe: By heaven, thy love is black as ebony.") (0 ":***!znc@znc.in PRIVMSG #bar :Playback Complete.") (0 ":irc.barnet.org NOTICE tester :[10:23:22] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") (0 ":irc.barnet.org 305 tester :You are no longer marked as being away")) -((~pass-extra 10 "PASS barnet:changeme") - (0 ":irc.barnet.org 462 tester :You may not reregister")) - -((~nick-extra 5 "NICK tester")) - -((~user-extra 10 "USER user 0 * :tester") - (0 ":irc.barnet.org 462 tester :You may not reregister")) - ((mode 20 "MODE #bar") (0 ":irc.barnet.org 324 tester #bar +nt") (0 ":irc.barnet.org 329 tester #bar 1616149403") diff --git a/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/foil-rename/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/gapless-connect/foonet.lispdata similarity index 51% rename from test/lisp/erc/erc-scenarios-resources/48598/rebuffed/foil-rename/foonet.lispdata rename to test/lisp/erc/erc-scenarios-resources/base/gapless-connect/foonet.lispdata index cb77503244..dc76a7307f 100644 --- a/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/foil-rename/foonet.lispdata +++ b/test/lisp/erc/erc-scenarios-resources/base/gapless-connect/foonet.lispdata @@ -15,34 +15,27 @@ (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") - (0 ":irc.foonet.org 422 tester :MOTD File is missing") - (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) - (0 ":tester!~u@8cgjyczyrjgby.irc JOIN #foo") - (0 ":irc.foonet.org 353 tester = #foo :@bob alice tester") +((mode-user 3.2 "MODE tester +i") + ;; No mode answer + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":tester!~u@xrir8fpe4d7ak.irc JOIN #foo") + (0 ":irc.foonet.org 353 tester = #foo :joe @mike tester") (0 ":irc.foonet.org 366 tester #foo :End of /NAMES list.") - (0 ":***!znc@znc.in PRIVMSG #foo :Buffer Playback...") - (0 ":alice!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:28] tester, welcome!") - (0 ":bob!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:28] tester, welcome!") - (0 ":bob!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:29] alice: Pardon, sir; error: he is not quantity enough for that Worthy's thumb: he is not so big as the end of his club.") - (0 ":alice!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:34] bob: Go, fetch him hither: let me look upon him.") - (0 ":bob!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:37] alice: Over-roasted rather; ready long ago.") - (0 ":alice!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:39] bob: Sir, there is especial commission come from Venice to depute Cassio in Othello's place.") - (0 ":bob!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:41] alice: In any proportion or in any language.") - (0 ":alice!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:46] bob: Come, bring them away: if these be good people in a common-weal that do nothing but use their abuses in common houses, I know no law: bring them away.") - (0 ":bob!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:51] alice: Wish'd himself the heaven's breath.") - (0 ":alice!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:53] bob: My general will forget my love and service.") - (0 ":bob!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:55] alice: Madam, all joy befall your Grace.") - (0 ":alice!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:23:58] bob: To be suspected; framed to make women false.") - (0 ":bob!~u@8cgjyczyrjgby.irc PRIVMSG #foo :[10:24:00] alice: Ay, of my pigeons, sir; nothing else.") + (0 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #foo :[07:02:41] bob: To-morrow is the joyful day, Audrey; to-morrow will we be married.") + (0 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :[07:02:44] alice: Why dost thou call them knaves ? thou know'st them not.") + (0 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #foo :[07:03:05] bob: Now, by the faith of my love, I will: tell me where it is.") + (0 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :[07:03:09] alice: Give me the letter; I will look on it.") (0 ":***!znc@znc.in PRIVMSG #foo :Playback Complete.") - (0 ":irc.foonet.org NOTICE tester :[11:29:00] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") (0 ":irc.foonet.org 305 tester :You are no longer marked as being away")) -((mode 10 "MODE #foo") +((mode 8 "MODE #foo") (0 ":irc.foonet.org 324 tester #foo +nt") - (0 ":irc.foonet.org 329 tester #foo 1616149403") - (0.1 ":alice!~u@8cgjyczyrjgby.irc PRIVMSG #foo :bob: To old Free-town, our common judgment-place.") - (0.1 ":bob!~u@8cgjyczyrjgby.irc PRIVMSG #foo :alice: To ask of whence you are: report it.")) + (0 ":irc.foonet.org 329 tester #foo 1619593200") + (0.1 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #foo :bob: By this hand, it will not kill a fly. But come, now I will be your Rosalind in a more coming-on disposition; and ask me what you will, I will grant it.") + (0.1 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :alice: That I must love a loathed enemy.") + (0.1 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #foo :bob: His discretion, I am sure, cannot carry his valour, for the goose carries not the fox. It is well: leave it to his discretion, and let us listen to the moon.") + (0.1 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #foo :alice: As living here and you no use of him.")) diff --git a/test/lisp/erc/erc-scenarios-resources/base/gapless-connect/pass-stub.lispdata b/test/lisp/erc/erc-scenarios-resources/base/gapless-connect/pass-stub.lispdata new file mode 100644 index 0000000000..0c8dfd19d0 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/gapless-connect/pass-stub.lispdata @@ -0,0 +1,4 @@ +;; -*- mode: lisp-data; -*- +((pass 3 "PASS :" token ":changeme")) + +((fake 1 "FAKE no op")) diff --git a/test/lisp/erc/erc-scenarios-resources/47522/ambiguous-join/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/legacy-autojoin/foonet.lispdata similarity index 51% rename from test/lisp/erc/erc-scenarios-resources/47522/ambiguous-join/foonet.lispdata rename to test/lisp/erc/erc-scenarios-resources/base/legacy-autojoin/foonet.lispdata index 140ea34541..344ba7c1da 100644 --- a/test/lisp/erc/erc-scenarios-resources/47522/ambiguous-join/foonet.lispdata +++ b/test/lisp/erc/erc-scenarios-resources/base/legacy-autojoin/foonet.lispdata @@ -7,7 +7,7 @@ (0 ":irc.foonet.org 003 tester :This server was created Tue, 04 May 2021 05:06:18 UTC") (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") - (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=FooNet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") @@ -16,27 +16,23 @@ (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") - (0 ":irc.foonet.org 422 tester :MOTD File is missing") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 3.2 "MODE tester +i") (0 ":irc.foonet.org 221 tester +i") (0 ":irc.foonet.org NOTICE tester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) -((join 1 "JOIN #chan") - (0 ":tester!~u@9hbxjx335qjjq.irc JOIN #chan") - (0 ":irc.foonet.org 353 tester = #chan :@bob alice tester") +((join 6 "JOIN #chan") + (0 ":tester!~u@9g6b728983yd2.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :alice tester @bob") (0 ":irc.foonet.org 366 tester #chan :End of NAMES list")) -((mode 2 "MODE #chan") +((mode 5 "MODE #chan") (0 ":irc.foonet.org 324 tester #chan +nt") - (0 ":irc.foonet.org 329 tester #chan 1620175913") - (0.1 ":bob!~u@24ebq8ma57rha.irc PRIVMSG #chan :tester, welcome!") - (0.1 ":alice!~u@24ebq8ma57rha.irc PRIVMSG #chan :tester, welcome!") - (0.1 ":bob!~u@24ebq8ma57rha.irc PRIVMSG #chan :alice: Ha! now I see thou art a fool, and fit for thy master.") - (0.1 ":alice!~u@24ebq8ma57rha.irc PRIVMSG #chan :bob: Answer as I call you. Nick Bottom, the weaver.") - (0.1 ":bob!~u@24ebq8ma57rha.irc PRIVMSG #chan :alice: Have lost a brace of kinsmen: all are punish'd.") - (0.1 ":alice!~u@24ebq8ma57rha.irc PRIVMSG #chan :bob: Truly, thou art damned like an ill-roasted egg, all on one side.") - (0.1 ":bob!~u@24ebq8ma57rha.irc PRIVMSG #chan :alice: Thou wouldst else have made thy tale large.") - (0.1 ":alice!~u@24ebq8ma57rha.irc PRIVMSG #chan :bob: And even for that do I love you the more.") - (0.1 ":bob!~u@24ebq8ma57rha.irc PRIVMSG #chan :alice: And let my spleenful sons this trull deflower.") - (0.1 ":alice!~u@24ebq8ma57rha.irc PRIVMSG #chan :bob: Truly, and to cast away honesty upon a foul slut were to put good meat into an unclean dish.") - (0.1 ":bob!~u@24ebq8ma57rha.irc PRIVMSG #chan :alice: Come, let's away; the strangers are all gone.") - (0.1 ":alice!~u@24ebq8ma57rha.irc PRIVMSG #chan :bob: You shall find of the king a husband, madam; you, sir, a father. He that so generally is at all times good, must of necessity hold his virtue to you, whose worthiness would stir it up where it wanted rather than lack it where there is such abundance.")) + (0 ":irc.foonet.org 329 tester #chan 1620104779") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :tester, welcome!") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :tester, welcome!") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :alice: But, as it seems, did violence on herself.") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :bob: Well, this is the forest of Arden.") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :bob: And will you, being a man of your breeding, be married under a bush, like a beggar ? Get you to church, and have a good priest that can tell you what marriage is: this fellow will but join you together as they join wainscot; then one of you will prove a shrunk panel, and like green timber, warp, warp.") + (0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :alice: Live, and be prosperous; and farewell, good fellow.")) diff --git a/test/lisp/erc/erc-scenarios-resources/base/reconnect-timer/foonet-last.lispdata b/test/lisp/erc/erc-scenarios-resources/base/reconnect-timer/foonet-last.lispdata new file mode 100644 index 0000000000..3a1f303101 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/reconnect-timer/foonet-last.lispdata @@ -0,0 +1,5 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.znc.in 464 tester :Invalid Password")) diff --git a/test/lisp/erc/erc-scenarios-resources/base/reconnect-timer/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/reconnect-timer/foonet.lispdata new file mode 100644 index 0000000000..95c6af8d88 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/reconnect-timer/foonet.lispdata @@ -0,0 +1,6 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.znc.in 464 tester :Invalid Password")) +((drop 0 DROP)) diff --git a/test/lisp/erc/erc-scenarios-resources/base/renick/queries/bouncer-barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/renick/queries/bouncer-barnet.lispdata new file mode 100644 index 0000000000..9755920f37 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/renick/queries/bouncer-barnet.lispdata @@ -0,0 +1,54 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :barnet:changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") + (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.barnet.org 003 tester :This server was created Tue, 01 Jun 2021 07:49:23 UTC") + (0 ":irc.barnet.org 004 tester irc.barnet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.barnet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.barnet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=barnet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.barnet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.barnet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.barnet.org 252 tester 0 :IRC Operators online") + (0 ":irc.barnet.org 254 tester 1 :channels formed") + (0 ":irc.barnet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.barnet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.barnet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + ;; No mode answer + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":tester!~u@286u8jcpis84e.irc JOIN #chan") + (0 ":irc.barnet.org 353 tester = #chan :@joe mike rando tester") + (0 ":irc.barnet.org 366 tester #chan :End of /NAMES list.") + (0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") + (0 ":joe!~u@286u8jcpis84e.irc PRIVMSG #chan :[09:19:19] mike: Chi non te vede, non te pretia.") + (0 ":mike!~u@286u8jcpis84e.irc PRIVMSG #chan :[09:19:28] joe: The valiant heart's not whipt out of his trade.") + (0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.") + (0 ":rando!~u@95i756tt32ym8.irc PRIVMSG tester :[09:18:20] Why'd you pull that scene at the arcade?") + (0 ":rando!~u@95i756tt32ym8.irc PRIVMSG tester :[09:18:32] I had to mess up this rentacop came after me with nunchucks.") + (0 ":irc.barnet.org NOTICE tester :[09:13:24] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":irc.barnet.org 305 tester :You are no longer marked as being away")) + +((mode 1 "MODE #chan") + (0 ":irc.barnet.org 324 tester #chan +nt") + (0 ":irc.barnet.org 329 tester #chan 1622538742") + (0.1 ":joe!~u@286u8jcpis84e.irc PRIVMSG #chan :mike: By favours several which they did bestow.") + (0.1 ":mike!~u@286u8jcpis84e.irc PRIVMSG #chan :joe: You, Roderigo! come, sir, I am for you.")) + +((privmsg-a 5 "PRIVMSG rando :Linda said you were gonna kill me.") + (0.1 ":joe!~u@286u8jcpis84e.irc PRIVMSG #chan :mike: Play, music, then! Nay, you must do it soon.") + (0.1 ":rando!~u@95i756tt32ym8.irc PRIVMSG tester :Linda said? I never saw her before I came up here.") + (0.1 ":mike!~u@286u8jcpis84e.irc PRIVMSG #chan :joe: Of arts inhibited and out of warrant.")) + +((privmsg-b 3 "PRIVMSG rando :You aren't with Wage?") + (0.1 ":joe!~u@286u8jcpis84e.irc PRIVMSG #chan :mike: But most of all, agreeing with the proclamation.") + (0.1 ":rando!~u@95i756tt32ym8.irc PRIVMSG tester :I think you screwed up, Case.") + (0.1 ":mike!~u@286u8jcpis84e.irc PRIVMSG #chan :joe: Good gentleman, go your gait, and let poor volk pass. An chud ha' bin zwaggered out of my life, 'twould not ha' bin zo long as 'tis by a vortnight. Nay, come not near th' old man; keep out, che vor ye, or ise try whether your costard or my ballow be the harder. Chill be plain with you.") + ;; Nick change + (0.1 ":rando!~u@95i756tt32ym8.irc NICK frenemy") + (0.1 ":joe!~u@286u8jcpis84e.irc PRIVMSG #chan :mike: Till time beget some careful remedy.") + (0.1 ":frenemy!~u@95i756tt32ym8.irc PRIVMSG tester :I showed up and you just fit me right into your reality picture.") + (0.1 ":mike!~u@286u8jcpis84e.irc PRIVMSG #chan :joe: For I have lost him on a dangerous sea.")) diff --git a/test/lisp/erc/erc-scenarios-resources/base/renick/queries/bouncer-foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/renick/queries/bouncer-foonet.lispdata new file mode 100644 index 0000000000..0af67935a5 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/renick/queries/bouncer-foonet.lispdata @@ -0,0 +1,52 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :foonet:changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Tue, 01 Jun 2021 07:49:22 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + ;; No mode answer + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":tester!~u@u4mvbswyw8gbg.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :alice @bob rando tester") + (0 ":irc.foonet.org 366 tester #chan :End of /NAMES list.") + (0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") + (0 ":bob!~u@u4mvbswyw8gbg.irc PRIVMSG #chan :[09:19:28] alice: Great men should drink with harness on their throats.") + (0 ":alice!~u@u4mvbswyw8gbg.irc PRIVMSG #chan :[09:19:31] bob: Your lips will feel them the sooner: shallow again. A more sounder instance; come.") + (0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.") + (0 ":rando!~u@bivkhq8yav938.irc PRIVMSG tester :[09:17:51] u thur?") + (0 ":rando!~u@bivkhq8yav938.irc PRIVMSG tester :[09:17:58] guess not") + (0 ":irc.foonet.org NOTICE tester :[09:12:53] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":irc.foonet.org 305 tester :You are no longer marked as being away")) + +((mode 1 "MODE #chan") + (0 ":irc.foonet.org 324 tester #chan +nt") + (0 ":irc.foonet.org 329 tester #chan 1622538742") + (0.1 ":bob!~u@u4mvbswyw8gbg.irc PRIVMSG #chan :alice: When there is nothing living but thee, thou shalt be welcome. I had rather be a beggar's dog than Apemantus.") + (0.1 ":alice!~u@u4mvbswyw8gbg.irc PRIVMSG #chan :bob: You have simply misused our sex in your love-prate: we must have your doublot and hose plucked over your head, and show the world what the bird hath done to her own nest.")) + +((privmsg-a 3 "PRIVMSG rando :I here") + (0.1 ":bob!~u@u4mvbswyw8gbg.irc PRIVMSG #chan :alice: And I will make thee think thy swan a crow.") + (0.1 ":rando!~u@bivkhq8yav938.irc PRIVMSG tester :u are dumb") + (0.1 ":alice!~u@u4mvbswyw8gbg.irc PRIVMSG #chan :bob: Lie not, to say mine eyes are murderers.")) + +((privmsg-b 3 "PRIVMSG rando :not so") + (0.1 ":bob!~u@u4mvbswyw8gbg.irc PRIVMSG #chan :alice: Commit myself, my person, and the cause.") + ;; Nick change + (0.1 ":rando!~u@bivkhq8yav938.irc NICK frenemy") + (0.1 ":alice!~u@u4mvbswyw8gbg.irc PRIVMSG #chan :bob: Of raging waste! It cannot hold; it will not.") + (0.1 ":frenemy!~u@bivkhq8yav938.irc PRIVMSG tester :doubly so") + (0.1 ":bob!~u@u4mvbswyw8gbg.irc PRIVMSG #chan :alice: These words are razors to my wounded heart.")) diff --git a/test/lisp/erc/erc-scenarios-resources/base/renick/queries/solo.lispdata b/test/lisp/erc/erc-scenarios-resources/base/renick/queries/solo.lispdata new file mode 100644 index 0000000000..b3189871aa --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/renick/queries/solo.lispdata @@ -0,0 +1,55 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :foonet:changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Mon, 31 May 2021 09:56:24 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 4 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 254 tester 2 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 4 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 4 4 :Current local users 4, max 4") + (0 ":irc.foonet.org 266 tester 4 4 :Current global users 4, max 4") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + ;; No mode answer + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":tester!~u@gq7yjr7gsu7nn.irc JOIN #foo") + (0 ":irc.foonet.org 353 tester = #foo :alice @bob Lal tester") + (0 ":irc.foonet.org 366 tester #foo :End of /NAMES list.") + (0 ":***!znc@znc.in PRIVMSG #foo :Buffer Playback...") + (0 ":alice!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :[10:00:02] bob: All that he is hath reference to your highness.") + (0 ":bob!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :[10:00:06] alice: Excellent workman! Thou canst not paint a man so bad as is thyself.") + (0 ":***!znc@znc.in PRIVMSG #foo :Playback Complete.") + (0 ":irc.foonet.org NOTICE tester :[09:56:57] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":irc.foonet.org 305 tester :You are no longer marked as being away")) + +((mode 1 "MODE #foo") + (0 ":irc.foonet.org 324 tester #foo +nt") + (0 ":irc.foonet.org 329 tester #foo 1622454985") + (0.1 ":alice!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :bob: Farewell, pretty lady: you must hold the credit of your father.") + (0.1 ":bob!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :alice: On Thursday, sir ? the time is very short.")) + +((privmsg-a 10 "PRIVMSG #foo :hi") + (0.2 ":Lal!~u@b82mytupn2t5k.irc PRIVMSG tester :hello") + (0.2 ":bob!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :alice: And brought to yoke, the enemies of Rome.") + (0.2 ":alice!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :bob: Thou art thy father's daughter; there's enough.")) + +((privmsg-b 10 "PRIVMSG Lal :hi") + (0.2 ":bob!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :alice: Here are the beetle brows shall blush for me.") + (0.2 ":Lal!~u@b82mytupn2t5k.irc NICK Linguo") + (0.2 ":alice!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :bob: He hath abandoned his physicians, madam; under whose practices he hath persecuted time with hope, and finds no other advantage in the process but only the losing of hope by time.")) + +((privmsg-c 10 "PRIVMSG Linguo :howdy Linguo") + (0.1 ":bob!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :alice: And brought to yoke, the enemies of Rome.") + (0.2 ":Linguo!~u@b82mytupn2t5k.irc PART #foo")) + +((part 10 "PART #foo :\2ERC\2") + (0 ":tester!~u@gq7yjr7gsu7nn.irc PART #foo :\2ERC\2") + (0.1 ":Linguo!~u@b82mytupn2t5k.irc PRIVMSG tester :get along little doggie")) diff --git a/test/lisp/erc/erc-scenarios-resources/base/renick/self/auto.lispdata b/test/lisp/erc/erc-scenarios-resources/base/renick/self/auto.lispdata new file mode 100644 index 0000000000..5b9c26738d --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/renick/self/auto.lispdata @@ -0,0 +1,46 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :foonet:changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the FooNet Internet Relay Chat Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org[188.240.145.101/6697], running version solanum-1.0-dev") + (0 ":irc.foonet.org 003 tester :This server was created Sat May 22 2021 at 19:04:17 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org solanum-1.0-dev DGQRSZaghilopsuwz CFILMPQSbcefgijklmnopqrstuvz bkloveqjfI") + (0 ":irc.foonet.org 005 tester WHOX FNC KNOCK SAFELIST ELIST=CTU CALLERID=g MONITOR=100 ETRACE CHANTYPES=# EXCEPTS INVEX CHANMODES=eIbq,k,flj,CFLMPQScgimnprstuz :are supported by this server") + (0 ":irc.foonet.org 005 tester CHANLIMIT=#:250 PREFIX=(ov)@+ MAXLIST=bqeI:100 MODES=4 NETWORK=foonet STATUSMSG=@+ CASEMAPPING=rfc1459 NICKLEN=16 MAXNICKLEN=16 CHANNELLEN=50 TOPICLEN=390 DEAF=D :are supported by this server") + (0 ":irc.foonet.org 005 tester TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,PRIVMSG:4,NOTICE:4,ACCEPT:,MONITOR: EXTBAN=$,ajrxz CLIENTVER=3.0 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 33 users and 14113 invisible on 17 servers") + (0 ":irc.foonet.org 252 tester 34 :IRC Operators online") + (0 ":irc.foonet.org 254 tester 12815 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 726 clients and 1 servers") + (0 ":irc.foonet.org 265 tester 726 739 :Current local users 726, max 739") + (0 ":irc.foonet.org 266 tester 14146 14541 :Current global users 14146, max 14541") + (0 ":irc.foonet.org 250 tester :Highest connection count: 740 (739 clients) (3790 connections received)") + (0 ":tester!~u@gq7yjr7gsu7nn.irc NICK :dummy") + (0 ":irc.foonet.org 375 dummy :- irc.foonet.org Message of the Day - ") + (0 ":irc.foonet.org 372 dummy :- This server provided by NORDUnet/SUNET") + (0 ":irc.foonet.org 372 dummy :- Welcome to foonet, the IRC network for free & open-source software") + (0 ":irc.foonet.org 372 dummy :- and peer directed projects.") + (0 ":irc.foonet.org 372 dummy :- ") + (0 ":irc.foonet.org 372 dummy :- Please visit us in #libera for questions and support.") + (0 ":irc.foonet.org 376 dummy :End of /MOTD command.")) + +((mode-user 1.2 "MODE dummy +i") + (0 ":dummy!~u@gq7yjr7gsu7nn.irc MODE dummy :+RZi") + (0 ":irc.znc.in 306 dummy :You have been marked as being away") + (0 ":dummy!~u@gq7yjr7gsu7nn.irc JOIN #foo") + + (0 ":irc.foonet.org 353 dummy = #foo :alice @bob Lal dummy") + (0 ":irc.foonet.org 366 dummy #foo :End of /NAMES list.") + (0 ":***!znc@znc.in PRIVMSG #foo :Buffer Playback...") + (0 ":alice!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :[10:00:02] bob: All that he is hath reference to your highness.") + (0 ":bob!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :[10:00:06] alice: Excellent workman! Thou canst not paint a man so bad as is thyself.") + (0 ":***!znc@znc.in PRIVMSG #foo :Playback Complete.") + (0 ":irc.foonet.org NOTICE dummy :[09:56:57] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":irc.foonet.org 305 dummy :You are no longer marked as being away")) + +((mode 1 "MODE #foo") + (0 ":irc.foonet.org 324 dummy #foo +nt") + (0 ":irc.foonet.org 329 dummy #foo 1622454985") + (0.1 ":alice!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :bob: Farewell, pretty lady: you must hold the credit of your father.") + (0.1 ":bob!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :alice: On Thursday, sir ? the time is very short.")) diff --git a/test/lisp/erc/erc-scenarios-resources/base/renick/self/manual.lispdata b/test/lisp/erc/erc-scenarios-resources/base/renick/self/manual.lispdata new file mode 100644 index 0000000000..dd107b806d --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/renick/self/manual.lispdata @@ -0,0 +1,50 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :foonet:changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the FooNet Internet Relay Chat Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org[188.240.145.101/6697], running version solanum-1.0-dev") + (0 ":irc.foonet.org 003 tester :This server was created Sat May 22 2021 at 19:04:17 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org solanum-1.0-dev DGQRSZaghilopsuwz CFILMPQSbcefgijklmnopqrstuvz bkloveqjfI") + (0 ":irc.foonet.org 005 tester WHOX FNC KNOCK SAFELIST ELIST=CTU CALLERID=g MONITOR=100 ETRACE CHANTYPES=# EXCEPTS INVEX CHANMODES=eIbq,k,flj,CFLMPQScgimnprstuz :are supported by this server") + (0 ":irc.foonet.org 005 tester CHANLIMIT=#:250 PREFIX=(ov)@+ MAXLIST=bqeI:100 MODES=4 NETWORK=foonet STATUSMSG=@+ CASEMAPPING=rfc1459 NICKLEN=16 MAXNICKLEN=16 CHANNELLEN=50 TOPICLEN=390 DEAF=D :are supported by this server") + (0 ":irc.foonet.org 005 tester TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,PRIVMSG:4,NOTICE:4,ACCEPT:,MONITOR: EXTBAN=$,ajrxz CLIENTVER=3.0 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 33 users and 14113 invisible on 17 servers") + (0 ":irc.foonet.org 252 tester 34 :IRC Operators online") + (0 ":irc.foonet.org 254 tester 12815 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 726 clients and 1 servers") + (0 ":irc.foonet.org 265 tester 726 739 :Current local users 726, max 739") + (0 ":irc.foonet.org 266 tester 14146 14541 :Current global users 14146, max 14541") + (0 ":irc.foonet.org 250 tester :Highest connection count: 740 (739 clients) (3790 connections received)") + (0 ":irc.foonet.org 375 tester :- irc.foonet.org Message of the Day - ") + (0 ":irc.foonet.org 372 tester :- This server provided by NORDUnet/SUNET") + (0 ":irc.foonet.org 372 tester :- Welcome to foonet, the IRC network for free & open-source software") + (0 ":irc.foonet.org 372 tester :- and peer directed projects.") + (0 ":irc.foonet.org 372 tester :- ") + (0 ":irc.foonet.org 372 tester :- Please visit us in #libera for questions and support.") + (0 ":irc.foonet.org 376 tester :End of /MOTD command.")) + +((mode-user 1.2 "MODE tester +i") + (0 ":tester!~u@gq7yjr7gsu7nn.irc MODE tester :+RZi") + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":tester!~u@gq7yjr7gsu7nn.irc JOIN #foo") + + (0 ":irc.foonet.org 353 tester = #foo :alice @bob Lal tester") + (0 ":irc.foonet.org 366 tester #foo :End of /NAMES list.") + (0 ":***!znc@znc.in PRIVMSG #foo :Buffer Playback...") + (0 ":alice!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :[10:00:02] bob: All that he is hath reference to your highness.") + (0 ":bob!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :[10:00:06] alice: Excellent workman! Thou canst not paint a man so bad as is thyself.") + (0 ":***!znc@znc.in PRIVMSG #foo :Playback Complete.") + (0 ":irc.foonet.org NOTICE tester :[09:56:57] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":irc.foonet.org 305 tester :You are no longer marked as being away")) + +((mode 1 "MODE #foo") + (0 ":irc.foonet.org 324 tester #foo +nt") + (0 ":irc.foonet.org 329 tester #foo 1622454985") + (0.1 ":alice!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :bob: Farewell, pretty lady: you must hold the credit of your father.") + (0.1 ":bob!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :alice: On Thursday, sir ? the time is very short.")) + +((nick 2 "NICK dummy") + (0 ":tester!~u@gq7yjr7gsu7nn.irc NICK :dummy") + (0.1 ":dummy!~u@gq7yjr7gsu7nn.irc MODE dummy :+RZi") + (0.1 ":bob!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :dummy: Hi.")) diff --git a/test/lisp/erc/erc-scenarios-resources/base/renick/self/qual-chester.lispdata b/test/lisp/erc/erc-scenarios-resources/base/renick/self/qual-chester.lispdata new file mode 100644 index 0000000000..75b50fe68b --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/renick/self/qual-chester.lispdata @@ -0,0 +1,40 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :changeme")) +((nick 1 "NICK chester")) +((user 1 "USER user 0 * :chester") + (0 ":irc.foonet.org 001 chester :Welcome to the foonet IRC Network chester") + (0 ":irc.foonet.org 002 chester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 chester :This server was created Sun, 13 Jun 2021 05:45:20 UTC") + (0 ":irc.foonet.org 004 chester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 chester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 chester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 chester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 chester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 chester 0 :IRC Operators online") + (0 ":irc.foonet.org 253 chester 1 :unregistered connections") + (0 ":irc.foonet.org 254 chester 1 :channels formed") + (0 ":irc.foonet.org 255 chester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 chester 3 4 :Current local users 3, max 4") + (0 ":irc.foonet.org 266 chester 3 4 :Current global users 3, max 4") + (0 ":irc.foonet.org 422 chester :MOTD File is missing")) + +((mode-user 1.2 "MODE chester +i") + (0 ":irc.foonet.org 221 chester +i") + (0 ":irc.foonet.org NOTICE chester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) + +((join 14 "JOIN #chan") + (0 ":chester!~u@yuvqisyu7m7qs.irc JOIN #chan") + (0 ":irc.foonet.org 353 chester = #chan :tester chester @alice bob") + (0 ":irc.foonet.org 366 chester #chan :End of NAMES list")) + +((mode 10 "MODE #chan") + (0.0 ":irc.foonet.org 324 chester #chan +nt") + (0.0 ":irc.foonet.org 329 chester #chan 1623563121") + (0.0 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :chester, welcome!") + (0.0 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :chester, welcome!") + (0 ":tester!~u@gq7yjr7gsu7nn.irc NICK :dummy") + (0.1 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :alice: That ever eye with sight made heart lament.") + (0.1 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :bob: The bitter past, more welcome is the sweet.") + (0.1 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :alice: Dispatch, I say, and find the forester.")) + +((linger 10 LINGER)) diff --git a/test/lisp/erc/erc-scenarios-resources/base/renick/self/qual-tester.lispdata b/test/lisp/erc/erc-scenarios-resources/base/renick/self/qual-tester.lispdata new file mode 100644 index 0000000000..2519922665 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/renick/self/qual-tester.lispdata @@ -0,0 +1,46 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Sun, 13 Jun 2021 05:45:20 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 4 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 253 tester 0 :unregistered connections") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 4 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 4 4 :Current local users 4, max 4") + (0 ":irc.foonet.org 266 tester 4 4 :Current global users 4, max 4") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + (0 ":irc.foonet.org 221 tester +i") + (0 ":irc.foonet.org NOTICE tester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) + +((join 15 "JOIN #chan") + (0 ":tester!~u@yuvqisyu7m7qs.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :tester @alice bob") + (0 ":irc.foonet.org 366 tester #chan :End of NAMES list")) + +((mode 10 "MODE #chan") + (0.0 ":irc.foonet.org 324 tester #chan +nt") + (0.0 ":irc.foonet.org 329 tester #chan 1623563121") + (0.0 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :tester, welcome!") + (0.0 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :tester, welcome!") + (0.1 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :alice: Marry, that, I think, be young Petruchio.") + (0.4 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :bob: You speak of him when he was less furnished than now he is with that which makes him both without and within.") + (0.2 ":chester!~u@yuvqisyu7m7qs.irc JOIN #chan") + (0.1 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :chester, welcome!") + (0.1 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :chester, welcome!")) + +((nick 5 "NICK dummy") + (0 ":tester!~u@gq7yjr7gsu7nn.irc NICK :dummy") + (0.1 ":dummy!~u@gq7yjr7gsu7nn.irc MODE dummy :+RZi") + (0.1 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :alice: That ever eye with sight made heart lament.") + (0.1 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :bob: The bitter past, more welcome is the sweet.") + (0.1 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :alice: Dispatch, I say, and find the forester.")) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/reuseless/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/reuse-buffers/server-buffers/barnet.lispdata similarity index 92% rename from test/lisp/erc/erc-scenarios-resources/48598/rebuffed/reuseless/barnet.lispdata rename to test/lisp/erc/erc-scenarios-resources/base/reuse-buffers/server-buffers/barnet.lispdata index 1e30e9e0b2..2c4264c746 100644 --- a/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/reuseless/barnet.lispdata +++ b/test/lisp/erc/erc-scenarios-resources/base/reuse-buffers/server-buffers/barnet.lispdata @@ -1,8 +1,7 @@ ;; -*- mode: lisp-data; -*- ((pass 1 "PASS :barnet:changeme")) ((nick 1 "NICK tester")) - -((~user 2 "USER user 0 * :tester") +((user 2 "USER user 0 * :tester") (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.6.0-7481bf0385b95b16") (0 ":irc.barnet.org 003 tester :This server was created Sun, 25 Apr 2021 11:28:28 UTC") @@ -16,9 +15,10 @@ (0 ":irc.barnet.org 255 tester :I have 3 clients and 0 servers") (0 ":irc.barnet.org 265 tester 3 3 :Current local users 3, max 3") (0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") - (0 ":irc.barnet.org 422 tester :MOTD File is missing") + (0 ":irc.barnet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + ;; No mode answer (0 ":irc.znc.in 306 tester :You have been marked as being away") (0 ":irc.barnet.org NOTICE tester :[11:29:00] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") (0 ":irc.barnet.org 305 tester :You are no longer marked as being away")) - -((~eof 2 EOF)) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/reuseless/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/reuse-buffers/server-buffers/foonet.lispdata similarity index 94% rename from test/lisp/erc/erc-scenarios-resources/48598/rebuffed/reuseless/foonet.lispdata rename to test/lisp/erc/erc-scenarios-resources/base/reuse-buffers/server-buffers/foonet.lispdata index 7952fb1d6e..2a8418eecf 100644 --- a/test/lisp/erc/erc-scenarios-resources/48598/rebuffed/reuseless/foonet.lispdata +++ b/test/lisp/erc/erc-scenarios-resources/base/reuse-buffers/server-buffers/foonet.lispdata @@ -15,7 +15,10 @@ (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") - (0 ":irc.foonet.org 422 tester :MOTD File is missing") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + ;; No mode answer (0 ":irc.znc.in 306 tester :You have been marked as being away") (0 ":irc.foonet.org NOTICE tester :[11:29:00] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") (0 ":irc.foonet.org 305 tester :You are no longer marked as being away")) diff --git a/test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/barnet-again.lispdata b/test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/barnet-again.lispdata new file mode 100644 index 0000000000..62d17692cf --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/barnet-again.lispdata @@ -0,0 +1,50 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :barnet:changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") + (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.barnet.org 003 tester :This server was created Wed, 12 May 2021 07:41:08 UTC") + (0 ":irc.barnet.org 004 tester irc.barnet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.barnet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.barnet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=barnet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.barnet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.barnet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.barnet.org 252 tester 0 :IRC Operators online") + (0 ":irc.barnet.org 254 tester 1 :channels formed") + (0 ":irc.barnet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.barnet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.barnet.org 422 tester :MOTD File is missing")) + +((mode-user 2.2 "MODE tester +i") + ;; No mode answer ^ + + (0 ":tester!~u@xrir8fpe4d7ak.irc JOIN #chan") + (0 ":irc.barnet.org 353 tester = #chan :joe @mike tester") + (0 ":irc.barnet.org 366 tester #chan :End of /NAMES list.") + (0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") + (0 ":joe!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :[07:04:25] mike: Belike, for joy the emperor hath a son.") + (0 ":mike!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :[07:04:27] joe: Protest their first of manhood.") + (0 ":joe!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :[07:04:29] mike: As frozen water to a starved snake.") + (0 ":mike!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :[07:04:34] joe: My mirth it much displeas'd, but pleas'd my woe.") + (0 ":joe!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :[07:04:38] mike: Why, Marcus, no man should be mad but I.") + (0 ":mike!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :[07:04:44] joe: Faith, I have heard too much, for your words and performances are no kin together.") + (0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.") + (0 ":irc.barnet.org NOTICE tester :[07:00:01] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":irc.barnet.org 305 tester :You are no longer marked as being away")) + +((~join 3 "JOIN #chan")) + +((mode 2 "MODE #chan") + (0 ":irc.barnet.org 324 tester #chan +nt") + (0 ":irc.barnet.org 329 tester #chan 1620805269") + (0.1 ":joe!~u@svpn88yjcdj42.irc PRIVMSG #chan :mike: But, in defence, by mercy, 'tis most just.") + (0.1 ":mike!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :joe: The Marshal of France, Monsieur la Far.") + (0.1 ":joe!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :mike: And bide the penance of each three years' day.") + (0.1 ":mike!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :joe: Madam, within; but never man so chang'd.") + (0.1 ":joe!~u@xrir8fpe4d7ak.irc PRIVMSG #chan :mike: As much in private, and I'll bid adieu.")) + +((linger 4 LINGER)) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/barnet-drop.lispdata similarity index 55% rename from test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/barnet.lispdata rename to test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/barnet-drop.lispdata index c5b18cea3f..9b5edd6208 100644 --- a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/autojoin/barnet.lispdata +++ b/test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/barnet-drop.lispdata @@ -1,10 +1,10 @@ ;; -*- mode: lisp-data; -*- -((pass 2 "PASS :barnet:changeme")) -((nick 2 "NICK tester")) +((pass 1 "PASS :barnet:changeme")) +((nick 1 "NICK tester")) ((user 1 "USER user 0 * :tester") (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.6.0-7481bf0385b95b16") - (0 ":irc.barnet.org 003 tester :This server was created Mon, 10 May 2021 00:58:22 UTC") + (0 ":irc.barnet.org 003 tester :This server was created Wed, 12 May 2021 07:41:08 UTC") (0 ":irc.barnet.org 004 tester irc.barnet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") (0 ":irc.barnet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") (0 ":irc.barnet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=barnet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") @@ -17,24 +17,25 @@ (0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") (0 ":irc.barnet.org 422 tester :MOTD File is missing")) -((join 2 "JOIN #chan") - (0 ":tester!~u@6yximxrnkg65a.irc JOIN #chan") +((mode-user 1.2 "MODE tester +i") + ;; No mode answer ^ + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":irc.barnet.org 305 tester :You are no longer marked as being away")) + +((join 1 "JOIN #chan") + (0 ":tester!~u@awyxgybtkx7uq.irc JOIN #chan") (0 ":irc.barnet.org 353 tester = #chan :@joe mike tester") (0 ":irc.barnet.org 366 tester #chan :End of NAMES list") - (0.1 ":joe!~u@6yximxrnkg65a.irc PRIVMSG #chan :tester, welcome!") - (0 ":mike!~u@6yximxrnkg65a.irc PRIVMSG #chan :tester, welcome!")) + (0.1 ":joe!~u@awyxgybtkx7uq.irc PRIVMSG #chan :tester, welcome!") + (0 ":mike!~u@awyxgybtkx7uq.irc PRIVMSG #chan :tester, welcome!")) ((mode 1 "MODE #chan") (0 ":irc.barnet.org 324 tester #chan +nt") - (0 ":irc.barnet.org 329 tester #chan 1620608304") - ;; Wait for foonet's buffer playback - (0.1 ":mike!~u@6yximxrnkg65a.irc PRIVMSG #chan :joe: Go take her hence, and marry her instantly.") - (0.1 ":joe!~u@6yximxrnkg65a.irc PRIVMSG #chan :mike: Of all the four, or the three, or the two, or one of the four.") - (0.1 ":mike!~u@6yximxrnkg65a.irc PRIVMSG #chan :joe: And gives the crutch the cradle's infancy.") - (0.1 ":joe!~u@6yximxrnkg65a.irc PRIVMSG #chan :mike: Such is the simplicity of man to hearken after the flesh.") - (0.05 ":mike!~u@6yximxrnkg65a.irc PRIVMSG #chan :joe: The leaf to read them. Let us toward the king.") - (0.05 ":joe!~u@6yximxrnkg65a.irc PRIVMSG #chan :mike: Many can brook the weather that love not the wind.") - (0.05 ":mike!~u@6yximxrnkg65a.irc PRIVMSG #chan :joe: And now, dear maid, be you as free to us.") - (0.00 ":joe!~u@6yximxrnkg65a.irc PRIVMSG #chan :mike: He hath an uncle here in Messina will be very much glad of it.")) + (0 ":irc.barnet.org 329 tester #chan 1620805269") + (0.1 ":mike!~u@awyxgybtkx7uq.irc PRIVMSG #chan :joe: But you have outfaced them all.") + (0.1 ":joe!~u@awyxgybtkx7uq.irc PRIVMSG #chan :mike: Why, will shall break it; will, and nothing else.") + (0.1 ":mike!~u@awyxgybtkx7uq.irc PRIVMSG #chan :joe: Yes, a dozen; and as many to the vantage, as would store the world they played for.") + (0.05 ":joe!~u@awyxgybtkx7uq.irc PRIVMSG #chan :mike: As he regards his aged father's life.") + (0.05 ":mike!~u@awyxgybtkx7uq.irc PRIVMSG #chan :joe: It is a rupture that you may easily heal; and the cure of it not only saves your brother, but keeps you from dishonour in doing it.")) -((linger 3.5 LINGER)) +((drop 0 DROP)) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/rename-buffers/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/barnet.lispdata similarity index 96% rename from test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/rename-buffers/barnet.lispdata rename to test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/barnet.lispdata index 4c2e9f209b..720e7cf8c8 100644 --- a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/rename-buffers/barnet.lispdata +++ b/test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/barnet.lispdata @@ -15,7 +15,10 @@ (0 ":irc.barnet.org 255 tester :I have 3 clients and 0 servers") (0 ":irc.barnet.org 265 tester 3 3 :Current local users 3, max 3") (0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") - (0 ":irc.barnet.org 422 tester :MOTD File is missing") + (0 ":irc.barnet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + ;; No mode answer ^ (0 ":irc.znc.in 306 tester :You have been marked as being away") (0 ":irc.barnet.org 305 tester :You are no longer marked as being away")) diff --git a/test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/foonet-again.lispdata b/test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/foonet-again.lispdata new file mode 100644 index 0000000000..b99beafc4b --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/foonet-again.lispdata @@ -0,0 +1,50 @@ +;; -*- mode: lisp-data; -*- +((pass 3 "PASS :foonet:changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Wed, 12 May 2021 07:41:09 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 2.2 "MODE tester +i") + ;; No mode answer ^ + (0 ":tester!~u@nvfhxvqm92rm6.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :alice @bob tester") + (0 ":irc.foonet.org 366 tester #chan :End of /NAMES list.") + (0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") + (0 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #chan :[07:04:02] alice: Here come the lovers, full of joy and mirth.") + (0 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #chan :[07:04:07] bob: According to the fool's bolt, sir, and such dulcet diseases.") + (0 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #chan :[07:04:10] alice: And hang himself. I pray you, do my greeting.") + (0 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #chan :[07:04:18] bob: And you sat smiling at his cruel prey.") + (0 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #chan :[07:04:21] alice: Or never after look me in the face.") + (0 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #chan :[07:04:25] bob: If that may be, than all is well. Come, sit down, every mother's son, and rehearse your parts. Pyramus, you begin: when you have spoken your speech, enter into that brake; and so every one according to his cue.") + (0 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #chan :[07:04:30] alice: Where I espied the panther fast asleep.") + (0 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #chan :[07:04:32] bob: Alas! he is too young: yet he looks successfully.") + (0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.") + + (0 ":irc.foonet.org NOTICE tester :[07:00:32] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":irc.foonet.org 305 tester :You are no longer marked as being away")) + +((~join 3 "JOIN #chan")) + +((mode 3 "MODE #chan") + (0 ":irc.foonet.org 324 tester #chan +nt") + (0 ":irc.foonet.org 329 tester #chan 1620805271") + (0.1 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #chan :bob: Grows, lives, and dies, in single blessedness.") + (0.1 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #chan :alice: For these two hours, Rosalind, I will leave thee.") + (0.1 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #chan :bob: By this hand, it will not kill a fly. But come, now I will be your Rosalind in a more coming-on disposition; and ask me what you will, I will grant it.") + (0.1 ":bob!~u@svpn88yjcdj42.irc PRIVMSG #chan :alice: That I must love a loathed enemy.") + (0.1 ":alice!~u@svpn88yjcdj42.irc PRIVMSG #chan :bob: As't please your lordship: I'll leave you.")) + +((linger 3 LINGER)) diff --git a/test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/foonet-drop.lispdata b/test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/foonet-drop.lispdata new file mode 100644 index 0000000000..630742603e --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/foonet-drop.lispdata @@ -0,0 +1,46 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :foonet:changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Wed, 12 May 2021 07:41:09 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + ;; No mode answer ^ + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":irc.foonet.org 305 tester :You are no longer marked as being away")) + +((join 1 "JOIN #chan") + (0 ":tester!~u@ertp7idh9jtgi.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :@alice bob tester") + (0 ":irc.foonet.org 366 tester #chan :End of NAMES list") + (0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :tester, welcome!") + (0 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :tester, welcome!")) + +((mode 1 "MODE #chan") + (0 ":irc.foonet.org 324 tester #chan +nt") + (0 ":irc.foonet.org 329 tester #chan 1620805271") + (0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :bob: He cannot be heard of. Out of doubt he is transported.") + (0.1 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :alice: More evident than this; for this was stol'n.") + (0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :bob: Sell when you can; you are not for all markets.") + (0.1 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :alice: There's the fool hangs on your back already.") + (0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :bob: Why, if you have a stomach to't, monsieur, if you think your mystery in stratagem can bring this instrument of honour again into its native quarter, be magnanimous in the enterprise and go on; I will grace the attempt for a worthy exploit: if you speed well in it, the duke shall both speak of it, and extend to you what further becomes his greatness, even to the utmost syllable of your worthiness.") + (0.1 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :alice: For he hath still been tried a holy man.") + (0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :bob: To have the touches dearest priz'd.") + (0.1 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :alice: And must advise the emperor for his good.") + (0.1 ":alice!~u@ertp7idh9jtgi.irc PRIVMSG #chan :bob: Orlando, my liege; the youngest son of Sir Rowland de Boys.") + (0.1 ":bob!~u@ertp7idh9jtgi.irc PRIVMSG #chan :alice: The ape is dead, and I must conjure him.")) + +((drop 0 DROP)) diff --git a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/rename-buffers/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/foonet.lispdata similarity index 96% rename from test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/rename-buffers/foonet.lispdata rename to test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/foonet.lispdata index b4fcd1985a..4bbef6abc7 100644 --- a/test/lisp/erc/erc-scenarios-resources/48598/clash-of-chans/rename-buffers/foonet.lispdata +++ b/test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/foonet.lispdata @@ -15,7 +15,10 @@ (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") - (0 ":irc.foonet.org 422 tester :MOTD File is missing") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + ;; No mode answer ^ (0 ":irc.znc.in 306 tester :You have been marked as being away") (0 ":irc.foonet.org 305 tester :You are no longer marked as being away")) diff --git a/test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/stub-again.lispdata b/test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/stub-again.lispdata new file mode 100644 index 0000000000..0c8dfd19d0 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/session-id/bouncer/stub-again.lispdata @@ -0,0 +1,4 @@ +;; -*- mode: lisp-data; -*- +((pass 3 "PASS :" token ":changeme")) + +((fake 1 "FAKE no op")) diff --git a/test/lisp/erc/erc-scenarios-resources/base/session-id/same-network/chester.lispdata b/test/lisp/erc/erc-scenarios-resources/base/session-id/same-network/chester.lispdata new file mode 100644 index 0000000000..2cdc1f263f --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/session-id/same-network/chester.lispdata @@ -0,0 +1,48 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :changeme")) +((nick 1 "NICK chester")) +((user 1 "USER user 0 * :chester") + (0 ":irc.foonet.org 001 chester :Welcome to the foonet IRC Network chester") + (0 ":irc.foonet.org 002 chester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 chester :This server was created Sun, 13 Jun 2021 05:45:20 UTC") + (0 ":irc.foonet.org 004 chester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 chester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 chester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 chester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 chester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 chester 0 :IRC Operators online") + (0 ":irc.foonet.org 253 chester 1 :unregistered connections") + (0 ":irc.foonet.org 254 chester 1 :channels formed") + (0 ":irc.foonet.org 255 chester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 chester 3 4 :Current local users 3, max 4") + (0 ":irc.foonet.org 266 chester 3 4 :Current global users 3, max 4") + (0 ":irc.foonet.org 422 chester :MOTD File is missing")) + +((mode-user 1.2 "MODE chester +i") + (0 ":irc.foonet.org 221 chester +i") + (0 ":irc.foonet.org NOTICE chester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) + +((join 14 "JOIN #chan") + (0 ":chester!~u@yuvqisyu7m7qs.irc JOIN #chan") + (0 ":irc.foonet.org 353 chester = #chan :tester chester @alice bob") + (0 ":irc.foonet.org 366 chester #chan :End of NAMES list")) + +((mode 10 "MODE #chan") + (0.0 ":irc.foonet.org 324 chester #chan +nt") + (0.0 ":irc.foonet.org 329 chester #chan 1623563121") + (0.0 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :chester, welcome!") + (0.0 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :chester, welcome!") + (0.1 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :alice: That ever eye with sight made heart lament.") + (0.1 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :bob: The bitter past, more welcome is the sweet.") + (0.1 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :alice: Dispatch, I say, and find the forester.") + (0.1 ":tester!~u@yuvqisyu7m7qs.irc PRIVMSG #chan :chester: hi") + (0.1 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :bob: This was lofty! Now name the rest of the players. This is Ercles' vein, a tyrant's vein; a lover is more condoling.")) + +((privmsg 4 "PRIVMSG #chan :hi tester") + (0.1 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :alice: As the ox hath his bow, sir, the horse his curb, and the falcon her bells, so man hath his desires; and as pigeons bill, so wedlock would be nibbling.") + (0.1 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :bob: Most friendship is feigning, most loving mere folly.") + (0.1 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :alice: To employ you towards this Roman. Come, our queen.")) + +((quit 5 "QUIT :" quit) + (0.0 ":tester!~u@yuvqisyu7m7qs.irc QUIT :Quit: " quit) + (0.0 ":chester!~u@yuvqisyu7m7qs.irc QUIT :Quit: " quit)) diff --git a/test/lisp/erc/erc-scenarios-resources/base/session-id/same-network/tester.lispdata b/test/lisp/erc/erc-scenarios-resources/base/session-id/same-network/tester.lispdata new file mode 100644 index 0000000000..38e505a101 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/session-id/same-network/tester.lispdata @@ -0,0 +1,52 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Sun, 13 Jun 2021 05:45:20 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 4 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 253 tester 0 :unregistered connections") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 4 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 4 4 :Current local users 4, max 4") + (0 ":irc.foonet.org 266 tester 4 4 :Current global users 4, max 4") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + (0 ":irc.foonet.org 221 tester +i") + (0 ":irc.foonet.org NOTICE tester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) + +((join 15 "JOIN #chan") + (0 ":tester!~u@yuvqisyu7m7qs.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :tester @alice bob") + (0 ":irc.foonet.org 366 tester #chan :End of NAMES list")) + +((mode 10 "MODE #chan") + (0.0 ":irc.foonet.org 324 tester #chan +nt") + (0.0 ":irc.foonet.org 329 tester #chan 1623563121") + (0.0 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :tester, welcome!") + (0.0 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :tester, welcome!") + (0.1 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :alice: Marry, that, I think, be young Petruchio.") + (0.4 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :bob: You speak of him when he was less furnished than now he is with that which makes him both without and within.") + (0.2 ":chester!~u@yuvqisyu7m7qs.irc JOIN #chan") + (0.1 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :chester, welcome!") + (0.1 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :chester, welcome!") + (0.1 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :alice: That ever eye with sight made heart lament.") + (0.1 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :bob: The bitter past, more welcome is the sweet.") + (0.1 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :alice: Dispatch, I say, and find the forester.")) + +((privmsg 3 "PRIVMSG #chan :chester: hi") + (0.1 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :bob: This was lofty! Now name the rest of the players. This is Ercles' vein, a tyrant's vein; a lover is more condoling.") + (0.1 ":chester!~u@yuvqisyu7m7qs.irc PRIVMSG #chan :hi tester") + (0.1 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :alice: As the ox hath his bow, sir, the horse his curb, and the falcon her bells, so man hath his desires; and as pigeons bill, so wedlock would be nibbling.") + (0.1 ":alice!~u@wyb9b355rgzi8.irc PRIVMSG #chan :bob: Most friendship is feigning, most loving mere folly.") + (0.1 ":bob!~u@wyb9b355rgzi8.irc PRIVMSG #chan :alice: To employ you towards this Roman. Come, our queen.")) + +((quit 4 "QUIT :" quit) + (0 ":tester!~u@yuvqisyu7m7qs.irc QUIT :Quit: " quit)) diff --git a/test/lisp/erc/erc-scenarios-resources/networks/announced-missing/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/networks/announced-missing/foonet.lispdata new file mode 100644 index 0000000000..79b0fb462a --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/networks/announced-missing/foonet.lispdata @@ -0,0 +1,8 @@ +;; -*- mode: lisp-data; -*- +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the FooNet Internet Relay Chat Network tester") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + (0 ":tester MODE tester :+Zi")) diff --git a/test/lisp/erc/erc-scenarios-resources/services/password/libera.lispdata b/test/lisp/erc/erc-scenarios-resources/services/password/libera.lispdata new file mode 100644 index 0000000000..c8dbc9d425 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/services/password/libera.lispdata @@ -0,0 +1,49 @@ +;; -*- mode: lisp-data; -*- +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0.26 ":zirconium.libera.chat NOTICE * :*** Checking Ident") + (0.01 ":zirconium.libera.chat NOTICE * :*** Looking up your hostname...") + (0.01 ":zirconium.libera.chat NOTICE * :*** No Ident response") + (0.02 ":zirconium.libera.chat NOTICE * :*** Found your hostname: static-198-54-131-100.cust.tzulo.com") + (0.02 ":zirconium.libera.chat 001 tester :Welcome to the Libera.Chat Internet Relay Chat Network tester") + (0.01 ":zirconium.libera.chat 002 tester :Your host is zirconium.libera.chat[46.16.175.175/6697], running version solanum-1.0-dev") + (0.03 ":zirconium.libera.chat 003 tester :This server was created Wed Jun 9 2021 at 01:38:28 UTC") + (0.02 ":zirconium.libera.chat 004 tester zirconium.libera.chat solanum-1.0-dev DGQRSZaghilopsuwz CFILMPQSbcefgijklmnopqrstuvz bkloveqjfI") + (0.00 ":zirconium.libera.chat 005 tester ETRACE WHOX FNC MONITOR=100 SAFELIST ELIST=CTU CALLERID=g KNOCK CHANTYPES=# EXCEPTS INVEX CHANMODES=eIbq,k,flj,CFLMPQScgimnprstuz :are supported by this server") + (0.03 ":zirconium.libera.chat 005 tester CHANLIMIT=#:250 PREFIX=(ov)@+ MAXLIST=bqeI:100 MODES=4 NETWORK=Libera.Chat STATUSMSG=@+ CASEMAPPING=rfc1459 NICKLEN=16 MAXNICKLEN=16 CHANNELLEN=50 TOPICLEN=390 DEAF=D :are supported by this server") + (0.02 ":zirconium.libera.chat 005 tester TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,PRIVMSG:4,NOTICE:4,ACCEPT:,MONITOR: EXTBAN=$,ajrxz CLIENTVER=3.0 :are supported by this server") + (0.02 ":zirconium.libera.chat 251 tester :There are 68 users and 37640 invisible on 25 servers") + (0.00 ":zirconium.libera.chat 252 tester 36 :IRC Operators online") + (0.01 ":zirconium.libera.chat 253 tester 5 :unknown connection(s)") + (0.00 ":zirconium.libera.chat 254 tester 19341 :channels formed") + (0.01 ":zirconium.libera.chat 255 tester :I have 3321 clients and 1 servers") + (0.01 ":zirconium.libera.chat 265 tester 3321 4289 :Current local users 3321, max 4289") + (0.00 ":zirconium.libera.chat 266 tester 37708 38929 :Current global users 37708, max 38929") + (0.01 ":zirconium.libera.chat 250 tester :Highest connection count: 4290 (4289 clients) (38580 connections received)") + (0.21 ":zirconium.libera.chat 375 tester :- zirconium.libera.chat Message of the Day - ") + (0.00 ":zirconium.libera.chat 372 tester :- This server provided by Seeweb ") + (0.01 ":zirconium.libera.chat 372 tester :- Welcome to Libera Chat, the IRC network for") + (0.01 ":zirconium.libera.chat 372 tester :- free & open-source software and peer directed projects.") + (0.00 ":zirconium.libera.chat 372 tester :- ") + (0.00 ":zirconium.libera.chat 372 tester :- Use of Libera Chat is governed by our network policies.") + (0.00 ":zirconium.libera.chat 372 tester :- ") + (0.01 ":zirconium.libera.chat 372 tester :- Please visit us in #libera for questions and support.") + (0.01 ":zirconium.libera.chat 372 tester :- ") + (0.01 ":zirconium.libera.chat 372 tester :- Website and documentation: https://libera.chat") + (0.01 ":zirconium.libera.chat 372 tester :- Webchat: https://web.libera.chat") + (0.01 ":zirconium.libera.chat 372 tester :- Network policies: https://libera.chat/policies") + (0.01 ":zirconium.libera.chat 372 tester :- Email: support@libera.chat") + (0.00 ":zirconium.libera.chat 376 tester :End of /MOTD command.")) + +((mode-user 1.2 "MODE tester +i") + (0.02 ":tester MODE tester :+Zi") + (0.02 ":NickServ!NickServ@services.libera.chat NOTICE tester :This nickname is registered. Please choose a different nickname, or identify via \2/msg NickServ IDENTIFY tester \2")) + +((privmsg 2 "PRIVMSG NickServ :IDENTIFY changeme") + (0.96 ":NickServ!NickServ@services.libera.chat NOTICE tester :You are now identified for \2tester\2.") + (0.25 ":NickServ!NickServ@services.libera.chat NOTICE tester :Last login from: \2~tester@school.edu/tester\2 on Jun 18 01:15:56 2021 +0000.")) + +((quit 5 "QUIT :\2ERC\2") + (0.19 ":tester!~user@static-198-54-131-100.cust.tzulo.com QUIT :Client Quit")) + +((linger 1 LINGER)) diff --git a/test/lisp/erc/erc-scenarios.el b/test/lisp/erc/erc-scenarios.el index 19d4a33fdd..f7931b35b9 100644 --- a/test/lisp/erc/erc-scenarios.el +++ b/test/lisp/erc/erc-scenarios.el @@ -1,4 +1,1679 @@ -;;; erc-scenarios.el --- e2e test cases for ERC -*- lexical-binding: t -*- +;;; erc-scenarios.el --- user test cases for ERC -*- lexical-binding: t -*- + +;; Copyright (C) 2021 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 +;; . + ;;; Commentary: +;; +;; These are e2e-ish test cases primarily intended to assert core, +;; fundamental behavior expected of any modern IRC client. Tests may +;; also simulate specific scenarios drawn from bug reports. Incoming +;; messages are provided by playback scripts resembling I/O logs. In +;; place of time stamps, they have time deltas, which are used to +;; govern the test server in a fashion reminiscent of music rolls (or +;; the script(1) UNIX program). These scripts can be found in the +;; accompanying erc-scenarios-resources directory. +;; +;; Isolation: +;; +;; The set of enabled modules is shared among all tests. The function +;; `erc-update-modules' activates them (as minor modes), but it never +;; deactivates them. So there's no going back, and let-binding +;; `erc-modules' is useless. The safest route is therefore to (1) +;; assume the set of default modules is already activated or will be +;; over the course of the test session and (2) let-bind relevant user +;; options as needed. For example, to limit the damage of +;; `erc-autojoin-channels-alist' to a given test, assume the +;; `erc-join' library has already been loaded or will be on the next +;; call to `erc-open'. And then simply let-bind +;; `erc-autojoin-channels-alist' for the duration of the test. +;; +;; Playing nice: +;; +;; Right now, these tests all rely on an ugly fixture macro named +;; `erc-scenarios-common-with-cleanup', which is defined in the +;; companion file erc-scenarios-common.el. It helps restore (but not +;; really prepare) the environment by destroying any stray processes +;; or buffers named in the first argument, a `let*'-style VAR-LIST. +;; Relying on such a macro is unfortunate because in many ways it +;; actually hampers readability by favoring magic over verbosity. But +;; without it (or something similar), any failing test would cause all +;; subsequent tests in this file to fail in a cascading manner (making +;; all but the first backtrace useless). +;; +;; Misc: +;; +;; Note that in the following examples, nicknames Alice and Bob are +;; always associated with the fake network FooNet, while nicks Joe and +;; Mike are always on BarNet. +;; + ;;; Code: +(require 'ert-x) ; cl-lib + +(eval-and-compile + (let ((dir (getenv "EMACS_TEST_DIRECTORY"))) + (when dir (load (concat dir "/lisp/erc/erc-scenarios-common") nil t)))) + +(require 'erc-d) +(require 'erc-scenarios-common) +(require 'erc-backend) + +(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/association/multi-net") + (erc-server-flood-penalty 0.1) + (erc-d-linger-secs 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 "Buffer #chan created" (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 1 "debug mode"))) + + (funcall second-join) + + (erc-d-t-wait-for 3 "Buf #chan@barnet created" (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 3 "ingenuous"))))) + +(ert-deftest erc-scenarios-base-association-multi-net--baseline () + (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 () + (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 "Buffer #chan endures" (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-search-for -0.1 "JOIN")) + (with-current-buffer "barnet" (erc-cmd-JOIN "#chan")))))) + +;; One network, two simultaneous connections, no IDs. +;; Reassociates on reconnect with and without server buffer. + +(defun erc-scenarios-common--base-association-same-network (after) + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/association/same-network") + (dumb-server (erc-d-run "localhost" t 'tester 'chester 'tester-again)) + (port (process-contact dumb-server :service)) + (expect (erc-d-t-make-expecter)) + (erc-server-flood-penalty 0.5) + (erc-server-flood-margin 30)) + + (ert-info ("Connect to foonet with nick tester") + (with-current-buffer (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "changeme" + :full-name "tester") + (erc-scenarios-common-assert-initial-buf-name nil port) + (erc-d-t-wait-for 5 "network determined" (eq erc-network 'foonet)))) + + (ert-info ("Connect to foonet with nick chester") + (with-current-buffer (erc :server "127.0.0.1" + :port port + :nick "chester" + :password "changeme" + :full-name "chester") + (erc-scenarios-common-assert-initial-buf-name nil port))) + + (erc-d-t-wait-for 3 "Dialed Buflist is Empty" + (not (erc-scenarios-common-buflist "127.0.0.1"))) + + (with-current-buffer "foonet/tester" + (funcall expect 3 "debug mode") + (erc-cmd-JOIN "#chan")) + + (erc-d-t-wait-for 10 "Channel buffer appears suffixed with tester" + (get-buffer "#chan@foonet/tester")) + + (with-current-buffer "foonet/chester" (funcall expect 3 "debug mode")) + + (erc-d-t-wait-for 10 "Channel buffer appears suffixed with chester" + (get-buffer "#chan@foonet/chester")) + + (ert-info ("Nick tester sees other nick chester in channel") + (with-current-buffer "#chan@foonet/tester" + (funcall expect 5 "chester") + (funcall expect 5 "find the forester") + (erc-cmd-QUIT ""))) + + (ert-info ("Nick chester sees other nick tester in same channel") + (with-current-buffer "#chan@foonet/chester" + (funcall expect 5 "tester") + (funcall expect 5 "find the forester"))) + + (funcall after expect))) + +(ert-deftest erc-scenarios-base-association-same-network--reconnect-one () + (erc-scenarios-common--base-association-same-network + (lambda (expect) + + (ert-info ("Connection tester reconnects") + (with-current-buffer "foonet/tester" + (erc-d-t-wait-for 10 "Foonet connection deceased" + (not (erc-server-process-alive))) + (funcall expect 10 "*** ERC finished") + (erc-cmd-RECONNECT) + (funcall expect 5 "debug mode"))) + + (ert-info ("Reassociated to same channel") + (with-current-buffer "#chan@foonet/tester" + (funcall expect 5 "chester") + (funcall expect 5 "welcome again") + (erc-cmd-QUIT ""))) + + (with-current-buffer "#chan@foonet/chester" + (funcall expect 5 "tester") + (funcall expect 5 "welcome again") + (funcall expect 5 "welcome again") + (erc-cmd-QUIT ""))))) + +(ert-deftest erc-scenarios-base-association-same-network--new-buffer () + (erc-scenarios-common--base-association-same-network + (lambda (expect) + + (ert-info ("Tester kills buffer and connects from scratch") + + (let (port) + (with-current-buffer "foonet/tester" + (erc-d-t-wait-for 10 "Foonet connection deceased" + (not (erc-server-process-alive))) + (funcall expect 10 "*** ERC finished") + (setq port erc-session-port) + (kill-buffer)) + + (with-current-buffer (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "changeme" + :full-name "tester") + + (erc-d-t-wait-for 5 "network determined" + (eq erc-network 'foonet))))) + + (with-current-buffer "foonet/tester" (funcall expect 3 "debug mode")) + + (ert-info ("Reassociated to same channel") + (with-current-buffer "#chan@foonet/tester" + (funcall expect 5 "chester") + (funcall expect 5 "welcome again") + (erc-cmd-QUIT ""))) + + (with-current-buffer "#chan@foonet/chester" + (funcall expect 5 "tester") + (funcall expect 5 "welcome again") + (funcall expect 5 "welcome again") + (erc-cmd-QUIT ""))))) + +;; 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 () + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/association/bouncer-history") + (erc-d-t-cleanup-sleep-secs 1) + (erc-d-linger-secs 1) + (dumb-server (erc-d-run "localhost" t 'foonet 'barnet)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (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 "Playback JOINs tester to #chan" (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 "Barnet playback JOINs tester to it's #chan" + (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 "") + (erc-d-t-search-for -0.1 "") + (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 "") + (erc-d-t-search-for -0.1 "") + (should (eq erc-server-process erc-server-process-bar)))) + + (ert-info ("All output sent") + (with-current-buffer "#chan@foonet" + (while (accept-process-output erc-server-process-foo)) + (erc-d-t-search-for 3 "please your lordship")) + (with-current-buffer "#chan@barnet" + (while (accept-process-output erc-server-process-bar)) + (erc-d-t-search-for 3 "I'll bid adieu"))))) + +(cl-defun erc-scenarios-common--base-session-id-bouncer + ((&key autop foo-id bar-id after + &aux + (foo-id (and foo-id 'oofnet)) + (bar-id (and bar-id 'rabnet)) + (serv-buf-foo (if foo-id "oofnet" "foonet")) + (serv-buf-bar (if bar-id "rabnet" "barnet")) + (chan-buf-foo (if foo-id "#chan@oofnet" "#chan@foonet")) + (chan-buf-bar (if bar-id "#chan@rabnet" "#chan@barnet"))) + &rest dialogs) + "Ensure retired option `erc-rename-buffers' is now the default behavior. +The option `erc-rename-buffers' is now deprecated and on by default, so +this now just asserts baseline behavior. Originally from scenario +clash-of-chans/rename-buffers as explained in Bug#48598: 28.0.50; +buffer-naming collisions involving bouncers in ERC." + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/session-id/bouncer") + (erc-d-t-cleanup-sleep-secs 1) + (erc-server-flood-penalty 0.1) + (dumb-server (apply #'erc-d-run "localhost" t dialogs)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (expect (erc-d-t-make-expecter)) + (erc-server-auto-reconnect autop) + 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" + :id foo-id)) + (setq erc-server-process-foo erc-server-process) + (erc-scenarios-common-assert-initial-buf-name foo-id port) + (erc-d-t-wait-for 3 "Network determined" (eq (erc-network) 'foonet)) + (erc-d-t-wait-for 3 "Final buffer name determined" + (string= (buffer-name) serv-buf-foo)) + (funcall expect 5 "foonet"))) + + (ert-info ("Join #chan@foonet") + (with-current-buffer erc-server-buffer-foo (erc-cmd-JOIN "#chan")) + (erc-d-t-wait-for 5 "Buffer #chan created" (get-buffer "#chan")) + (with-current-buffer "#chan" (funcall expect 5 ""))) + + (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" + :id bar-id)) + (setq erc-server-process-bar erc-server-process) + (erc-scenarios-common-assert-initial-buf-name bar-id port) + (erc-d-t-wait-for 3 "Network determined" (eq (erc-network) 'barnet)) + (erc-d-t-wait-for 3 "Final buffer name determined" + (string= (buffer-name) serv-buf-bar)) + (funcall expect 5 "barnet"))) + + (ert-info ("Server buffers are unique, no names based on IPs") + (should-not (eq erc-server-buffer-foo erc-server-buffer-bar)) + (should-not (erc-scenarios-common-buflist "127.0.0.1"))) + + (ert-info ("Join #chan@barnet") + (with-current-buffer erc-server-buffer-bar (erc-cmd-JOIN "#chan"))) + + (erc-d-t-wait-for 5 "Exactly 2 #chan-prefixed buffers exist" + (equal (list (get-buffer chan-buf-bar) + (get-buffer chan-buf-foo)) + (erc-scenarios-common-buflist "#chan"))) + + (ert-info ("#chan@ is exclusive to foonet") + (with-current-buffer chan-buf-foo + (erc-d-t-search-for 1 "") + (erc-d-t-search-for -0.1 "") + (should (eq erc-server-process erc-server-process-foo)) + (while (accept-process-output erc-server-process-foo)) + (erc-d-t-search-for 1 "ape is dead") + (should-not (erc-server-process-alive)))) + + (ert-info ("#chan@ is exclusive to barnet") + (with-current-buffer chan-buf-bar + (erc-d-t-search-for 1 "") + (erc-d-t-search-for -0.1 "") + (should (eq erc-server-process erc-server-process-bar)) + (while (accept-process-output erc-server-process-bar)) + (erc-d-t-search-for 1 "keeps you from dishonour") + (should-not (erc-server-process-alive)))) + + (when after (funcall after)))) + +(ert-deftest erc-scenarios-base-session-id-bouncer--base () + (erc-scenarios-common--base-session-id-bouncer () 'foonet 'barnet)) + +(ert-deftest erc-scenarios-base-session-id-bouncer--id-foo () + (erc-scenarios-common--base-session-id-bouncer '(:foo-id t) 'foonet 'barnet)) + +(ert-deftest erc-scenarios-base-session-id-bouncer--id-bar () + (erc-scenarios-common--base-session-id-bouncer '(:bar-id t) 'foonet 'barnet)) + +(ert-deftest erc-scenarios-base-session-id-bouncer--both () + (erc-scenarios-common--base-session-id-bouncer '(:foo-id t :bar-id t) + 'foonet 'barnet)) + +(defun erc-scenarios--clash-rename-pass-handler (dialog exchange) + (when (eq (erc-d-dialog-name dialog) 'stub-again) + (let* ((match (erc-d-exchange-match exchange 1)) + (sym (if (string= match "foonet") 'foonet-again 'barnet-again))) + (should (member match (list "foonet" "barnet"))) + (erc-d-load-replacement-dialog dialog sym 1)))) + +(defun erc-scenarios-common--base-session-id-bouncer--reconnect (foo-id bar-id) + (let ((erc-d-spec-vars '((token . (group (| "barnet" "foonet"))))) + (erc-d-match-handlers + ;; Auto reconnect is nondeterministic, so let computer decide + (list :pass #'erc-scenarios--clash-rename-pass-handler)) + (after + (lambda () + ;; Simulate disconnection and `erc-server-auto-reconnect' + (ert-info ("Reconnect to foonet and barnet back-to-back") + (with-current-buffer (if foo-id "oofnet" "foonet") + (erc-d-t-wait-for 5 "ERC reconnected to foonet" + (erc-server-process-alive))) + (with-current-buffer (if bar-id "rabnet" "barnet") + (erc-d-t-wait-for 5 "ERC reconnected to barnet" + (erc-server-process-alive)))) + + (ert-info ("#chan@foonet is exclusive to foonet") + (with-current-buffer (if foo-id "#chan@oofnet" "#chan@foonet") + (erc-d-t-search-for 1 "") + (erc-d-t-search-for -0.1 "") + (while (accept-process-output erc-server-process)) + (erc-d-t-search-for 3 "please your lordship"))) + + (ert-info ("#chan@barnet is exclusive to barnet") + (with-current-buffer (if bar-id "#chan@rabnet" "#chan@barnet") + (erc-d-t-search-for 1 "") + (erc-d-t-search-for -0.1 "") + (while (accept-process-output erc-server-process)) + (erc-d-t-search-for 1 "much in private"))) + + ;; XXX this is important (reconnects overlapped, so we'd get + ;; chan@127.0.0.1:6667) + (should-not (erc-scenarios-common-buflist "127.0.0.1")) + ;; Reconnection order doesn't matter here because session objects + ;; are persisted, meaning original timestamps preserved. + (should (equal (list (get-buffer (if bar-id "#chan@rabnet" + "#chan@barnet")) + (get-buffer (if foo-id "#chan@oofnet" + "#chan@foonet"))) + (erc-scenarios-common-buflist "#chan")))))) + (erc-scenarios-common--base-session-id-bouncer + (list :autop t :foo-id foo-id :bar-id bar-id :after after) + 'foonet-drop 'barnet-drop + 'stub-again 'stub-again + 'foonet-again 'barnet-again))) + +(ert-deftest erc-scenarios-base-session-id-bouncer--reconnect-base () + (erc-scenarios-common--base-session-id-bouncer--reconnect nil nil)) + +(ert-deftest erc-scenarios-base-session-id-bouncer--reconnect-id-foo () + (erc-scenarios-common--base-session-id-bouncer--reconnect 'foo-id nil)) + +(ert-deftest erc-scenarios-base-session-id-bouncer--reconnect-id-bar () + (erc-scenarios-common--base-session-id-bouncer--reconnect nil 'bar-id)) + +(ert-deftest erc-scenarios-base-session-id-bouncer--reconnect-both () + (erc-scenarios-common--base-session-id-bouncer--reconnect 'foo-id 'bar-id)) + +;; Ensure deprecated option still respected when old default value +;; explicitly set ("respected" in the sense of having names reflect +;; dialed TCP endpoints with possible uniquifiers but without any of +;; the old issues, pre-bug#48598). + +(defun erc-scenarios-common--base-compat-no-rename-bouncer (dialogs auto more) + (erc-scenarios-common-with-cleanup + ;; These actually *are* (assigned-)session-id related because + ;; our kludge assigns one after the fact. + ((erc-scenarios-common-dialog "base/session-id/bouncer") + (erc-d-t-cleanup-sleep-secs 1) + (erc-server-flood-penalty 0.1) + (dumb-server (apply #'erc-d-run "localhost" t dialogs)) + (port (process-contact dumb-server :service)) + (chan-buf-foo (format "#chan@127.0.0.1:%d" port)) + (chan-buf-bar (format "#chan@127.0.0.1:%d<2>" port)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (expect (erc-d-t-make-expecter)) + (erc-server-auto-reconnect auto) + 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" + :id nil)) + (setq erc-server-process-foo erc-server-process) + (erc-d-t-wait-for 3 "Network determined" (eq (erc-network) 'foonet)) + (erc-d-t-wait-for 3 "Final buffer name determined" + (string= (buffer-name) (format "127.0.0.1:%d" port))) + (funcall expect 5 "foonet"))) + + (ert-info ("Join #chan@foonet") + (with-current-buffer erc-server-buffer-foo (erc-cmd-JOIN "#chan")) + (erc-d-t-wait-for 5 "Buffer #chan created" (get-buffer "#chan")) + (with-current-buffer "#chan" (funcall expect 5 ""))) + + (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" + :id nil)) + (setq erc-server-process-bar erc-server-process) + (erc-d-t-wait-for 3 "Network determined" (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"))) + + (ert-info ("Server buffers are unique, no names based on IPs") + (should-not (eq erc-server-buffer-foo erc-server-buffer-bar)) + (should (equal (erc-scenarios-common-buflist "127.0.0.1") + (list (get-buffer (format "127.0.0.1:%d<2>" port)) + (get-buffer (format "127.0.0.1:%d" port)))))) + + (ert-info ("Join #chan@barnet") + (with-current-buffer erc-server-buffer-bar (erc-cmd-JOIN "#chan"))) + + (erc-d-t-wait-for 5 "Exactly 2 #chan-prefixed buffers exist" + (equal (list (get-buffer chan-buf-bar) + (get-buffer chan-buf-foo)) + (erc-scenarios-common-buflist "#chan"))) + + (ert-info ("#chan@127.0.0.1:$port is exclusive to foonet") + (with-current-buffer chan-buf-foo + (erc-d-t-search-for 1 "") + (erc-d-t-search-for -0.1 "") + (should (eq erc-server-process erc-server-process-foo)) + (while (accept-process-output erc-server-process-foo)) + (erc-d-t-search-for 1 "ape is dead") + (should-not (erc-server-process-alive)))) + + (ert-info ("#chan@127.0.0.1:$port<2> is exclusive to barnet") + (with-current-buffer chan-buf-bar + (erc-d-t-search-for 1 "") + (erc-d-t-search-for -0.1 "") + (should (eq erc-server-process erc-server-process-bar)) + (while (accept-process-output erc-server-process-bar)) + (erc-d-t-search-for 1 "keeps you from dishonour") + (should-not (erc-server-process-alive)))) + + (when more (funcall more)))) + +(ert-deftest erc-scenarios-base-compat-no-rename-bouncer--basic () + (with-suppressed-warnings ((obsolete erc-rename-buffers)) + (let (erc-rename-buffers) + (erc-scenarios-common--base-compat-no-rename-bouncer + '(foonet barnet) nil nil)))) + +(ert-deftest erc-scenarios-base-compat-no-rename-bouncer--reconnect () + (let ((erc-d-spec-vars '((token . (group (| "barnet" "foonet"))))) + (erc-d-match-handlers + (list :pass #'erc-scenarios--clash-rename-pass-handler)) + (dialogs '(foonet-drop barnet-drop stub-again stub-again + foonet-again barnet-again)) + (after + (lambda () + (pcase-let* ((`(,barnet ,foonet) + (erc-scenarios-common-buflist "127.0.0.1")) + (port (process-contact (with-current-buffer foonet + erc-server-process) + :service))) + + (ert-info ("Sanity check: barnet retains uniquifying suffix") + (should (string-suffix-p "<2>" (buffer-name barnet)))) + + ;; Simulate disconnection and `erc-server-auto-reconnect' + (ert-info ("Reconnect to foonet and barnet back-to-back") + (with-current-buffer foonet + (erc-d-t-wait-for 5 "ERC reconnected to foonet" + (erc-server-process-alive))) + (with-current-buffer barnet + (erc-d-t-wait-for 5 "ERC reconnected to barnet" + (erc-server-process-alive)))) + + (ert-info ("#chan@127.0.0.1: is exclusive to foonet") + (with-current-buffer (format "#chan@127.0.0.1:%d" port) + (erc-d-t-search-for 1 "") + (erc-d-t-search-for -0.1 "") + (while (accept-process-output erc-server-process)) + (erc-d-t-search-for 3 "please your lordship"))) + + (ert-info ("#chan@barnet is exclusive to barnet") + (with-current-buffer (format "#chan@127.0.0.1:%d<2>" port) + (erc-d-t-search-for 1 "") + (erc-d-t-search-for -0.1 "") + (while (accept-process-output erc-server-process)) + (erc-d-t-search-for 1 "much in private"))) + + ;; Ordering deterministic here even though not so for reconnect + (should (equal (list barnet foonet) + (erc-scenarios-common-buflist "127.0.0.1"))) + (should (equal (list + (get-buffer (format "#chan@127.0.0.1:%d<2>" port)) + (get-buffer (format "#chan@127.0.0.1:%d" port))) + (erc-scenarios-common-buflist "#chan"))))))) + + (with-suppressed-warnings ((obsolete erc-rename-buffers)) + (let (erc-rename-buffers) + (erc-scenarios-common--base-compat-no-rename-bouncer dialogs + 'auto after))))) + +;; The added complexity of a request handler definitely stinks. But on +;; some machines, the ordering from the selector is nondeterministic, +;; whereas normally, the filter for the last process created (in the +;; code) gets all the initial attention. FIXME delete obsolete comment + +(defun erc-scenarios--rebuffed-gapless-pass-handler (dialog exchange) + (when (eq (erc-d-dialog-name dialog) 'pass-stub) + (let* ((match (erc-d-exchange-match exchange 1)) + (sym (if (string= match "foonet") 'foonet 'barnet))) + (should (member match (list "foonet" "barnet"))) + (erc-d-load-replacement-dialog dialog sym 1)))) + +(ert-deftest erc-scenarios-base-gapless-connect () + "Back-to-back entry-point invocations happen successfully. +Originally from scenario rebuffed/gapless as explained in Bug#48598: +28.0.50; buffer-naming collisions involving bouncers in ERC." + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/gapless-connect") + (erc-server-flood-penalty 0.1) + (erc-d-linger-secs 4) + (erc-server-flood-penalty erc-server-flood-penalty) + (erc-d-spec-vars '((token . (group (| "barnet" "foonet"))))) + (erc-d-match-handlers + (list :pass #'erc-scenarios--rebuffed-gapless-pass-handler)) + (dumb-server (erc-d-run "localhost" t + 'pass-stub 'pass-stub 'barnet 'foonet)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (expect (erc-d-t-make-expecter)) + erc-autojoin-channels-alist + erc-server-buffer-foo + erc-server-buffer-bar) + + (ert-info ("Connect twice to same endpoint without pausing") + (setq erc-server-buffer-foo (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "foonet:changeme" + :full-name "tester") + erc-server-buffer-bar (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "barnet:changeme" + :full-name "tester"))) + + (ert-info ("Returned server buffers are unique") + (should-not (eq erc-server-buffer-foo erc-server-buffer-bar))) + + (ert-info ("Both connections still alive") + (should (get-process (format "erc-127.0.0.1-%d" port))) + (should (get-process (format "erc-127.0.0.1-%d<1>" port)))) + + (with-current-buffer erc-server-buffer-bar + (funcall expect 1 "marked as being away")) + + (with-current-buffer + (erc-d-t-wait-for 20 "Buffer #bar exists" (get-buffer "#bar")) + (while (accept-process-output erc-server-process)) + (funcall expect 2 "was created on") + (funcall expect 2 "his second fit")) + + (with-current-buffer + (erc-d-t-wait-for 20 "Buffer #foo exists" (get-buffer "#foo")) + (while (accept-process-output erc-server-process)) + (funcall expect 2 "was created on") + (funcall expect 2 "no use of him")))) + +(defun erc-scenarios-common--base-reuse-buffers-server-buffers (&optional more) + "Show that `erc-reuse-buffers' doesn't affect server buffers. +Overlaps some with `clash-of-chans/uniquify'. Adapted from +rebuffed/reuseless, described in Bug#48598: 28.0.50; buffer-naming +collisions involving bouncers in ERC. Run EXTRA." + (erc-scenarios-common-with-cleanup + ((erc-d-linger-secs 1) + (dumb-server (erc-d-run "localhost" t 'foonet 'barnet)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + erc-autojoin-channels-alist) + + (ert-info ("Connect to foonet") + (with-current-buffer (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "foonet:changeme" + :full-name "tester") + (should (string= (buffer-name) (format "127.0.0.1:%d" port))) + (erc-d-t-search-for 2 "marked as being away"))) + + (ert-info ("Connect to barnet") + (with-current-buffer (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "barnet:changeme" + :full-name "tester") + (should (string= (buffer-name) (format "127.0.0.1:%d" port))) + (erc-d-t-search-for 2 "marked as being away"))) + + (erc-d-t-wait-for 2 "Buffer named foonet exists" (get-buffer "foonet")) + (erc-d-t-wait-for 2 "Buffer named barnet exists" (get-buffer "barnet")) + + (ert-info ("Server buffers are unique, no IP-based names") + (should-not (eq (get-buffer "foonet") (get-buffer "barnet"))) + (should-not (erc-scenarios-common-buflist "127.0.0.1"))) + + (when more (funcall more)))) + +(ert-deftest erc-scenarios-base-reuse-buffers-server-buffers--enabled () + (should erc-reuse-buffers) + (let ((erc-scenarios-common-dialog "base/reuse-buffers/server-buffers")) + (erc-scenarios-common--base-reuse-buffers-server-buffers))) + +(ert-deftest erc-scenarios-base-reuse-buffers-server-buffers--disabled () + (should erc-reuse-buffers) + (let ((erc-scenarios-common-dialog "base/reuse-buffers/server-buffers") + erc-reuse-buffers) + (erc-scenarios-common--base-reuse-buffers-server-buffers))) + +;; The server changes your nick just after registration. + +(ert-deftest erc-scenarios-base-renick-self-auto () + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/renick/self") + (erc-d-linger-secs 0.1) + (erc-server-flood-penalty 0.1) + (dumb-server (erc-d-run "localhost" t 'auto)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + erc-autojoin-channels-alist + erc-server-buffer-foo) + + (ert-info ("Connect to foonet") + (setq erc-server-buffer-foo (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "foonet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-foo + (should (string= (buffer-name) (format "127.0.0.1:%d" port))))) + + (erc-d-t-wait-for 3 "server for foonet renamed" (get-buffer "foonet")) + + (with-current-buffer "foonet" + (erc-d-t-search-for 10 "Your new nickname is dummy")) + + (ert-info ("Joined by bouncer to #foo, own nick present") + (erc-d-t-wait-for 1 "#foo created" (get-buffer "#foo")) + (with-current-buffer "#foo" + (erc-d-t-search-for 10 "dummy") + (erc-d-t-search-for 10 "On Thursday"))))) + +;; You change your nickname manually in a server buffer; a message is +;; printed in channel buffers. + +(ert-deftest erc-scenarios-base-renick-self-manual () + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/renick/self") + (erc-d-linger-secs 0.1) + (erc-server-flood-penalty 0.1) + (dumb-server (erc-d-run "localhost" t 'manual)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (expect (erc-d-t-make-expecter)) + erc-autojoin-channels-alist + erc-server-buffer-foo) + + (ert-info ("Connect to foonet") + (setq erc-server-buffer-foo (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "foonet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-foo + (should (string= (buffer-name) (format "127.0.0.1:%d" port))))) + + (erc-d-t-wait-for 3 "server for foonet renamed" (get-buffer "foonet")) + + (ert-info ("Joined by bouncer to #foo, own nick present") + (erc-d-t-wait-for 1 "#foo created" (get-buffer "#foo")) + (with-current-buffer "#foo" + (funcall expect 5 "tester") + (funcall expect 5 "On Thursday") + (erc-with-server-buffer (erc-cmd-NICK "dummy")) + (funcall expect 5 "Your new nickname is dummy") + (funcall expect 5 " dummy: Hi"))))) + +;; You connect to the same network with two different nicks. You +;; manually change the first nick at some point, and buffer names are +;; updated correctly. + +(ert-deftest erc-scenarios-base-renick-self-qualified () + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/renick/self") + (dumb-server (erc-d-run "localhost" t 'qual-tester 'qual-chester)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (expect (erc-d-t-make-expecter)) + (erc-server-flood-penalty 0.1) + (erc-server-flood-margin 30) + erc-serv-buf-a erc-serv-buf-b) + + (ert-info ("Connect to foonet with nick tester") + (with-current-buffer + (setq erc-serv-buf-a (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "changeme" + :full-name "tester")) + (erc-d-t-wait-for 5 "network determined" (eq erc-network 'foonet)))) + + (ert-info ("Connect to foonet with nick chester") + (with-current-buffer + (setq erc-serv-buf-b (erc :server "127.0.0.1" + :port port + :nick "chester" + :password "changeme" + :full-name "chester")))) + + (erc-d-t-wait-for 3 "Dialed Buflist is Empty" + (not (erc-scenarios-common-buflist "127.0.0.1"))) + + (with-current-buffer "foonet/tester" + (funcall expect 3 "debug mode") + (erc-cmd-JOIN "#chan")) + + (with-current-buffer "foonet/chester" + (funcall expect 3 "debug mode") + (erc-cmd-JOIN "#chan")) + + (erc-d-t-wait-for 10 "Channel buffer appears suffixed with tester" + (get-buffer "#chan@foonet/tester")) + + (erc-d-t-wait-for 10 "Channel buffer appears suffixed with chester" + (get-buffer "#chan@foonet/chester")) + + (ert-info ("Greets other nick in same channel") + (with-current-buffer "#chan@foonet/tester" + (funcall expect 5 " chester, welcome!") + (erc-cmd-NICK "dummy") + (funcall expect 5 "Your new nickname is dummy") + (funcall expect 5 "find the forester") + (should (string= (buffer-name) "#chan@foonet/dummy")))) + + (ert-info ("Renick propagated throughout all buffers of process") + (should-not (get-buffer "#chan@foonet/tester")) + (should-not (get-buffer "foonet/tester")) + (should (get-buffer "foonet/dummy"))))) + +;; When a channel user changes their nick, any query buffers for them +;; are updated. + +(ert-deftest erc-scenarios-base-renick-queries-solo () + + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/renick/queries") + (erc-d-linger-secs 0.1) + (erc-server-flood-penalty 0.1) + (erc-server-flood-margin 20) + (dumb-server (erc-d-run "localhost" t 'solo)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + erc-autojoin-channels-alist + erc-server-buffer-foo) + + (ert-info ("Connect to foonet") + (setq erc-server-buffer-foo (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "foonet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-foo + (should (string= (buffer-name) (format "127.0.0.1:%d" port))))) + + (erc-d-t-wait-for 1 "server for foonet renamed" (get-buffer "foonet")) + + (ert-info ("Joined by bouncer to #foo, pal persent") + (with-current-buffer + (erc-d-t-wait-for 1 "chan #foo exists" (get-buffer "#foo")) + (erc-d-t-search-for 1 "On Thursday") + (goto-char erc-input-marker) + (insert "hi") + (erc-send-current-line))) + + (erc-d-t-wait-for 10 "Query buffer appears with message from pal" + (get-buffer "Lal")) + + (ert-info ("Chat with pal, who changes name") + (with-current-buffer "Lal" + (erc-d-t-search-for 3 "hello") + (goto-char erc-input-marker) + (insert "hi") + (erc-send-current-line) + (erc-d-t-search-for 10 "is now known as Linguo") + (should-not (search-forward "is now known as Linguo" nil t)))) + + (erc-d-t-wait-for 1 "Query buffer's name changes" + (get-buffer "Linguo")) + (should-not (get-buffer "Lal")) + + (with-current-buffer "Linguo" + (goto-char erc-input-marker) + (insert "howdy Linguo") + (erc-send-current-line)) + + (with-current-buffer "#foo" + (erc-d-t-search-for 10 "is now known as Linguo") + (should-not (search-forward "is now known as Linguo" nil t)) + (erc-cmd-PART "")) + + (with-current-buffer "Linguo" + (erc-d-t-search-for 10 "get along")))) + +;; You share a channel and a query buffer with a user on two different +;; networks (through a proxy). The user changes their nick on both +;; networks at the same time. Query buffers are updated accordingly. + +(ert-deftest erc-scenarios-base-renick-queries-bouncer () + + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/renick/queries") + (erc-d-linger-secs 0.5) + (erc-server-flood-penalty 0.1) + (erc-server-flood-margin 30) + (dumb-server (erc-d-run "localhost" t 'bouncer-foonet 'bouncer-barnet)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (expect (erc-d-t-make-expecter)) + erc-accidental-paste-threshold-seconds + erc-autojoin-channels-alist + erc-server-buffer-foo + erc-server-buffer-bar) + + (ert-info ("Connect to foonet") + (setq erc-server-buffer-foo (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "foonet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-foo + (should (string= (buffer-name) (format "127.0.0.1:%d" port))))) + + (erc-d-t-wait-for 1 "server for foonet renamed" (get-buffer "foonet")) + + (ert-info ("Connect to barnet") + (setq erc-server-buffer-bar (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "barnet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-bar + (should (string= (buffer-name) (format "127.0.0.1:%d" port))))) + + (erc-d-t-wait-for 1 "server for barnet renamed" (get-buffer "barnet")) + (should-not (erc-scenarios-common-buflist "127.0.0.1")) + + (ert-info ("Joined by bouncer to #chan@foonet, pal persent") + (erc-d-t-wait-for 10 "#chan@foonet exists" (get-buffer "#chan@foonet")) + (with-current-buffer "#chan@foonet" + (funcall expect 1 "rando") + (funcall expect 1 "simply misused"))) + + (ert-info ("Joined by bouncer to #chan@barnet, pal persent") + (erc-d-t-wait-for 10 "#chan@barnet exists" (get-buffer "#chan@barnet")) + (with-current-buffer "#chan@barnet" + (funcall expect 1 "rando") + (funcall expect 1 "come, sir, I am"))) + + (ert-info ("Query buffer exists for rando@foonet") + (erc-d-t-wait-for 10 "rando@foonet exists" (get-buffer "rando@foonet")) + (with-current-buffer "rando@foonet" + (funcall expect 1 "guess not") + (goto-char erc-input-marker) + (insert "I here") + (erc-send-current-line))) + + (ert-info ("Query buffer exists for rando@barnet") + (erc-d-t-wait-for 10 "rando@barnet exists" (get-buffer "rando@barnet")) + (with-current-buffer "rando@barnet" + (funcall expect 2 "rentacop") + (goto-char erc-input-marker) + (insert "Linda said you were gonna kill me.") + (erc-send-current-line))) + + (ert-info ("Sync convo for rando@foonet") + (with-current-buffer "rando@foonet" + (funcall expect 1 "u are dumb") + (goto-char erc-input-marker) + (insert "not so") + (erc-send-current-line))) + + (ert-info ("Sync convo for rando@barnet") + (with-current-buffer "rando@barnet" + (funcall expect 3 "I never saw her before") + (goto-char erc-input-marker) + (insert "You aren't with Wage?") + (erc-send-current-line))) + + (erc-d-t-wait-for 1 "buffer name change for rando@foonet" + (get-buffer "frenemy@foonet")) + (erc-d-t-wait-for 1 "buffer name change for rando@barnet" + (get-buffer "frenemy@barnet")) + + (should-not (get-buffer "rando@foonet")) + (should-not (get-buffer "rando@barnet")) + + (with-current-buffer "frenemy@foonet" + (funcall expect 1 "now known as") + (funcall expect 1 "doubly so")) + + (with-current-buffer "frenemy@barnet" + (funcall expect 1 "now known as") + (funcall expect 1 "reality picture")) + + (when noninteractive + (with-current-buffer "frenemy@barnet" (kill-buffer)) + (erc-d-t-wait-for 2 "frenemy@foonet changed back to frenemy" + (get-buffer "frenemy")) + (should-not (get-buffer "frenemy@foonet"))) + + (with-current-buffer "#chan@foonet" + (funcall expect 10 "is now known as frenemy") + (should-not (search-forward "now known as frenemy" nil t)) ; regression + (funcall expect 10 "words are razors")) + + (with-current-buffer "#chan@barnet" + (funcall expect 10 "is now known as frenemy") + (should-not (search-forward "now known as frenemy" nil t)) + (while (accept-process-output erc-server-process)) + (funcall expect 10 "I have lost")))) + +(ert-deftest erc-scenarios-aux-unix-socket () + (skip-unless (featurep 'make-network-process '(:family local))) + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/renick/self") + (erc-d-linger-secs 0.1) + (erc-server-flood-penalty 0.1) + (sock (expand-file-name "erc-d.sock" temporary-file-directory)) + (erc-scenarios-common-extra-teardown (lambda () + (delete-file sock))) + (erc-server-connect-function + (lambda (n b _ p &rest r) + (apply #'make-network-process + `(:name ,n :buffer ,b :service ,p :family local ,@r)))) + (dumb-server (erc-d-run nil sock 'auto)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + erc-autojoin-channels-alist + erc-server-buffer-foo) + + (ert-info ("Connect to foonet") + (setq erc-server-buffer-foo (erc :server "fake" + :port sock + :nick "tester" + :password "foonet:changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-foo + (should (string= (buffer-name) (format "fake:%s" sock))))) + + (erc-d-t-wait-for 3 "server for foonet renamed" (get-buffer "foonet")) + + (with-current-buffer "foonet" + (erc-d-t-search-for 10 "Your new nickname is dummy")) + + (ert-info ("Joined by bouncer to #foo, own nick present") + (erc-d-t-wait-for 1 "#foo created" (get-buffer "#foo")) + (with-current-buffer "#foo" + (erc-d-t-search-for 10 "dummy") + (erc-d-t-search-for 10 "On Thursday"))))) + +;; See `erc-update-server-buffer-name'. A perceived loss in +;; network connectivity turns out to be a false alarm, but the +;; bouncer has already accepted the second connection + +(defun erc-scenarios--base-aborted-reconnect () + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/aborted-reconnect") + (erc-d-t-cleanup-sleep-secs 1) + (erc-d-linger-secs 0.5) + (dumb-server (erc-d-run "localhost" t 'foonet 'foonet-dupe)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + erc-autojoin-channels-alist + erc-server-buffer-foo) + + (ert-info ("Connect to foonet") + (setq erc-server-buffer-foo (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-foo + (should (string= (buffer-name) (format "127.0.0.1:%d" port))))) + + (ert-info ("Server buffer is unique and temp name is absent") + (erc-d-t-wait-for 1 "server for foonet renamed" (get-buffer "FooNet")) + (should-not (erc-scenarios-common-buflist "127.0.0.1")) + (with-current-buffer erc-server-buffer-foo + (erc-cmd-JOIN "#chan"))) + + (ert-info ("Channel buffer #chan alive and well") + (with-current-buffer + (erc-d-t-wait-for 4 "#chan created" (get-buffer "#chan")) + (erc-d-t-search-for 10 "welcome"))) + + (ert-info ("Connect to foonet again") + (setq erc-server-buffer-foo (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "changeme" + :full-name "tester")) + (let ((inhibit-message noninteractive)) + (with-current-buffer erc-server-buffer-foo + (should (string= (buffer-name) (format "127.0.0.1:%d" port))) + (erc-d-t-wait-for 5 "Second process killed" + (not (erc-server-process-alive))) + (erc-d-t-search-for 10 "FooNet still connected")))) + + (ert-info ("Server buffer is unique and temp name is absent") + (should (equal (list (get-buffer "FooNet")) + (erc-scenarios-common-buflist "FooNet"))) + (should (equal (list (get-buffer (format "127.0.0.1:%d" port))) + (erc-scenarios-common-buflist "127.0.0.1")))) + + (ert-info ("Channel buffer #chan still going") + (with-current-buffer "#chan" + (erc-d-t-search-for 10 "and be prosperous"))))) + +(ert-deftest erc-scenarios-base-aborted-reconnect () + :tags '(:unstable) + (let ((tries 3) + (timeout 1) + failed) + (while (condition-case _err + (progn + (erc-scenarios--base-aborted-reconnect) + nil) + (ert-test-failed + (message "Test %S failed; %s attempt(s) remaining." + (ert-test-name (ert-running-test)) + tries) + (sleep-for (cl-incf timeout)) + (not (setq failed (zerop (cl-decf tries))))))) + (should-not failed))) + +;; This defends against a regression in `erc-server-PRIVMSG' caused by +;; the removal of `erc-auto-query'. When an active channel buffer is +;; killed off and PRIVMSGs arrive targeting it, the buffer should be +;; recreated. See elsewhere for NOTICE logic, which is more complex. + +(ert-deftest erc-scenarios-base-channel-buffer-revival () + + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/channel-buffer-revival") + (erc-d-linger-secs 0.5) + (dumb-server (erc-d-run "localhost" t 'foonet)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + erc-autojoin-channels-alist + erc-server-buffer-foo) + + (ert-info ("Connect to foonet") + (setq erc-server-buffer-foo (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-foo + (should (string= (buffer-name) (format "127.0.0.1:%d" port))))) + + (ert-info ("Server buffer is unique and temp name is absent") + (erc-d-t-wait-for 1 "server for foonet renamed" (get-buffer "FooNet")) + (should-not (erc-scenarios-common-buflist "127.0.0.1")) + (with-current-buffer erc-server-buffer-foo + (erc-cmd-JOIN "#chan"))) + + (ert-info ("Channel buffer #chan alive and well") + (with-current-buffer + (erc-d-t-wait-for 8 "#chan exists" (get-buffer "#chan")) + (erc-d-t-search-for 10 "Our queen and all her elves") + (kill-buffer))) + + (should-not (get-buffer "#chan")) + + (ert-info ("Channel buffer #chan revived") + (erc-d-t-wait-for 5 "#chan exists again" (get-buffer "#chan")) + (with-current-buffer "#chan" + (erc-d-t-search-for 10 "and be prosperous"))))) + +;; This ensures we only reconnect `erc-server-reconnect-attempts' +;; (rather than infinitely many) times, which can easily happen when +;; tweaking code related to process sentinels in erc-backend.el. + +(ert-deftest erc-scenarios-base-reconnect-timer () + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/reconnect-timer") + (dumb-server (erc-d-run "localhost" t 'foonet 'foonet 'foonet-last)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (expect (erc-d-t-make-expecter)) + (erc-server-auto-reconnect t) + erc-autojoin-channels-alist + erc-server-buffer) + + (ert-info ("Connect to foonet") + (setq erc-server-buffer (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer + (should (string= (buffer-name) (format "127.0.0.1:%d" port))))) + + (ert-info ("Server tries to connect thrice (including initial attempt)") + (with-current-buffer erc-server-buffer + (dotimes (n 3) + (ert-info ((format "Attempt %d" n)) + (funcall expect 3 "Opening connection") + (funcall expect 2 "Password incorrect") + (funcall expect 2 "Connection failed!") + (funcall expect 2 "Re-establishing connection"))) + (ert-info ("Prev attempt was final") + (erc-d-t-search-for -1 "Opening connection" (point))))) + + (ert-info ("Server buffer is unique and temp name is absent") + (should (equal (list (get-buffer (format "127.0.0.1:%d" port))) + (erc-scenarios-common-buflist "127.0.0.1")))))) + +(cl-defun erc-scenarios-common--base-session-id-same-network + ((&key nick id server chan + &aux (nick-a nick) (id-a id) (serv-buf-a server) (chan-buf-a chan)) + (&key nick id server chan + &aux (nick-b nick) (id-b id) (serv-buf-b server) (chan-buf-b chan))) + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/session-id/same-network") + (dumb-server (erc-d-run "localhost" t 'tester 'chester)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (expect (erc-d-t-make-expecter)) + (erc-server-flood-penalty 0.1) + (erc-server-flood-margin 30) + erc-serv-buf-a erc-serv-buf-b) + + (ert-info ("Connect to foonet with nick tester") + (with-current-buffer + (setq erc-serv-buf-a (erc :server "127.0.0.1" + :port port + :nick nick-a + :password "changeme" + :full-name nick-a + :id id-a)) + (erc-scenarios-common-assert-initial-buf-name id-a port) + (erc-d-t-wait-for 5 "network determined" (eq erc-network 'foonet)))) + + (ert-info ("Connect to foonet with nick chester") + (with-current-buffer + (setq erc-serv-buf-b (erc :server "127.0.0.1" + :port port + :nick nick-b + :password "changeme" + :full-name nick-b + :id id-b)) + (erc-scenarios-common-assert-initial-buf-name id-b port))) + + (erc-d-t-wait-for 3 "Dialed Buflist is Empty" + (not (erc-scenarios-common-buflist "127.0.0.1"))) + + (with-current-buffer erc-serv-buf-a + (should (string= (buffer-name) serv-buf-a)) + (funcall expect 3 "debug mode") + (erc-cmd-JOIN "#chan")) + + (with-current-buffer erc-serv-buf-b + (should (string= (buffer-name) serv-buf-b)) + (funcall expect 3 "debug mode") + (erc-cmd-JOIN "#chan")) + + (erc-d-t-wait-for 10 "Channel buffer appears suffixed with tester" + (get-buffer chan-buf-a)) + + (erc-d-t-wait-for 10 "Channel buffer appears suffixed with chester" + (get-buffer chan-buf-b)) + + (ert-info ("Greets other nick in same channel") + (with-current-buffer chan-buf-a + (funcall expect 5 "chester") + (funcall expect 5 "find the forester") + (erc-cmd-MSG "#chan chester: hi"))) + + (ert-info ("Sees other nick in same channel") + (with-current-buffer chan-buf-b + (funcall expect 5 "tester") + (funcall expect 10 " chester: hi") + (funcall expect 5 "This was lofty") + (erc-cmd-MSG "#chan hi tester"))) + + (with-current-buffer chan-buf-a + (funcall expect 5 "To employ you towards") + (erc-cmd-QUIT "")) + + (with-current-buffer chan-buf-b + (funcall expect 5 "To employ you towards") + (erc-cmd-QUIT "")))) + +(ert-deftest erc-scenarios-base-session-id-same-network--two-ids () + (erc-scenarios-common--base-session-id-same-network + (list :nick "tester" + :id 'tester/foonet + :server "tester/foonet" + :chan "#chan@tester/foonet") + (list :nick "chester" + :id 'chester/foonet + :server "chester/foonet" + :chan "#chan@chester/foonet"))) + +(ert-deftest erc-scenarios-base-session-id-same-network--one-id-tester () + (erc-scenarios-common--base-session-id-same-network + (list :nick "tester" + :id 'tester/foonet + :server "tester/foonet" + :chan "#chan@tester/foonet") + (list :nick "chester" + :id nil + :server "foonet" + :chan "#chan@foonet"))) + +(ert-deftest erc-scenarios-base-session-id-same-network--one-id-chester () + (erc-scenarios-common--base-session-id-same-network + (list :nick "tester" + :id nil + :server "foonet" + :chan "#chan@foonet") + (list :nick "chester" + :id 'chester/foonet + :server "chester/foonet" + :chan "#chan@chester/foonet"))) + +(ert-deftest erc-scenarios-base-session-id-same-network--no-ids () + (erc-scenarios-common--base-session-id-same-network + (list :nick "tester" + :id nil + :server "foonet/tester" + :chan "#chan@foonet/tester") ; <- note net before nick + (list :nick "chester" + :id nil + :server "foonet/chester" + :chan "#chan@foonet/chester"))) + +;; Upon reconnecting, playback for channel and target buffers is +;; routed correctly. + +(ert-deftest erc-scenarios-base-association-reconnect-playback () + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/association/reconnect-playback") + (erc-d-linger-secs 0.5) + (erc-server-flood-penalty 0.1) + (erc-server-flood-margin 30) + (dumb-server (erc-d-run "localhost" t 'foonet 'foonet-again)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (expect (erc-d-t-make-expecter)) + erc-autojoin-channels-alist + erc-server-buffer-foo) + + (ert-info ("Connect to foonet") + (setq erc-server-buffer-foo (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "changeme" + :full-name "tester")) + (with-current-buffer erc-server-buffer-foo + (should (string= (buffer-name) (format "127.0.0.1:%d" port))))) + + (ert-info ("Setup") + + (ert-info ("Server buffer is unique and temp name is absent") + (erc-d-t-wait-for 1 "server for foonet renamed" (get-buffer "foonet")) + (should-not (erc-scenarios-common-buflist "127.0.0.1"))) + + (ert-info ("Channel buffer #chan playback received") + (erc-d-t-wait-for 3 "#chan exists" (get-buffer "#chan")) + (with-current-buffer "#chan" + (funcall expect 10 "But purgatory"))) + + (ert-info ("Ask for help from services or bouncer bot") + (with-current-buffer erc-server-buffer-foo + (erc-cmd-MSG "*status help"))) + + (ert-info ("Help received") + (erc-d-t-wait-for 5 "*status buffer exists" (get-buffer "*status")) + (with-current-buffer "*status" + (funcall expect 10 "Rehash"))) + + (ert-info ("#chan convo done") + (with-current-buffer "#chan" + (funcall expect 10 "most egregious indignity")))) + + (with-current-buffer erc-server-buffer-foo + (erc-cmd-QUIT "") + (erc-d-t-wait-for 4 "proc dies" (not (erc-server-process-alive))) + (erc-cmd-RECONNECT)) + + (ert-info ("Channel buffer found and associated") + (with-current-buffer "#chan" + (funcall expect 10 "Wilt thou rest damned"))) + + (ert-info ("Help buffer found and associated") + (with-current-buffer "*status" + (goto-char erc-input-marker) + (insert "help") + (erc-send-current-line) + (funcall expect 10 "Restart ZNC"))) + + (ert-info ("#chan convo done") + (with-current-buffer "#chan" + (funcall expect 10 "here comes the lady"))))) + +;; You register a new nick, disconnect, and log back in, but your nick +;; is not granted, so ERC obtains a backtick'd version. You open a +;; query buffer for NickServ, and ERC names it using the session ID +;; (which includes the backtick'd nick) as a suffix. The original +;; (disconnected) NickServ buffer gets renamed with *its* session ID +;; as well. You then identify to NickServ, and the dead session is no +;; longer considered distinct. + +(ert-deftest erc-scenarios-base-association-nick-bumped () + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/association/nick-bump") + (dumb-server (erc-d-run "localhost" t 'renicked 'renicked-again)) + (port (process-contact dumb-server :service)) + (expect (erc-d-t-make-expecter)) + (erc-server-flood-penalty 0.5) + (erc-server-flood-margin 30)) + + (ert-info ("Connect to foonet with nick tester") + (with-current-buffer (erc :server "127.0.0.1" + :port port + :nick "tester" + :full-name "tester") + (erc-scenarios-common-assert-initial-buf-name nil port) + (erc-d-t-wait-for 5 "network determined" (eq erc-network 'foonet)))) + + (ert-info ("Create an account for tester and quit") + (with-current-buffer "foonet" + (funcall expect 3 "debug mode") + + (erc-cmd-QUERY "NickServ") + (with-current-buffer "NickServ" + (erc-send-input-line "NickServ" "REGISTER changeme") + (funcall expect 5 "Account created") + (funcall expect 1 "You're now logged in as tester")) + + (with-current-buffer "foonet" + (erc-cmd-QUIT "") + (erc-d-t-wait-for 4 "proc dies" (not (erc-server-process-alive))) + (funcall expect 5 "ERC finished")))) + + (with-current-buffer "foonet" + (erc-cmd-RECONNECT)) + + (erc-d-t-wait-for 10 "Nick request rejection prevents reassociation (good)" + (get-buffer "foonet/tester`")) + + (ert-info ("Ask NickServ to change nick") + (with-current-buffer "foonet/tester`" + (funcall expect 3 "already in use") + (funcall expect 3 "debug mode") + (erc-cmd-QUERY "NickServ")) + + (erc-d-t-wait-for 1 "Dead NickServ query buffer renamed now qualified" + (get-buffer "NickServ@foonet/tester")) + + (with-current-buffer "NickServ@foonet/tester`" ; new one + (erc-send-input-line "NickServ" "IDENTIFY tester changeme") + (funcall expect 5 "You're now logged in as tester") + (should (equal (buffer-name) "NickServ@foonet/tester")))) + + (ert-info ("Ours is the only NickServ buffer that remains") + (should-not (cdr (erc-scenarios-common-buflist "NickServ")))) + + (should (not (get-buffer "foonet/tester`"))))) + +;; Ensure the old way of specifying a partial domain name still works. + +(ert-deftest erc-scenarios-base-legacy-autojoin () + + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/legacy-autojoin") + (erc-d-linger-secs 1) + (erc-server-flood-penalty 0.1) + (dumb-server (erc-d-run "localhost" t 'foonet)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (erc-autojoin-channels-alist '(("libera\\.chat" "#erc") + ("foonet\\.org" "#chan")))) + + (ert-info ("Connect") + (with-current-buffer (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "changeme" + :full-name "tester") + (should (string= (buffer-name) (format "127.0.0.1:%d" port))))) + + (erc-d-t-wait-for 1 "server buffer renamed" (get-buffer "FooNet")) + + (ert-info ("Channel buffer #chan autojoined") + (with-current-buffer + (erc-d-t-wait-for 6 "#chan exists" (get-buffer "#chan")) + (erc-d-t-search-for 10 "Live, and be prosperous"))))) + +(ert-deftest erc-scenarios-services-password () + + (defvar erc-nickserv-passwords) + + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "services/password") + (erc-server-flood-penalty 0.1) + (erc-modules (cons 'services erc-modules)) + (erc-nickserv-passwords '((Libera.Chat (("joe" . "bar") + ("tester" . "changeme"))))) + (expect (erc-d-t-make-expecter)) + (dumb-server (erc-d-run "localhost" t 'libera)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*"))) + + (ert-info ("Connect without password") + (with-current-buffer (erc :server "127.0.0.1" + :port port + :nick "tester" + :full-name "tester") + (should (string= (buffer-name) (format "127.0.0.1:%d" port))) + (erc-d-t-wait-for 2 "Network determined" + (eq erc-network 'Libera.Chat)) + (funcall expect 1 "This nickname is registered.") + (funcall expect 1 "You are now identified") + (funcall expect 1 "Last login from") + (erc-cmd-QUIT ""))) + + (erc-services-mode -1) + + (should-not (memq 'services erc-modules)))) + +(ert-deftest erc-scenarios-services-prompt () + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "services/password") + (erc-server-flood-penalty 0.1) + (erc-modules (cons 'services erc-modules)) + (expect (erc-d-t-make-expecter)) + (dumb-server (erc-d-run "localhost" t 'libera)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*"))) + + (ert-info ("Connect without password") + (with-current-buffer (erc :server "127.0.0.1" + :port port + :nick "tester" + :full-name "tester") + (should (string= (buffer-name) (format "127.0.0.1:%d" port))) + (ert-simulate-keys "changeme\r" + (erc-d-t-wait-for 2 "Network determined" + (eq erc-network 'Libera.Chat)) + (funcall expect 3 "This nickname is registered.") + (funcall expect 3 "You are now identified") + (funcall expect 3 "Last login from")) + (erc-cmd-QUIT ""))) + + (erc-services-mode -1) + + (should-not (memq 'services erc-modules)))) + +;; Corner case demoing fallback behavior for an absent 004 RPL but a +;; present 422 or 375. If this is unlikely enough, remove or guard +;; with `ert-skip' plus some condition so it only runs when explicitly +;; named via ERT specifier + +(ert-deftest erc-scenarios-networks-announced-missing () + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "networks/announced-missing") + (erc-d-linger-secs 0.5) + (expect (erc-d-t-make-expecter)) + (dumb-server (erc-d-run "localhost" t 'foonet)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*"))) + + (ert-info ("Connect without password") + (with-current-buffer (erc :server "127.0.0.1" + :port port + :nick "tester" + :full-name "tester") + (should (string= (buffer-name) (format "127.0.0.1:%d" port))) + (let ((err (should-error (sleep-for 1)))) + (should (string-match-p "Failed to determine" (cadr err)))) + (funcall expect 1 "Failed to determine") + (funcall expect 1 "Failed to determine") + (should-not erc-network) + (should (string= erc-server-announced-name "irc.foonet.org")))))) + ;;; erc-scenarios.el ends here -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0013-Address-long-standing-ERC-buffer-naming-issues.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Mon, 3 May 2021 05:54:56 -0700 Subject: [PATCH 13/28] Address long-standing ERC buffer-naming issues * lisp/erc/erc-networks.el (erc-determine-network, erc-networks--determine): Deprecate former and partially replace with latter, which demotes RPL_ISUPPORT-derived NETWORK name to fallback in favor of known `erc-networks-alist' members as part of shift to session- and network-based connection-identity policy. Return sentinel on failure. Expect `erc-server-announced-name' to be set, and signal when it's not. (erc-networks--name-missing-sentinel): Value returned when new function `erc-networks--determine' fails to find network name. (erc-set-network-name, erc-networks--set-name): Deprecate former and partially replace with latter. Ding with helpful and don't set `erc-network' message when network name is not found. (erc-networks--ensure-announced): Add new fallback function to ensure `erc-server-announced-name' is set. Register with post-MOTD hooks. (erc-networks--copy-name): Add new function to copy over network name from server buffer. Prefer this over doing the same in `erc-open' to help sustain the idea of this "module" being anything other than a hard dependency. (erc-networks--init-session): Add new function to perform one-time session-related setup. This can (should?) be combined with `erc-set-network-name. (erc-networks--rename-server-buffer): New function replaces `erc-unset-network-name' as default `erc-disconnect-hook' member; renames server buffers once network is discovered; added to/removed from `erc-after-connect' hook on erc-networks minor mode. (erc-networks--insert-transplanted-content, erc-networks--maybe-reclaim-target-buffer, erc-networks--copy-over-server-buffer-contents, erc--update-server-session): Add helpers for `erc-networks--rename-server-buffer'. The first re-associates all existing target buffers that ought to be owned by the new server process. The second grabs buffer text from an old, dead server buffer before killing it. It then inserts that text above everything in the current, replacement server buffer. The other two massage the IDs of related sessions, possibly renaming them as well. They may also uniquify the current session's ID. (erc-networks-enable, erc-networks-mode): Add above hooks in appropriate order to 376/422 functions. * test/lisp/erc/erc-tests.el: add tests for the above functions. * lisp/erc/erc.el (erc-rename-buffers): Change this option's default to t, remove the only instance where it's actually used, and make it an obsolete variable. (erc--maybe-rename-surviving-target-buffer): Add new function that renames a target buffer when it becomes the sole bearer of a name based on a target across all sessions (and normally all networks). In other words, remove the @NETWORK or @SESSION-ID suffix from the last remaining channel or query buffer after its namesakes have all been killed off. Register this function with ERC's target-related kill-buffer hooks. (erc--refresh-session-buffer-names): Helper for `erc--shrink-ids-and-buffer-names'. (erc--visit-collisions): Add new function that visits all ERC buffers and calls callbacks when a buffer-name collision is encountered. (erc--construct-buffer-name, erc--maybe-update-buffer-name, erc--rename-session-buffers): Add helpers to support `erc--reconcile-buffer-names' and friends. (erc--reconcile-buffer-names, erc--reconcile-buffer-names-visit): Add new helper functions for `erc-generate-new-buffer-name' that only run in target buffers. (erc-generate-new-buffer-name): Replace current policy of appending a slash and the invocation host name. Favor instead temporary names for server buffers and session-/network-based uniquifying suffixes for channels and query buffers. Fall back to the TCP host:port convention when necessary. The signature has changed. Another optional param has been appended after the others. (erc-get-buffer-create): Don't generate a new name when reconnecting, just return the same buffer. `erc-open' starts from a clean slate anyway, so this just keeps things simple. Also add optional ID param. (erc-open): Add new id param to for canonical given session identifier, which must be a symbol. This is stored in the `given' slot of the session's erc--session object. (erc, erc-tls): Add new id option and pass it to erc-open. Accept a string as well as a symbol to comport better with other params. (erc-log-irc-protocol): Use `erc--session-id' instead of the function `erc-network' to determine preferred peer name. (erc-format-target-and/or-network): This is called frequently for mode-line updates. Don't rename buffers here. Instead, do so in `erc-update-server-buffer-name'. (erc-kill-channel-hook, erc-kill-buffer-hook): add `erc-maybe-rename-surviving-taget-buffer' as default member. * test/lisp/erc/erc-tests.el: add tests for the above functions. * lisp/erc/erc-backend.el (erc--sid): Define new struct that contains all info relevant to specifying a unique session identifier. (erc--session): Add a new variable for storing local `erc--sid' object, common to all buffers in a session. (erc--sid-given, erc--sid-create, erc--sid-on-connect, erc--sid--equal-p, erc--sid-dynamic-init-parts, erc--sid-dynamic-init-id, erc--sid-dynamic-grow-id, erc--sid-dynamic-reset-id, erc--sid-dynmaic-prefix-length, erc--sid-dynamic-update, erc--sid-reload, erc--sid-ensure-comparable): Add new helpers to support `erc--sid' struct. (erc--shrink-ids-and-buffer-names): Add function to reassess all session IDs and shrink them if necessary along with affected buffer names. Register this on all three of ERC's kill-buffer hooks, all three because an orphaned target buffer is enough to keep its session alive. (erc--sid-sep): New var for to help when formatting buffer names. (erc-server-reconnect): Call erc-open with new id param (also fix reconnect issue related to bug#47788). (erc-server-JOIN): pass given id when calling erc-open. (erc-server-NICK): apply same name-generation used by `erc-open'; except here, for the purpose of "re-nicking". Update session object and maybe buffer names after own nick changes. See bug#48598 for background on all of the above. --- lisp/erc/erc-backend.el | 295 +++++++- lisp/erc/erc-networks.el | 231 +++++- lisp/erc/erc.el | 300 +++++--- test/lisp/erc/erc-networks-tests.el | 525 ++++++++++++++ test/lisp/erc/erc-tests.el | 1019 ++++++++++++++++++++++++++- 5 files changed, 2264 insertions(+), 106 deletions(-) create mode 100644 test/lisp/erc/erc-networks-tests.el diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index e0cbe308fd..9e96a24e8c 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -124,6 +124,269 @@ erc-server-current-nick "Nickname on the current server. Use `erc-current-nick' to access this.") + +;;;; Logical session + +;; This section may be happier in erc.el. Right now, code mutating +;; `erc--sid' slots via "place" must come after this point in this +;; file. See above note re "mutual dependency." + +(defvar-local erc--session nil + "Persistent identifying info for a logical session. +\"Logical\" means a session can outlive a connection and survive changes +in connection type. Essential to this is ensuring recovery from the +loss of a server buffer, so this object must be shared among server and +target buffers to allow for reassociation.") + +(cl-defstruct erc--sid + "A unique session identifier. +Here, \"session\" means a logical IRC session that may span multiple +connection lifetimes." + (ts nil :type float :read-only t :documentation "Creation timestamp.") + (symbol nil :type symbol :documentation "ID as a symbol.")) + +(cl-defstruct (erc--sid-fixed + (:include erc--sid) + (:constructor erc--sid-fixed-create + (given + &aux + (ts (float-time)) + (symbol given))))) + +(cl-defstruct (erc--sid-dynamic + (:include erc--sid) + (:constructor erc--sid-dynamic-create + (&aux + (ts (float-time)) + (parts (erc--sid-dynamic-init-parts)) + (symbol (erc--sid-dynamic-init-id parts)) + (len 1)))) + "A session identifier and its constituent components. +Two sessions are considered equivalent when their non-empty `parts' +slots compare equal. Sessions sharing a common prefix of `parts' are +considered related. A session's ID is determined by concatenating the +shortest prefix (non-empty initial substring of `parts') unique among +those of its relatives. For example, related sessions [b a r d o] and +[b a z a r] would have IDs b/a/r and b/a/z respectively." + (parts nil :type sequence ; a vector of atoms + :documentation "Sequence of identifying components.") + (len 0 :type integer + :documentation "Length of active `parts' interval.")) + +;; Please use this instead of `erc--sid-fixed-p'. +(cl-defgeneric erc--sid-given ((_ erc--sid)) + "Return the session's preassigned identifier if any. +This may have come in the form of an :id arg to an \"entry-point\" +command like `erc-tls' or `erc'." + nil) + +(cl-defmethod erc--sid-given ((sid erc--sid-fixed)) + (erc--sid-symbol sid)) + +(defun erc--sid-create (id) + "Invoke an appropriate constructor for an `erc--sid' object." + ;; Trust a user-provided ID unconditionally. + (if id + (erc--sid-fixed-create id) + ;; If a user explicitly set the deprecated `erc-rename-buffers' to + ;; its former default of nil, honor that for compatibility's sake. + (if (not (with-suppressed-warnings ((obsolete erc-rename-buffers)) + erc-rename-buffers)) + (erc--sid-fixed-create (intern (buffer-name))) + ;; Otherwise, use an adaptive name derived from network params. + (erc--sid-dynamic-create)))) + +(cl-defgeneric erc--sid-on-connect ((_ erc--sid)) + "Update `erc--session' after session params are guaranteed known. +This is typically during or just after MOTD." + nil) + +(cl-defmethod erc--sid-on-connect ((sid erc--sid-dynamic)) + (erc--sid-dynamic-update sid (erc--sid-dynamic-create))) + +(cl-defgeneric erc--sid-equal-p ((self erc--sid) (other erc--sid)) + "Return non-nil when two sessions exhibit underlying equality. +SELF and OTHER are `erc--sid' struct instances. This should normally be +used only for SID recovery or merging, after which no two SIDs should be +equal that aren't also eq." + (eq self other)) + +(cl-defmethod erc--sid-equal-p ((a erc--sid-fixed) (b erc--sid-fixed)) + (or (eq a b) (eq (erc--sid-symbol a) (erc--sid-symbol b)))) + +(cl-defmethod erc--sid-equal-p ((a erc--sid-dynamic) (b erc--sid-dynamic)) + (or (eq a b) (equal (erc--sid-dynamic-parts a) (erc--sid-dynamic-parts b)))) + +;; It's likely cleaner to create a new type inheriting from +;; `erc--sid-dynamic' than to convert this to a generic. However, the +;; latter may be simpler, e.g., with &context (erc-v3-device +;; erc-v3--device-t) or similar if some future "device" extension with +;; three members, like [Libera.Chat "bob" laptop], ever comes along. + +(defun erc--sid-dynamic-init-parts () + "Return opaque list of atoms to serve as canonical session identifier." + (when-let ((network (erc-network)) + (nick (erc-current-nick))) + (vector network (erc-downcase nick)))) + +(defun erc--sid-dynamic-init-id (elts &optional len) + "Create and return symbol to represent session identified by ELTS. +Use leading interval of length LEN as contributing components. Combine +them with string separator `erc--sid-sep'." + (when elts + (unless len + (setq len 1)) + (intern (mapconcat (lambda (s) (prin1-to-string s t)) + (seq-subseq elts 0 len) + erc--sid-sep)))) + +(defun erc--sid-dynamic-grow-id (session) + "Grow session ID by one component or return nil when at capacity." + (unless (= (length (erc--sid-dynamic-parts session)) + (erc--sid-dynamic-len session)) + (setf (erc--sid-symbol session) + (erc--sid-dynamic-init-id (erc--sid-dynamic-parts session) + (cl-incf (erc--sid-dynamic-len + session)))))) + +(defun erc--sid-dynamic-reset-id (session) + "Restore session to its initial state." + (setf (erc--sid-dynamic-len session) 1 + (erc--sid-symbol session) (erc--sid-dynamic-init-id + (erc--sid-dynamic-parts session)))) + +(defun erc--sid-dynamic-prefix-length (sess-a sess-b) + "Return length of common initial prefix of SESS-A and SESS-B. +Return nil when no such sequence exists (instead of zero)." + (when-let* ((a (erc--sid-dynamic-parts sess-a)) + (b (erc--sid-dynamic-parts sess-b)) + (n (min (length a) (length b))) + ((> n 0)) + ((equal (elt a 0) (elt b 0))) + (i 1)) + (while (and (< i n) + (equal (elt a i) + (elt b i))) + (cl-incf i)) + i)) + +(defun erc--sid-dynamic-update (dest source &rest overrides) + "Update DEST from SOURCE in place. +Copy slots into DEST from SOURCE and recompute ID. Both SOURCE and DEST +must be `erc--sid' objects. OVERRIDES is an optional plist of SLOT VAL +pairs." + (setf (erc--sid-dynamic-parts dest) (or (plist-get overrides :parts) + (erc--sid-dynamic-parts source)) + (erc--sid-dynamic-len dest) (or (plist-get overrides :len) + (erc--sid-dynamic-len source)) + (erc--sid-symbol dest) (or (plist-get overrides :symbol) + (erc--sid-dynamic-init-id + (erc--sid-dynamic-parts dest) + (erc--sid-dynamic-len dest))))) + +(cl-defgeneric erc--sid-reload (_sid &optional _proc _parsed) + "Handle an update to the current session ID. +If provided, PROC should be the current `erc-server-process' and PARSED +the current `erc-response'. SID is an `erc--sid' object." + nil) + +(cl-defmethod erc--sid-reload ((sid erc--sid-dynamic) &optional proc parsed) + "Attempt to refresh a session after a `erc--sid-dynamic-parts' update." + (erc--sid-dynamic-update sid (erc--sid-dynamic-create) + :len (erc--sid-dynamic-len sid)) + (erc-networks--rename-server-buffer (or proc erc-server-process) parsed) + (erc-with-all-buffers-of-server erc-server-process #'erc--default-target + (erc--maybe-update-buffer-name))) + +(cl-defgeneric erc--sid-ensure-comparable ((_ erc--sid) (_ erc--sid)) + "Take measures to ensure two sessions are in comparable states." + nil) + +(cl-defmethod erc--sid-ensure-comparable ((sid erc--sid-dynamic) + (other erc--sid-dynamic)) + "Grow SESSION's ID along with that of the current buffer. +Rename the current buffer if it's session ID has grown." + (when-let ((n (erc--sid-dynamic-prefix-length other sid))) + (while (and (<= (erc--sid-dynamic-len sid) n) + (erc--sid-dynamic-grow-id sid))) + ;; Grow and rename a visited buffer and all its targets + (when (and (> (erc--sid-dynamic-len sid) + (erc--sid-dynamic-len other)) + (erc--sid-dynamic-grow-id other)) + ;; Rename SESSION's buffers using current ID + (erc-buffer-filter (lambda () + (when (eq erc--session other) + (erc--maybe-update-buffer-name))))))) + +(defun erc--sid-sort-buffers (buffers) + "Return a list of target BUFFERS, newest to oldest." + (sort buffers + (lambda (a b) + (> (with-current-buffer a (erc--sid-ts erc--session)) + (with-current-buffer b (erc--sid-ts erc--session)))))) + +;; This being here is a casualty of the cyclic dependency noted above. +;; It belongs alongside `erc-networks--maybe-reclaim-target-buffers', + +(cl-defgeneric erc--shrink-ids-and-buffer-names () + "Recompute session IDs and buffer names while a buffer is being killed. +Ignore the current buffer." + nil) + +(defun erc--refresh-session-buffer-names (session &optional omit) + "Ensure all colliding buffers for session have suffixes. +Then rename current buffer appropriately. Don't consider buffer OMIT +when determining collisions." + (if (erc--examine-targets session erc--buffer-target + #'ignore + (lambda () + (unless (or (not omit) (eq (current-buffer) omit)) + (erc--maybe-update-buffer-name) + t))) + (erc--maybe-update-buffer-name) + (rename-buffer (erc--target-string erc--buffer-target) 'unique))) + +;; This currently doesn't equalize related sessions that may have +;; become mismatched because that shouldn't happen after a connection +;; is up (other than for a brief moment while renicking or similar, +;; when states are inconsistent). + +(cl-defmethod erc--shrink-ids-and-buffer-names + (&context (erc--session erc--sid-dynamic)) + (let ((omit (current-buffer)) + grown) + ;; Gather all grown sessions. + (erc-buffer-filter + (lambda () + (when (and erc--session + (erc--sid-dynamic-p erc--session) + (not (eq omit (current-buffer))) + (not (memq erc--session grown)) + (> (erc--sid-dynamic-len erc--session) 1)) + (push erc--session grown)))) + ;; Check for other sessions with shared prefix. If none exists, + ;; and session is overlong, shrink it. + (dolist (session grown) + (let ((skip t)) + (catch 'found + (dolist (other grown) + (unless (eq session other) + (setq skip nil) + (when (erc--sid-dynamic-prefix-length session other) + (throw 'found (setq skip t)))))) + (unless (or skip (< (erc--sid-dynamic-len session) 2)) + (erc--sid-dynamic-reset-id session) + (erc-buffer-filter + (lambda () + (when (and (eq erc--session session) + (not (eq (current-buffer) omit))) + (if erc--buffer-target + (erc--refresh-session-buffer-names session omit) + (erc--maybe-update-buffer-name)))))))))) + +(defvar erc--sid-sep "/" + "Separator used when joining `erc--sid-dynamic-parts' to form a session ID.") + ;;; Server attributes (defvar-local erc-server-process nil @@ -594,7 +857,9 @@ erc-server-reconnect (let ((erc-server-connect-function (or erc-session-connector #'erc-open-network-stream))) (erc-open erc-session-server erc-session-port erc-server-current-nick - erc-session-user-full-name t erc-session-password))))) + erc-session-user-full-name t erc-session-password + nil nil nil erc-session-client-certificate + (erc--sid-given erc--session)))))) (defun erc-server-delayed-reconnect (buffer) (if (buffer-live-p buffer) @@ -1297,7 +1562,9 @@ define-erc-response-handler nick erc-session-user-full-name nil nil (list chnl) chnl - erc-server-process)) + erc-server-process + nil + (erc--session-id erc-session))) (when buffer (set-buffer buffer) (with-suppressed-warnings @@ -1388,19 +1655,27 @@ define-erc-response-handler ;; sent to the correct nick. also add to bufs, since the user will want ;; to see the nick change in the query, and if it's a newly begun query, ;; erc-channel-users won't contain it - (erc-buffer-filter - (lambda () - (when (equal (erc-default-target) nick) - (setq erc-default-recipients (cons nn (cdr erc-default-recipients)) - erc--buffer-target (erc--target-from-string nn)) - (rename-buffer nn t) ; bug#12002 - (erc-update-mode-line) - (cl-pushnew (current-buffer) bufs)))) + ;; + ;; Possibly still relevant: bug#12002 + (when-let ((buf (erc-get-buffer nick erc-server-process)) + (tgt (erc--target-from-string nn))) + (with-current-buffer buf + (setq erc-default-recipients (cons nn (cdr erc-default-recipients)) + erc--buffer-target tgt)) + (with-current-buffer (erc-get-buffer-create erc-session-server + erc-session-port nil tgt + (erc--sid-given + erc--session)) + ;; Current buffer is among bufs + (erc-update-mode-line))) (erc-update-user-nick nick nn host nil nil login) (cond ((string= nick (erc-current-nick)) (cl-pushnew (erc-server-buffer) bufs) (erc-set-current-nick nn) + ;; Rename session, possibly rename server buf and all targets + (when (erc-network) + (erc--sid-reload erc--session proc parsed)) (erc-update-mode-line) (setq erc-nick-change-attempt-count 0) (setq erc-default-nicks (if (consp erc-nick) erc-nick (list erc-nick))) diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el index 6ec5bc74a8..6e9e867801 100644 --- a/lisp/erc/erc-networks.el +++ b/lisp/erc/erc-networks.el @@ -738,7 +738,11 @@ erc-determine-network Use the server parameter NETWORK if provided, otherwise parse the server name and search for a match in `erc-networks-alist'." ;; The server made it easy for us and told us the name of the NETWORK - (let ((network-name (cdr (assoc "NETWORK" erc-server-parameters)))) + (declare (obsolete "maybe see `erc-networks--determine'" "29.1")) + (let ((network-name (cdr (assoc "NETWORK" + (with-suppressed-warnings + ((obsolete erc-server-parameters)) + erc-server-parameters))))) (if network-name (intern network-name) (or @@ -760,23 +764,234 @@ erc-network-name (defun erc-set-network-name (_proc _parsed) "Set `erc-network' to the value returned by `erc-determine-network'." + (declare (obsolete "maybe see `erc-networks--set-name'" "29.1")) (unless erc-server-connected - (setq erc-network (erc-determine-network))) + (setq erc-network (with-suppressed-warnings + ((obsolete erc-determine-network)) + (erc-determine-network)))) nil) +(defconst erc-networks--name-missing-sentinel (make-symbol "Unknown") + "Value to cover rare case of a literal NETWORK=nil.") + +(defun erc-networks--determine () + "Return the name of the network as a symbol. +Search `erc-networks-alist' for a known entity matching +`erc-server-announced-name'. If that fails, use the display name given +by the `RPL_ISUPPORT' NETWORK parameter." + (or (cl-loop for (name matcher) in erc-networks-alist + when (and matcher (string-match (concat matcher "\\'") + erc-server-announced-name)) + return name) + (and-let* ((vanity (cadr (assq 'NETWORK erc-isupport-parameters))) + ((intern vanity)))) + erc-networks--name-missing-sentinel)) + +(defun erc-networks--set-name (_proc parsed) + "Set `erc-network' to the value returned by `erc-networks--determine'. +Signal an error when the network cannot be determined." + (cl-assert (not erc-server-connected)) + ;; Always update (possibly clobber) current value, if any. + (let ((name (erc-networks--determine))) + (when (eq name erc-networks--name-missing-sentinel) + ;; This can happen theoretically, e.g., if you're editing some + ;; settings interactively on a proxy service that impersonates IRC + ;; but aren't being proxied through to a real network. The + ;; service may send a 422 but no NETWORK param (or *any* 005s). + (let ((m (concat "Failed to determine network. Please set entry for " + erc-server-announced-name " in `erc-network-alist'."))) + (erc-display-error-notice parsed m) + (erc-error "Failed to determine network"))) ; beep + (setq erc-network name)) + nil) + +;; This lives here in this file because all the other "on connect" +;; MOTD stuff ended up here (but perhaps that needs to change). + +(defun erc-networks--ensure-announced (_ parsed) + "Set a fallback `erc-server-announced-name' if still unset. +Copy source (prefix) from MOTD-ish message as a last resort." + ;; The 004 handler never ran; see 2004-03-10 Diane Murray in change log + (unless erc-server-announced-name + (let ((m (concat "Failed to determine server name. " + "If this was unexpected, please M-x erc-bug RET."))) + (erc-display-error-notice parsed m)) + (setq erc-server-announced-name (erc-response.sender parsed))) + nil) + +(defun erc-networks--copy-name (_buffer) + "Copy `erc-network' from the server buffer." + ;; Arg _buffer is always current buffer. + (when erc--buffer-target + (setq erc-network (erc-network)))) + (defun erc-unset-network-name (_nick _ip _reason) "Set `erc-network' to nil." (setq erc-network nil) nil) +;; TODO add note in Commentary saying that this module is considered a +;; core module and that it's as much about buffer naming and session +;; identity as anything else. + +(defun erc-networks--insert-transplanted-content (content) + (let ((inhibit-read-only t)) + (save-excursion + (save-restriction + (widen) + (goto-char (point-min)) + (insert-before-markers content))))) + +;; This should run whenever a session ID is updated. + +(defun erc-networks--maybe-reclaim-target-buffers (new-proc session announced) + "Visit disowned buffers for same SESSION and associate with NEW-PROC. +ANNOUNCED is the server-reported host name stored as +`erc-server-announced-name'." + (erc-buffer-filter + (lambda () + (when (and erc--buffer-target + (not erc-server-connected) + (erc--sid-equal-p erc--session session) + (or (not (erc--target-local-p erc--buffer-target)) + (string= erc-server-announced-name announced))) + ;; If a target buffer exists for the current process, kill this + ;; stale one after transplanting its content; else reinstate. + (if-let ((existing (erc-get-buffer + (erc--target-string erc--buffer-target) new-proc))) + (progn + (widen) + (let ((content (buffer-substring (point-min) + erc-insert-marker))) + (kill-buffer) ; allow target-buf renaming hook to run + (with-current-buffer existing + (erc--maybe-update-buffer-name) + (erc-networks--insert-transplanted-content content)))) + (setq erc-server-process new-proc + erc-server-connected t + erc--session session)))))) + +(defun erc-networks--copy-over-server-buffer-contents (existing name) + "Kill off existing server buffer after copying its contents. +Must be called from the replacement buffer." + ;; ERC expects `erc-open' to be idempotent when setting up local + ;; vars and other context properties for a new session. Thus, it's + ;; unlikely we'll have to copy anything else over besides text. And + ;; no reconciling of user tables, etc. happens during a normal + ;; reconnect, so we should be fine just sticking to text. (Right?) + (let ((text (with-current-buffer existing + ;; This `erc--session' should be `erc--sid-equal-p' + ;; to caller's session and older if not eq. + ;; + ;; `erc-server-process' should be set but dead + ;; and eq `get-buffer-process' unless latter nil + (delete-process erc-server-process) + (buffer-substring (point-min) erc-insert-marker))) + erc-kill-server-hook + erc-kill-buffer-hook) + (erc-networks--insert-transplanted-content text) + (kill-buffer name))) + +;; If another session is "related", meaning its ID shares a common +;; prefix, ensure our ID is unique by extending it. However, if the +;; existing session is equivalent, just trust that it's the proper +;; length and adopt it by overwriting ours. (Note target buffers are +;; considered as well because server buffers are often killed.) + +(defun erc-networks--update-server-session () + "Maybe grow or replace the current session." + (let* ((session erc--session) + (buffer (current-buffer)) + (f (lambda () + (unless (or (eq (current-buffer) buffer) + (eq erc--session session)) + (if (erc--sid-equal-p session erc--session) + (throw 'buffer erc--session) + (erc--sid-ensure-comparable session erc--session) + nil)))) + (found (catch 'buffer (erc-buffer-filter f)))) + (when found + (setq erc--session found)))) + +;; This stuff is only meant to run when initializing a newly connected +;; server buffer, whereas `erc-networks--rename-server-buffer' can run +;; mid-session after the session's core components have changed. + +(defun erc-networks--init-session (_proc _parsed) + "Update session with real network name." + ;; Initialize session for real now that we know the network + (cl-assert erc-network) + (unless (erc--sid-symbol erc--session) ; unless we've just reconnected + (erc--sid-on-connect erc--session)) + ;; Find duplicate sessions or other conflicting sessions and act + ;; accordingly. + (erc-networks--update-server-session) + ;; + nil) + +(defun erc-networks--rename-server-buffer (new-proc &optional _parsed) + "Rename server buffer with newly fleshed out session ID. +Assume the current buffer is a server buffer with a newly established +connection. Assume the network name has just been discovered. Refresh +the session ID if necessary and rename the buffer after it, unless +`erc-reuse-buffers' is nil, in which case let `generate-new-buffer-name' +do the renaming instead. + +When a buffer already exists with the chosen name, copy over its +contents and delete it. However, when its process is still alive, kill +off the newer, current one. This can happen, for example, after a +perceived loss in network connectivity turns out to be a false alarm +and the endpoint is a bouncer." + (cl-assert erc-network) + (cl-assert (eq new-proc erc-server-process)) + (cl-assert (erc--sid-symbol erc--session)) + ;; Always look for targets to reassociate because original server + ;; buffer may have been deleted. + (erc-networks--maybe-reclaim-target-buffers new-proc erc--session + erc-server-announced-name) + (let* ((name (symbol-name (erc--sid-symbol erc--session))) + ;; When this ends up being the current buffer, either we have + ;; a "given" ID or the buffer was reused on reconnecting. + (existing (get-buffer name))) + (cond ((or (not existing) + (erc--sid-given erc--session) + (eq existing (current-buffer))) + (rename-buffer name)) + ;; Abort on accidental reconnect or failure to pass :id param for + ;; avoidable collisions. + ((erc-server-process-alive existing) + (kill-local-variable 'erc-network) + (delete-process new-proc) + (erc-display-error-notice nil (format "Buffer %s still connected" + name)) + (erc-set-active-buffer existing)) + ;; Copy over old buffer's contents and kill it + (erc-reuse-buffers + (erc-networks--copy-over-server-buffer-contents existing name) + (rename-buffer name)) + (t (rename-buffer (generate-new-buffer-name name))))) + nil) + (define-erc-module networks nil "Provide data about IRC networks." - ((add-hook 'erc-server-375-functions #'erc-set-network-name) - (add-hook 'erc-server-422-functions #'erc-set-network-name) - (add-hook 'erc-disconnected-hook #'erc-unset-network-name)) - ((remove-hook 'erc-server-375-functions #'erc-set-network-name) - (remove-hook 'erc-server-422-functions #'erc-set-network-name) - (remove-hook 'erc-disconnected-hook #'erc-unset-network-name))) + ((add-hook 'erc-server-376-functions #'erc-networks--rename-server-buffer) + (add-hook 'erc-server-422-functions #'erc-networks--rename-server-buffer) + (add-hook 'erc-server-376-functions #'erc-networks--init-session) + (add-hook 'erc-server-422-functions #'erc-networks--init-session) + (add-hook 'erc-server-376-functions #'erc-networks--set-name) + (add-hook 'erc-server-422-functions #'erc-networks--set-name) + (add-hook 'erc-server-376-functions #'erc-networks--ensure-announced) + (add-hook 'erc-server-422-functions #'erc-networks--ensure-announced) + (add-hook 'erc-connect-pre-hook #'erc-networks--copy-name)) + ((remove-hook 'erc-server-376-functions #'erc-networks--ensure-announced) + (remove-hook 'erc-server-422-functions #'erc-networks--ensure-announced) + (remove-hook 'erc-server-376-functions #'erc-networks--set-name) + (remove-hook 'erc-server-422-functions #'erc-networks--set-name) + (remove-hook 'erc-server-376-functions #'erc-networks--init-session) + (remove-hook 'erc-server-422-functions #'erc-networks--init-session) + (remove-hook 'erc-server-376-functions #'erc-networks--rename-server-buffer) + (remove-hook 'erc-server-422-functions #'erc-networks--rename-server-buffer) + (remove-hook 'erc-connect-pre-hook #'erc-networks--copy-name))) (defun erc-ports-list (ports) "Return a list of PORTS. diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 63f7133f96..35d56c3b82 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -190,12 +190,21 @@ erc-user-full-name :set (lambda (sym val) (set sym (if (functionp val) (funcall val) val)))) -(defcustom erc-rename-buffers nil +(defcustom erc-rename-buffers t "Non-nil means rename buffers with network name, if available." :version "24.5" :group 'erc :type 'boolean) +;; For the sake of compatibility, an ID will be created on the user's +;; behalf when `erc-rename-buffers' is nil and one wasn't provided. +;; The name will simply be that of the buffer, usually SERVER:PORT. +;; This violates the policy of treating provided IDs as gospel, but +;; it'll have to do for now. + +(make-obsolete-variable 'erc-rename-buffers + "old behavior when t now permanent" "29.1") + (defvar erc-password nil "Password to use when authenticating to an IRC server. It is not strictly necessary to provide this, since ERC will @@ -1639,55 +1648,148 @@ erc-port-equal (declare-function 'erc-network "erc-networks") -(defun erc-generate-new-buffer-name (server port target) - "Create a new buffer name based on the arguments." - (when (numberp port) (setq port (number-to-string port))) - (let* ((buf-name (or target - (let ((name (concat server ":" port))) - (when (> (length name) 1) - name)) - ;; This fallback should in fact never happen. - "*erc-server-buffer*")) - (full-buf-name (concat buf-name "/" server)) - (dup-buf-name (buffer-name (car (erc-channel-list nil)))) - buffer-name) - ;; Reuse existing buffers, but not if the buffer is a connected server - ;; buffer and not if its associated with a different server than the - ;; current ERC buffer. - ;; If buf-name is taken by a different connection (or by something !erc) - ;; then see if "buf-name/server" meets the same criteria. - (if (and dup-buf-name (string-match-p (concat buf-name "/") dup-buf-name)) - (setq buffer-name full-buf-name) ; ERC buffer with full name already exists. - (dolist (candidate (list buf-name full-buf-name)) - (if (and (not buffer-name) - erc-reuse-buffers - (or (not (get-buffer candidate)) - ;; Looking for a server buffer, so there's no target. - (and (not target) - (with-current-buffer (get-buffer candidate) - (and (erc-server-buffer-p) - (not (erc-server-process-alive))))) - ;; Channel buffer; check that it's from the right server. - (and target - (with-current-buffer (get-buffer candidate) - (and (string= erc-session-server server) - (erc-port-equal erc-session-port port)))))) - (setq buffer-name candidate) - (when (and (not buffer-name) (get-buffer buf-name) erc-reuse-buffers) - ;; A new buffer will be created with the name buf-name/server, rename - ;; the existing name-duplicated buffer with the same format as well. - (with-current-buffer (get-buffer buf-name) - (when (derived-mode-p 'erc-mode) ; ensure it's an erc buffer - (rename-buffer - (concat buf-name "/" (or erc-session-server erc-server-announced-name))))))))) - ;; If buffer-name is unset, neither candidate worked out for us, - ;; fallback to the old uniquification method: - (or buffer-name (generate-new-buffer-name full-buf-name)))) - -(defun erc-get-buffer-create (server port target) +(defun erc--maybe-rename-surviving-target-buffer () + "Maybe drop session suffix from fellow target-buffer's name. +But only do so when there's a single survivor with a target matching +that of the dying buffer." + (when-let* + ((target erc--buffer-target) + ;; Buffer name includes session-ID suffix + ((not (string= (erc--target-symbol target) ; string= t "t" -> t + (erc-downcase (buffer-name))))) + (buf (current-buffer)) + ;; All buffers, not just those belonging to same process + (others (erc-buffer-filter + (lambda () + (when-let ((erc--buffer-target) + ((not (eq buf (current-buffer))))) + (eq (erc--target-symbol target) + (erc--target-symbol erc--buffer-target)))))) + ((not (cdr others)))) + (with-current-buffer (car others) + (rename-buffer (erc--target-string target))))) + +(defun erc--examine-targets (session target on-dupe on-collision) + "Visit all ERC target buffers with the same TARGET. +Call ON-DUPE when a buffer's session belongs to SESSION or \"should\" +belong to SESSION after reconciliation. Call ON-COLLISION otherwise. +Neither function should accept any args. Expect TARGET to be an +`erc--target' object." + (declare (indent 2)) + (let ((announced erc-server-announced-name)) + (erc-buffer-filter + (lambda () + (when (and erc--buffer-target + (eq (erc--target-symbol erc--buffer-target) + (erc--target-symbol target))) + (let ((oursp (if (erc--target-local-p target) + (equal announced erc-server-announced-name) + (erc--sid-equal-p session erc--session)))) + (funcall (if oursp on-dupe on-collision)))))))) + +(defun erc--construct-buffer-name () + "Assemble buffer name from relevant local session variables." + (if erc--buffer-target + (concat (erc--target-string erc--buffer-target) + "@" (if (erc--target-local-p erc--buffer-target) + erc-server-announced-name + (symbol-name (erc--sid-symbol erc--session)))) + (symbol-name (erc--sid-symbol erc--session)))) + +(defun erc--maybe-update-buffer-name () + "Update current buffer name to reflect SESSION info if necessary." + (when-let* ((new-name (erc--construct-buffer-name)) + ((not (equal (buffer-name) new-name)))) + (rename-buffer new-name 'unique))) + +(defun erc--reconcile-buffer-names (target session) + "Reserve preferred buffer name for TARGET and SESSION. +Expect TARGET to be an `erc--buffer-target' instance. Guarantee that at +most one existing buffer has the same `erc--session' and a case-mapped +target, i.e., `erc--target-symbol'. If other buffers with equivalent +targets exist, rename them to TARGET@their-session-id and return +TARGET@our-session-id. Otherwise return TARGET as a string. When +multiple buffers for TARGET exist for the current session, rename them +with suffixes going from newest to oldest." + (let* (existing ; Former selves or unexpected dupes (for now allow > 1) + ;; Renamed ERC buffers on other networks matching target + (namesakes (erc--examine-targets session target + (lambda () (push (current-buffer) existing) nil) + ;; Append session ID as TARGET@SESSION-ID, + ;; possibly qualifying to achieve uniqueness. + (lambda () + (unless (erc--target-local-p erc--buffer-target) + (erc--sid-ensure-comparable session erc--session)) + (erc--maybe-update-buffer-name) + t))) + ;; Must follow ^ because session may have been modified + (esid (if (erc--target-local-p target) + erc-server-announced-name + (erc--sid-symbol session))) + (tgt-name (erc--target-string target)) + (name (if namesakes (format "%s@%s" tgt-name esid) tgt-name)) + placeholder) + ;; If we don't exist, claim name temporarily while renaming others + (when-let* (namesakes + (ex (get-buffer name)) + ((not (memq ex existing))) + (temp-name (generate-new-buffer-name (format "*%s*" name)))) + (setq existing (remq ex existing)) + (with-current-buffer ex + (rename-buffer temp-name) + (setq placeholder (get-buffer-create name)) + (rename-buffer name 'unique))) + (dolist (ex (erc--sid-sort-buffers existing)) + (with-current-buffer ex + (rename-buffer name 'unique))) + (when placeholder (kill-buffer placeholder)) + name)) + +(defun erc-generate-new-buffer-name (server port target &optional tgt-info id) + "Determine the name of an ERC buffer. +When TGT-INFO is nil, assume this is a server buffer. If ID is non-nil, +return ID as a string unless a buffer already exists with a live server +process, in which case signal an error. When ID is nil, return a +temporary name based on SERVER and PORT to be replaced with the network +name when discovered (see `erc-networks--rename-server-buffer'). Allow +either SERVER or PORT (but not both) to be nil to accommodate oddball +`erc-server-connect-function's. + +When TGT-INFO is non-nil, expect its string field to match the redundant +param TARGET (retained for compatibility). Whenever possibly, prefer +returning TGT-INFO's string unmodified. But when a case-insensitive +collision prevents that, return target@ID when ID is non-nil or +target@network otherwise after renaming the conflicting buffer in the +same manner. If the `networks' module isn't loaded, return target or +target." + (when target ; compat + (setq tgt-info (erc--target-from-string target))) + (if tgt-info + (let* ((esid (erc--sid-symbol erc--session)) + (name (if esid + (erc--reconcile-buffer-names tgt-info erc--session) + (erc--target-string tgt-info)))) + (if (and esid erc-reuse-buffers) + name + (generate-new-buffer-name name))) + (if id + (progn + (when-let* ((buf (get-buffer (symbol-name id))) + ((erc-server-process-alive buf))) + (user-error "Session with ID %S already exists" id)) + (symbol-name id)) + (generate-new-buffer-name (if (and server port) + (format "%s:%s" server port) + (or server port)))))) + +(defun erc-get-buffer-create (server port target &optional tgt-info id) "Create a new buffer based on the arguments." - (get-buffer-create (erc-generate-new-buffer-name server port target))) - + (when target ; compat + (setq tgt-info (erc--target-from-string target))) + (if (and erc--server-reconnecting (not tgt-info)) + (current-buffer) + (get-buffer-create + (erc-generate-new-buffer-name server port nil tgt-info id)))) (defun erc-member-ignore-case (string list) "Return non-nil if STRING is a member of LIST. @@ -2030,7 +2132,7 @@ erc-setup-buffer (defun erc-open (&optional server port nick full-name connect passwd tgt-list channel process - client-certificate) + client-certificate id) "Connect to SERVER on PORT as NICK with FULL-NAME. If CONNECT is non-nil, connect to the server. Otherwise assume @@ -2047,11 +2149,14 @@ erc-open or t, which means that `auth-source' will be queried for the private key and the certificate. +When non-nil, ID should be a symbol for identifying the connection. + Returns the buffer for the given server or channel." - (let ((buffer (erc-get-buffer-create server port channel)) - (old-buffer (current-buffer)) - old-point - continued-session) + (let* ((target (and channel (erc--target-from-string channel))) + (buffer (erc-get-buffer-create server port nil target id)) + (old-buffer (current-buffer)) + old-point + continued-session) (when connect (run-hook-with-args 'erc-before-connect server port nick)) (erc-update-modules) (set-buffer buffer) @@ -2081,7 +2186,7 @@ erc-open (set-marker erc-insert-marker (point)) ;; stack of default recipients (setq erc-default-recipients tgt-list) - (setq erc--buffer-target (and channel (erc--target-from-string channel))) + (setq erc--buffer-target target) (setq erc-server-current-nick nil) ;; Initialize erc-server-users and erc-channel-users (if connect @@ -2129,6 +2234,9 @@ erc-open secret)))) ;; client certificate (only useful if connecting over TLS) (setq erc-session-client-certificate client-certificate) + (setq erc--session (if connect + (erc--sid-create id) + (with-current-buffer old-buffer erc--session))) ;; debug output buffer (setq erc-dbuf (when erc-log-p @@ -2265,7 +2373,8 @@ erc (port (erc-compute-port)) (nick (erc-compute-nick)) password - (full-name (erc-compute-full-name))) + (full-name (erc-compute-full-name)) + id) "ERC is a powerful, modular, and extensible IRC client. This function is the main entry point for ERC. @@ -2277,6 +2386,7 @@ erc (nick (erc-compute-nick)) password (full-name (erc-compute-full-name)) + id That is, if called with @@ -2284,9 +2394,14 @@ erc then the server and full-name will be set to those values, whereas `erc-compute-port' and `erc-compute-nick' will be invoked -for the values of the other parameters." +for the values of the other parameters. + +When present, ID should be a string or a symbol for identifying the +connection unequivocally. This is rarely needed and not available +interactively." (interactive (erc-select-read-args)) - (erc-open server port nick full-name t password)) + (erc-open server port nick full-name t password nil nil nil nil + (if (stringp id) (intern id) id))) ;;;###autoload (defalias 'erc-select #'erc) @@ -2298,7 +2413,8 @@ erc-tls (nick (erc-compute-nick)) password (full-name (erc-compute-full-name)) - client-certificate) + client-certificate + id) "ERC is a powerful, modular, and extensible IRC client. This function is the main entry point for ERC over TLS. @@ -2312,6 +2428,7 @@ erc-tls password (full-name (erc-compute-full-name)) client-certificate + id That is, if called with @@ -2334,12 +2451,19 @@ erc-tls (erc-tls :server \"irc.libera.chat\" :port 6697 :client-certificate '(\"/home/bandali/my-cert.key\" - \"/home/bandali/my-cert.crt\"))" + \"/home/bandali/my-cert.crt\")) + +When present, ID should be a string or a symbol for identifying the +connection unequivocally. This option is generally not needed. See +info node `(erc) Connecting' for use cases. (Self-quoting symbols or +strings evaluating as such when read are invalid.) Not available +interactively." (interactive (let ((erc-default-port erc-default-port-tls)) (erc-select-read-args))) (let ((erc-server-connect-function 'erc-open-tls-stream)) (erc-open server port nick full-name t password - nil nil nil client-certificate))) + nil nil nil client-certificate + (if (stringp id) (intern id) id)))) (defun erc-open-tls-stream (name buffer host port &rest parameters) "Open an TLS stream to an IRC server. @@ -2406,13 +2530,19 @@ erc-log-irc-protocol If OUTBOUND is non-nil, STRING is being sent to the IRC server and appears in face `erc-input-face' in the buffer. Lines must already -contain CRLF endings. Peer is identified by the most precise label -available at run time, starting with the network name, followed by the -announced host name, and falling back to the dialed :." +contain CRLF endings. A peer is identified by the most precise label +available, starting with the session ID followed by the server-reported +hostname, and falling back to the dialed : pair. + +When capturing logs for multiple peers and sorting them into buckets, +such inconsistent labeling may pose a problem until the MOTD is +received. Setting a fixed `erc--session' can serve as a workaround." (when erc-debug-irc-protocol - (let ((esid (or (and (erc-network) (erc-network-name)) - erc-server-announced-name - (format "%s:%s" erc-session-server erc-session-port))) + (let ((esid (if-let ((erc--session) + (esid (erc--sid-symbol erc--session))) + (symbol-name esid) + (or erc-server-announced-name + (format "%s:%s" erc-session-server erc-session-port)))) (ts (when erc-debug-irc-protocol-time-format (format-time-string erc-debug-irc-protocol-time-format)))) (with-current-buffer (get-buffer-create "*erc-protocol*") @@ -6573,21 +6703,13 @@ erc-format-target-and/or-network "Return the network or the current target and network combined. If the name of the network is not available, then use the shortened server name instead." - (let ((network-name (or (and (fboundp 'erc-network-name) (erc-network-name)) - (erc-shorten-server-name - (or erc-server-announced-name - erc-session-server))))) - (when (and network-name (symbolp network-name)) - (setq network-name (symbol-name network-name))) - (cond ((erc-default-target) - (concat (erc-string-no-properties (erc-default-target)) - "@" network-name)) - ((and network-name - (not (get-buffer network-name))) - (when erc-rename-buffers - (rename-buffer network-name)) - network-name) - (t (buffer-name (current-buffer)))))) + (if-let ((erc--buffer-target) + (name (if-let ((esid (erc--sid-symbol erc--session))) + (symbol-name esid) + (erc-shorten-server-name (or erc-server-announced-name + erc-session-server))))) + (concat (erc--target-string erc--buffer-target) "@" name) + (buffer-name))) (defun erc-format-away-status () "Return a formatted `erc-mode-line-away-status-format' if `erc-away' is non-nil." @@ -7007,18 +7129,22 @@ erc-format-message ;; FIXME: Don't set the hook globally! (add-hook 'kill-buffer-hook #'erc-kill-buffer-function) -(defcustom erc-kill-server-hook '(erc-kill-server) - "Invoked whenever a server buffer is killed via `kill-buffer'." +(defcustom erc-kill-server-hook '(erc-kill-server + erc--shrink-ids-and-buffer-names) + "Invoked whenever a live server buffer is killed via `kill-buffer'." :group 'erc-hooks :type 'hook) -(defcustom erc-kill-channel-hook '(erc-kill-channel) +(defcustom erc-kill-channel-hook '(erc-kill-channel + erc--shrink-ids-and-buffer-names + erc--maybe-rename-surviving-target-buffer) "Invoked whenever a channel-buffer is killed via `kill-buffer'." :group 'erc-hooks :type 'hook) -(defcustom erc-kill-buffer-hook nil - "Hook run whenever a non-server or channel buffer is killed. +(defcustom erc-kill-buffer-hook '(erc--shrink-ids-and-buffer-names + erc--maybe-rename-surviving-target-buffer) + "Hook run whenever a query buffer or a dead server buffer is killed. See also `kill-buffer'." :group 'erc-hooks diff --git a/test/lisp/erc/erc-networks-tests.el b/test/lisp/erc/erc-networks-tests.el new file mode 100644 index 0000000000..08781d2eb0 --- /dev/null +++ b/test/lisp/erc/erc-networks-tests.el @@ -0,0 +1,525 @@ +;;; erc-networks-tests.el --- Tests for erc-networks. -*- lexical-binding:t -*- + +;; Copyright (C) 2020-2021 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 . + +;;; Code: + +(require 'ert-x) ; cl-lib + +(require 'erc-networks) + +;; FIXME maybe create common helpers file; these three are copied from +;; test/lisp/erc/erc-tests.el + +(defun erc-tests--create-live-proc (&optional buf) + (let ((proc (start-process "sleep" (or buf (current-buffer)) "sleep" "1"))) + (set-process-query-on-exit-flag proc nil) + proc)) + +(defun erc-tests--create-dead-proc (&optional buf) + (let ((p (start-process "true" (or buf (current-buffer)) "true"))) + (while (process-live-p p) (sit-for 0.1)) + p)) + +(defun erc-tests--clean-bufs () + (let (erc-kill-channel-hook + erc-kill-server-hook + erc-kill-buffer-hook) + (dolist (buf (erc-buffer-list)) + (kill-buffer buf)))) + +(ert-deftest erc-networks--set-name () + (with-current-buffer (get-buffer-create "localhost:6667") + (let (erc-server-announced-name + erc-isupport-parameters + erc-network + calls) + (erc-mode) + (cl-letf (((symbol-function 'erc-display-line-1) + (lambda (&rest r) (push r calls)))) + (ert-info ("Errors when `erc-server-announced-name' unset") + (should-error (erc-networks--set-name nil (make-erc-response)))) + (should-not calls) + (setq erc-server-announced-name "irc.fake.gnu.org") + (ert-info ("Errors out when table empty and NETWORK param unset") + (let ((err (should-error (erc-networks--set-name + nil (make-erc-response))))) + (should (string-match-p "failed" (cadr err))) + (should (eq (car err) 'error))) + (should (string-match-p "*** Failed" (car (pop calls))))))) + (erc-tests--clean-bufs))) + +(ert-deftest erc-networks--rename-server-buffer--no-existing--orphan () + (with-current-buffer (get-buffer-create "#chan") + (erc-mode) + (setq erc-network 'FooNet + erc-server-current-nick "tester" + erc--buffer-target (erc--target-from-string "#chan") + erc--session (erc--sid-create nil))) + + (with-current-buffer (get-buffer-create "irc.foonet.org") + (erc-mode) + (setq erc-network 'FooNet + erc-server-current-nick "tester" + erc-server-process (erc-tests--create-live-proc) + erc--session (erc--sid-create nil)) + (should-not (erc-networks--rename-server-buffer erc-server-process)) + (should (string= (buffer-name) "FooNet"))) + + (ert-info ("Channel buffer reassociated") + (erc-server-process-alive "#chan") + (with-current-buffer "#chan" + (should erc-server-connected) + (erc-with-server-buffer + (should (string= (buffer-name) "FooNet"))))) + + (erc-tests--clean-bufs)) + +(ert-deftest erc-networks--rename-server-buffer--existing--reuse () + (let* ((old-buf (get-buffer-create "FooNet")) + (old-proc (erc-tests--create-dead-proc old-buf))) + + (with-current-buffer old-buf + (erc-mode) + (insert "*** Old buf") + (setq erc-network 'FooNet + erc-server-current-nick "tester" + erc-insert-marker (set-marker (make-marker) (point-max)) + erc-server-process old-proc + erc--session (erc--sid-create nil))) + + (with-current-buffer (get-buffer-create "#chan") + (erc-mode) + (setq erc-network 'FooNet + erc-server-process old-proc + erc--session (erc--sid-create nil) + erc--buffer-target (erc--target-from-string "#chan"))) + + (ert-info ("New buffer steals name, content") + (with-current-buffer (get-buffer-create "irc.foonet.org") + (erc-mode) + (setq erc-network 'FooNet + erc-server-current-nick "tester" + erc-server-process (erc-tests--create-live-proc) + erc--session (erc--sid-create nil)) + (should-not (erc-networks--rename-server-buffer erc-server-process)) + (should (string= (buffer-name) "FooNet")) + (goto-char (point-min)) + (should (search-forward "Old buf")))) + + (ert-info ("Channel buffer reassociated") + (erc-server-process-alive "#chan") + (with-current-buffer "#chan" + (should erc-server-connected) + (should-not (eq erc-server-process old-proc)) + (erc-with-server-buffer + (should (string= (buffer-name) "FooNet"))))) + + (ert-info ("Original buffer killed off") + (should-not (buffer-live-p old-buf)))) + + (erc-tests--clean-bufs)) + +(ert-deftest erc-networks--rename-server-buffer--existing--noreuse () + (should erc-reuse-buffers) ; default + (let* ((old-buf (get-buffer-create "FooNet")) + (old-proc (erc-tests--create-dead-proc old-buf)) + erc-reuse-buffers) + (with-current-buffer old-buf + (erc-mode) + (insert "*** Old buf") + (setq erc-network 'FooNet + erc-server-current-nick "tester" + erc-insert-marker (set-marker (make-marker) (point-max)) + erc-server-process old-proc + erc--session (erc--sid-create nil))) + (with-current-buffer (get-buffer-create "#chan") + (erc-mode) + (setq erc-network 'FooNet + erc-server-process old-proc + erc--session (erc--sid-create nil) + erc--buffer-target (erc--target-from-string "#chan"))) + + (ert-info ("Server buffer uniquely renamed") + (with-current-buffer (get-buffer-create "irc.foonet.org") + (erc-mode) + (setq erc-network 'FooNet + erc-server-current-nick "tester" + erc-server-process (erc-tests--create-live-proc) + erc--session (erc--sid-create nil)) + (should-not (erc-networks--rename-server-buffer erc-server-process)) + (should (string= (buffer-name) "FooNet<2>")) + (goto-char (point-min)) + (should-not (search-forward "Old buf" nil t)))) + + (ert-info ("Channel buffer reassociated") + (erc-server-process-alive "#chan") + (with-current-buffer "#chan" + (should erc-server-connected) + (should-not (eq erc-server-process old-proc)) + (erc-with-server-buffer + (should (string= (buffer-name) "FooNet<2>"))))) + + (ert-info ("Old buffer still around") + (should (buffer-live-p old-buf)))) + + (erc-tests--clean-bufs)) + +(ert-deftest erc-networks--rename-server-buffer--reconnecting () + (let* ((old-buf (get-buffer-create "FooNet")) + (old-proc (erc-tests--create-dead-proc old-buf))) + + (with-current-buffer old-buf + (erc-mode) + (insert "*** Old buf") + (setq erc-network 'FooNet + erc-server-current-nick "tester" + erc-insert-marker (set-marker (make-marker) (point-max)) + erc-server-process old-proc + erc--session (erc--sid-create nil))) + + (with-current-buffer (get-buffer-create "#chan") + (erc-mode) + (setq erc-network 'FooNet + erc-server-process old-proc + erc--buffer-target (erc--target-from-string "#chan") + erc--session (erc--sid-create nil))) + + (ert-info ("No new buffer") + (with-current-buffer old-buf + (setq erc-server-process (erc-tests--create-live-proc)) + (should-not (erc-networks--rename-server-buffer erc-server-process)) + (should (string= (buffer-name) "FooNet")) + (goto-char (point-min)) + (should (search-forward "Old buf")))) + + (ert-info ("Channel buffer updated with live proc") + (erc-server-process-alive "#chan") + (with-current-buffer "#chan" + (should erc-server-connected) + (should-not (eq erc-server-process old-proc)) + (erc-with-server-buffer + (should (string= (buffer-name) "FooNet")))))) + + (erc-tests--clean-bufs)) + +(ert-deftest erc-networks--rename-server-buffer--session-id () + (let* ((old-buf (get-buffer-create "MySession")) + (old-proc (erc-tests--create-dead-proc old-buf))) + + (with-current-buffer old-buf + (erc-mode) + (insert "*** Old buf") + (setq erc-network 'FooNet + erc--session (erc--sid-create 'MySession) + erc-insert-marker (set-marker (make-marker) (point-max)) + erc-server-process old-proc)) + + (with-current-buffer (get-buffer-create "#chan") + (erc-mode) + (setq erc-network 'FooNet + erc--session (erc--sid-create 'MySession) + erc-server-process old-proc + erc--buffer-target (erc--target-from-string "#chan"))) + + (ert-info ("No new buffer") + (with-current-buffer old-buf + (setq erc-server-process (erc-tests--create-live-proc)) + (should-not (erc-networks--rename-server-buffer erc-server-process)) + (should (string= (buffer-name) "MySession")) + (goto-char (point-min)) + (should (search-forward "Old buf")))) + + (ert-info ("Channel buffer updated with live proc") + (erc-server-process-alive "#chan") + (with-current-buffer "#chan" + (should erc-server-connected) + (should-not (eq erc-server-process old-proc)) + (erc-with-server-buffer + (should (string= (buffer-name) "MySession")))))) + + (erc-tests--clean-bufs)) + +(ert-deftest erc-networks--rename-server-buffer--existing--live () + (let* (erc-kill-server-hook + erc-insert-modify-hook + (old-buf (get-buffer-create "FooNet")) + (old-proc (erc-tests--create-live-proc old-buf))) ; live + + (with-current-buffer old-buf + (erc-mode) + (insert "*** Old buf") + (setq erc-network 'FooNet + erc-server-current-nick "tester" + erc-insert-marker (set-marker (make-marker) (point-max)) + erc-server-process old-proc + erc--session (erc--sid-create nil)) + (should (erc-server-process-alive))) + + (with-current-buffer (get-buffer-create "#chan") + (erc-mode) + (setq erc-network 'FooNet + erc-server-process old-proc + erc--session (erc--sid-create nil) + erc-server-connected t + erc--buffer-target (erc--target-from-string "#chan"))) + + (ert-info ("New buffer rejected, abandoned, not killed") + (with-current-buffer (get-buffer-create "irc.foonet.org") + (erc-mode) + (setq erc-network 'FooNet + erc-server-current-nick "tester" + erc-insert-marker (set-marker (make-marker) (point-max)) + erc-server-process (erc-tests--create-live-proc) + erc--session (erc--sid-create nil)) + (should-not (erc-networks--rename-server-buffer erc-server-process)) + (should (eq erc-active-buffer old-buf)) + (should-not (erc-server-process-alive)) + (should (string= (buffer-name) "irc.foonet.org")) + (goto-char (point-min)) + (search-forward "still connected"))) + + (ert-info ("Channel buffer updated with live proc") + (should (erc-server-process-alive "#chan")) + (with-current-buffer "#chan" + (should erc-server-connected) + (should (erc-server-buffer-live-p)) + (should (eq erc-server-process old-proc)) + (should (buffer-live-p (process-buffer erc-server-process))) + (with-current-buffer (process-buffer erc-server-process) + (should (eq (current-buffer) (get-buffer "FooNet"))) + (should (eq (current-buffer) old-buf)))))) + + (should (get-buffer "FooNet")) + (should (get-buffer "irc.foonet.org")) + + (erc-tests--clean-bufs)) + +(ert-deftest erc-networks--rename-server-buffer--local-match () + (let* ((old-buf (get-buffer-create "FooNet")) + (old-proc (erc-tests--create-dead-proc old-buf)) + (erc-isupport-parameters '((CHANTYPES "&#")))) + + (with-current-buffer old-buf + (erc-mode) + (insert "*** Old buf") + (setq erc-network 'FooNet + erc-server-current-nick "tester" + erc-server-announced-name "us-east.foonet.org" + erc-insert-marker (set-marker (make-marker) (point-max)) + erc-server-process old-proc + erc--session (erc--sid-create nil))) + + (with-current-buffer (get-buffer-create "&chan") + (erc-mode) + (setq erc-network 'FooNet + erc-server-process old-proc + erc-server-announced-name "us-east.foonet.org" + erc--buffer-target (erc--target-from-string "&chan") + erc--session (erc--sid-create nil))) + + (ert-info ("New server buffer steals name, content") + (with-current-buffer (get-buffer-create "irc.foonet.org") + (erc-mode) + (setq erc-network 'FooNet + erc-server-current-nick "tester" + erc-server-announced-name "us-east.foonet.org" + erc-server-process (erc-tests--create-live-proc) + erc--session (erc--sid-create nil)) + (should-not (erc-networks--rename-server-buffer erc-server-process)) + (should (string= (buffer-name) "FooNet")) + (goto-char (point-min)) + (should (search-forward "Old buf")))) + + (ert-info ("Channel buffer reassociated when &local server matches") + (should (erc-server-process-alive "&chan")) + (with-current-buffer "&chan" + (should erc-server-connected) + (should-not (eq erc-server-process old-proc)) + (erc-with-server-buffer + (should (string= (buffer-name) "FooNet"))))) + + (ert-info ("Original buffer killed off") + (should-not (buffer-live-p old-buf))) + + (erc-tests--clean-bufs))) + +(ert-deftest erc-networks--rename-server-buffer--local-nomatch () + (let* ((old-buf (get-buffer-create "FooNet")) + (old-proc (erc-tests--create-dead-proc old-buf)) + (erc-isupport-parameters '((CHANTYPES "&#")))) + + (with-current-buffer old-buf + (erc-mode) + (insert "*** Old buf") + (setq erc-network 'FooNet + erc-server-current-nick "tester" + erc-server-announced-name "us-west.foonet.org" + erc-insert-marker (set-marker (make-marker) (point-max)) + erc-server-process old-proc + erc--session (erc--sid-create nil))) + + (with-current-buffer (get-buffer-create "&chan") + (erc-mode) + (setq erc-network 'FooNet + erc-server-process old-proc + erc-server-announced-name "us-west.foonet.org" ; west + erc--buffer-target (erc--target-from-string "&chan") + erc--session (erc--sid-create nil))) + + (ert-info ("New server buffer steals name, content") + (with-current-buffer (get-buffer-create "irc.foonet.org") + (erc-mode) + (setq erc-network 'FooNet + erc-server-current-nick "tester" + erc-server-announced-name "us-east.foonet.org" ; east + erc-server-process (erc-tests--create-live-proc) + erc--session (erc--sid-create nil)) + (should-not (erc-networks--rename-server-buffer erc-server-process)) + (should (string= (buffer-name) "FooNet")) + (goto-char (point-min)) + (should (search-forward "Old buf")))) + + (ert-info ("Channel buffer now orphaned even though network matches") + (should-not (erc-server-process-alive "&chan")) + (with-current-buffer "&chan" + (should-not erc-server-connected) + (should (eq erc-server-process old-proc)) + (erc-with-server-buffer + (should (string= (buffer-name) "FooNet"))))) + + (ert-info ("Original buffer killed off") + (should-not (buffer-live-p old-buf))) + + (erc-tests--clean-bufs))) + +(ert-deftest erc-networks--update-server-session--double-existing () + (with-temp-buffer + (erc-mode) + (setq erc--session (make-erc--sid-dynamic :parts [foonet "bob"] :len 1)) + + (with-current-buffer (get-buffer-create "#chan@foonet/bob") + (erc-mode) + (setq erc--session (make-erc--sid-dynamic :parts [foonet "bob"] :len 2))) + (with-current-buffer (get-buffer-create "foonet/alice") + (erc-mode) + (setq erc--session + (make-erc--sid-dynamic :parts [foonet "alice"] :len 2))) + + (ert-info ("Adopt equivalent session") + (should (eq (erc-networks--update-server-session) + (with-current-buffer "#chan@foonet/bob" erc--session)))) + + (ert-info ("Ignore non-matches") + (should-not (erc-networks--update-server-session)) + (should (eq erc--session + (with-current-buffer "#chan@foonet/bob" erc--session))))) + + (erc-tests--clean-bufs)) + +(ert-deftest erc-networks--update-server-session--double-new () + (with-temp-buffer + (erc-mode) + (setq erc--session (make-erc--sid-dynamic :parts [foonet "bob"] :len 1)) + + (with-current-buffer (get-buffer-create "foonet/alice") + (erc-mode) + (setq erc--session + (make-erc--sid-dynamic :parts [foonet "alice"] :len 2))) + (with-current-buffer (get-buffer-create "#chan@foonet/alice") + (erc-mode) + (setq erc--session (with-current-buffer "foonet/alice" erc--session))) + + (ert-info ("Evolve session to prevent ambiguity") + (should-not (erc-networks--update-server-session)) + (should (= (erc--sid-dynamic-len erc--session) 2)) + (should (eq (erc--sid-symbol erc--session) 'foonet/bob)))) + + (erc-tests--clean-bufs)) + +(ert-deftest erc-networks--update-server-session--double-bounded () + (with-temp-buffer + (erc-mode) + (setq erc--session (make-erc--sid-dynamic :parts [foonet "bob"] :len 1)) + + (with-current-buffer (get-buffer-create "foonet/alice/home") + (erc-mode) + (setq erc--session (make-erc--sid-dynamic :parts [foonet "alice" home] + :len 3))) + (with-current-buffer (get-buffer-create "#chan@foonet/alice/home") + (erc-mode) + (setq erc--session (with-current-buffer "foonet/alice/home" + erc--session))) + + (ert-info ("Evolve session to prevent ambiguity") + (should-not (erc-networks--update-server-session)) + (should (= (erc--sid-dynamic-len erc--session) 2)) + (should (eq (erc--sid-symbol erc--session) 'foonet/bob)))) + + (erc-tests--clean-bufs)) + +(ert-deftest erc-networks--update-server-session--double-even () + (with-temp-buffer + (erc-mode) + (setq erc--session (make-erc--sid-dynamic :parts [foonet "bob"] :len 1)) + + (with-current-buffer (get-buffer-create "foonet") + (erc-mode) + (setq erc--session + (make-erc--sid-dynamic :parts [foonet "alice"] :len 1))) + (with-current-buffer (get-buffer-create "#chan") + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "#chan")) + (setq erc--session (with-current-buffer "foonet" erc--session))) + + (ert-info ("Evolve session to prevent ambiguity") + (should-not (erc-networks--update-server-session)) + (should (= (erc--sid-dynamic-len erc--session) 2)) + (should (eq (erc--sid-symbol erc--session) 'foonet/bob))) + + (ert-info ("Collision renamed") + (with-current-buffer "foonet/alice" + (should (eq (erc--sid-symbol erc--session) 'foonet/alice))) + + (with-current-buffer "#chan@foonet/alice" + (should (eq (erc--sid-symbol erc--session) 'foonet/alice))))) + + (erc-tests--clean-bufs)) + +(ert-deftest erc-networks--update-server-session--triple-new () + (with-temp-buffer + (erc-mode) + (setq erc--session + (make-erc--sid-dynamic :parts [foonet "bob" home] :len 1)) + + (with-current-buffer (get-buffer-create "foonet/bob/office") + (erc-mode) + (setq erc--session (make-erc--sid-dynamic :parts [foonet "bob" office] + :len 3))) + (with-current-buffer (get-buffer-create "#chan@foonet/bob/office") + (erc-mode) + (setq erc--session (with-current-buffer "foonet/bob/office" + erc--session))) + + (ert-info ("Extend our session name so that it's unique") + (should-not (erc-networks--update-server-session)) + (should (= (erc--sid-dynamic-len erc--session) 3)))) + + (erc-tests--clean-bufs)) + +;;; erc-networks-tests.el ends here diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el index d9112c7b0a..8d078a2053 100644 --- a/test/lisp/erc/erc-tests.el +++ b/test/lisp/erc/erc-tests.el @@ -318,8 +318,9 @@ erc-log-irc-protocol (erc-log-irc-protocol ":irc.gnu.org 001 tester :Welcome") (erc-log-irc-protocol ":irc.gnu.org 002 tester :Your host is irc.gnu.org") (setq erc-network 'FooNet) + (setq erc--session (erc--sid-create nil)) (erc-log-irc-protocol ":irc.gnu.org 422 tester :MOTD missing") - (setq erc-network 'BarNet) + (setq erc--session (erc--sid-create 'BarNet)) (erc-log-irc-protocol ":irc.gnu.org 221 tester +i") (set-process-query-on-exit-flag erc-server-process nil))) (with-current-buffer "*erc-protocol*" @@ -410,4 +411,1020 @@ erc-process-input-line (should-not calls)))))) +(defun erc-tests--create-dead-proc (&optional buf) + (let ((p (start-process "true" (or buf (current-buffer)) "true"))) + (while (process-live-p p) (sit-for 0.1)) + p)) + +(defun erc-tests--create-live-proc (&optional buf) + (let ((proc (start-process "sleep" (or buf (current-buffer)) "sleep" "1"))) + (set-process-query-on-exit-flag proc nil) + proc)) + +(defun erc-tests--clean-bufs () + (let (erc-kill-channel-hook + erc-kill-server-hook + erc-kill-buffer-hook) + (dolist (buf (erc-buffer-list)) + (kill-buffer buf)))) + +(defun erc-tests--bufnames (prefix) + (let* ((case-fold-search) + (pred (lambda (b) (string-prefix-p prefix (buffer-name b)))) + (prefixed (seq-filter pred (buffer-list)))) + (sort (mapcar #'buffer-name prefixed) #'string<))) + +(ert-deftest erc--sid () + (cl-letf (((symbol-function 'float-time) + (lambda () 0.0))) + + ;; Fixed + (should (equal (erc--sid-fixed-create 'foo) + (make-erc--sid-fixed :ts (float-time) :symbol 'foo))) + + ;; Dynamic + (let* ((erc-network 'FooNet) + (erc-server-current-nick "Joe") + (session (erc--sid-create nil))) + + (should (equal session #s(erc--sid-dynamic 0.0 FooNet [FooNet "joe"] 1))) + + (should (equal (erc--sid-dynamic-grow-id session) 'FooNet/joe)) + (should (equal session + #s(erc--sid-dynamic 0.0 FooNet/joe [FooNet "joe"] 2))) + (should-not (erc--sid-dynamic-grow-id session)) + (should (equal session + #s(erc--sid-dynamic 0.0 FooNet/joe [FooNet "joe"] 2)))))) + +(ert-deftest erc--sid-dynamic-prefix-length () + (should-not (erc--sid-dynamic-prefix-length + (make-erc--sid-dynamic) + (make-erc--sid-dynamic))) + + (should-not (erc--sid-dynamic-prefix-length + (make-erc--sid-dynamic :parts [1 2]) + (make-erc--sid-dynamic :parts [2 3]))) + + (should (= 1 (erc--sid-dynamic-prefix-length + (make-erc--sid-dynamic :parts [1]) + (make-erc--sid-dynamic :parts [1 2])))) + + (should (= 1 (erc--sid-dynamic-prefix-length + (make-erc--sid-dynamic :parts [1 2]) + (make-erc--sid-dynamic :parts [1 3])))) + + (should (= 2 (erc--sid-dynamic-prefix-length + (make-erc--sid-dynamic :parts [1 2]) + (make-erc--sid-dynamic :parts [1 2])))) + + (should (= 1 (erc--sid-dynamic-prefix-length + (make-erc--sid-dynamic :parts ["1"]) + (make-erc--sid-dynamic :parts ["1"]))))) + +(ert-deftest erc--sid-sort-buffers () + (let (oldest middle newest) + + (with-temp-buffer + (setq erc--session (erc--sid-fixed-create 'oldest) + oldest (current-buffer)) + + (with-temp-buffer + (setq erc--session (erc--sid-fixed-create 'middle) + middle (current-buffer)) + + (with-temp-buffer + (setq erc--session (erc--sid-fixed-create 'newest) + newest (current-buffer)) + + (should (equal (erc--sid-sort-buffers (list oldest newest middle)) + (list newest middle oldest)))))))) + +(ert-deftest erc--maybe-rename-surviving-target-buffer--channel () + (should (memq #'erc--maybe-rename-surviving-target-buffer + erc-kill-channel-hook)) + + (let ((chan-foonet-buffer (get-buffer-create "#chan@foonet"))) + + (with-current-buffer chan-foonet-buffer + (erc-mode) + (setq erc--session (make-erc--sid-dynamic :parts [foonet "bob"] :len 1)) + (setq erc--buffer-target (erc--target-from-string "#chan"))) + + (with-current-buffer (get-buffer-create "#chan@barnet") + (erc-mode) + (setq erc--session (make-erc--sid-dynamic :parts [barnet "bob"] :len 1)) + (setq erc--buffer-target (erc--target-from-string "#chan"))) + + (kill-buffer "#chan@barnet") + (should (equal (erc-tests--bufnames "#chan") '("#chan"))) + (should (eq chan-foonet-buffer (get-buffer "#chan")))) + + (erc-tests--clean-bufs)) + +(ert-deftest erc--maybe-rename-surviving-target-buffer--query () + (should (memq #'erc--maybe-rename-surviving-target-buffer + erc-kill-buffer-hook)) + + (let ((bob-foonet (get-buffer-create "bob@foonet"))) + + (with-current-buffer bob-foonet + (erc-mode) + (setq erc--session (make-erc--sid-dynamic :parts [foonet "bob"] :len 1)) + (setq erc--buffer-target (erc--target-from-string "bob"))) + + (with-current-buffer (get-buffer-create "bob@barnet") + (erc-mode) + (setq erc--session (make-erc--sid-dynamic :parts [barnet "bob"] :len 1)) + (setq erc--buffer-target (erc--target-from-string "bob"))) + + (kill-buffer "bob@barnet") + (should (equal (erc-tests--bufnames "bob") '("bob"))) + (should (eq bob-foonet (get-buffer "bob")))) + + (erc-tests--clean-bufs)) + +(ert-deftest erc--maybe-rename-surviving-target-buffer--multi () + + (ert-info ("Multiple leftover channels untouched") + (with-current-buffer (get-buffer-create "#chan@foonet") + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "#chan"))) + (with-current-buffer (get-buffer-create "#chan@barnet") + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "#chan"))) + (with-current-buffer (get-buffer-create "#chan@baznet") + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "#chan"))) + (kill-buffer "#chan@baznet") + (should (equal (erc-tests--bufnames "#chan") + '("#chan@barnet" "#chan@foonet"))) + (erc-tests--clean-bufs)) + + (ert-info ("Multiple leftover queries untouched") + (with-current-buffer (get-buffer-create "bob@foonet") + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "bob"))) + (with-current-buffer (get-buffer-create "bob@barnet") + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "bob"))) + (with-current-buffer (get-buffer-create "bob@baznet") + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "bob"))) + (kill-buffer "bob@baznet") + (should (equal (erc-tests--bufnames "bob") '("bob@barnet" "bob@foonet"))) + (erc-tests--clean-bufs))) + +(ert-deftest erc--shrink-ids-and-buffer-names-perform--outstanding () + ;; Not collapsed because we have one collision outstanding. + ;; + ;; Overlaps with quite a bit with the + ;; `erc--shrink-ids-and-buffer-names--hook-outstanding-*' stuff + ;; below. If this ever fails, just delete this and fix those. + + ;; Presumably, some buffer foonet/chester was just killed + (with-current-buffer (get-buffer-create "foonet/tester") + (erc-mode) + (setq erc-network 'foonet + erc-server-current-nick "tester" + erc--session (make-erc--sid-dynamic :symbol 'foonet/tester + :parts [foonet "tester"] + :len 2) + erc-server-process (erc-tests--create-live-proc))) + + (with-current-buffer (get-buffer-create + (elt ["#a" "#a@foonet" "#a@foonet/tester"] (random 3))) + (erc-mode) + (setq erc-server-process (with-current-buffer "foonet/tester" + erc-server-process) + erc-network 'foonet + erc-server-current-nick "tester" + erc--session (with-current-buffer "foonet/tester" erc--session) + erc--buffer-target (erc--target-from-string "#a"))) + + (with-current-buffer (get-buffer-create "barnet/tester") + (erc-mode) + (setq erc-network 'barnet + erc-server-current-nick "tester" + erc--session (make-erc--sid-dynamic :symbol 'barnet/tester + :parts [barnet "tester"] + :len 2) + erc-server-process (erc-tests--create-live-proc))) + + (with-current-buffer (get-buffer-create "barnet/chester") + (erc-mode) + (setq erc-network 'barnet + erc-server-current-nick "chester" + erc--session (make-erc--sid-dynamic :symbol 'barnet/chester + :parts [barnet "chester"] + :len 2) + erc-server-process (erc-tests--create-live-proc))) + + ;; Presumably, some buffer #a@barnet/chester was just killed + (with-current-buffer (get-buffer-create + (elt ["#a@barnet" "#a@barnet/tester"] (random 2))) + (erc-mode) + (setq erc-network 'barnet + erc-server-current-nick "tester" + erc-server-process (with-current-buffer "barnet/tester" + erc-server-process) + erc--session (with-current-buffer "barnet/tester" erc--session) + erc--buffer-target (erc--target-from-string "#a"))) + + (with-temp-buffer + (setq erc--session (make-erc--sid-dynamic)) + (erc--shrink-ids-and-buffer-names)) + + (should (equal (mapcar #'buffer-name (erc-buffer-list)) + '("foonet" + "#a@foonet" + "barnet/tester" + "barnet/chester" + "#a@barnet/tester"))) + + (erc-tests--clean-bufs)) + +(ert-deftest erc--shrink-ids-and-buffer-names-perform--collapse () + ;; Overlaps with `erc--shrink-ids-and-buffer-names--collapse-hook-*' + ;; quite a bit. If this ever fails, just delete it and fix ^. + + ;; Presumably, some buffer foonet/chester was just killed + (with-current-buffer (get-buffer-create "foonet/tester") + (erc-mode) + (setq erc-network 'foonet + erc-server-current-nick "tester" + erc--session (make-erc--sid-dynamic :symbol 'foonet/tester + :parts [foonet "tester"] + :len 2) + erc-server-process (erc-tests--create-live-proc))) + + (with-current-buffer + (get-buffer-create (elt ["#a" "#a@foonet/tester"] (random 2))) + (erc-mode) + (setq erc-server-process (with-current-buffer "foonet/tester" + erc-server-process) + erc-network 'foonet + erc-server-current-nick "tester" + erc--session (with-current-buffer "foonet/tester" erc--session) + erc--buffer-target (erc--target-from-string "#a"))) + + (with-current-buffer (get-buffer-create "barnet/tester") + (erc-mode) + (setq erc-network 'barnet + erc-server-current-nick "tester" + erc--session (make-erc--sid-dynamic :symbol 'barnet/tester + :parts [barnet "tester"] + :len 2) + erc-server-process (erc-tests--create-live-proc))) + + (with-current-buffer + (get-buffer-create (elt ["#b" "#b@foonet/tester"] (random 2))) + (erc-mode) + (setq erc-network 'barnet + erc-server-current-nick "tester" + erc-server-process (with-current-buffer "barnet/tester" + erc-server-process) + erc--session (with-current-buffer "barnet/tester" erc--session) + erc--buffer-target (erc--target-from-string "#b"))) + + (with-temp-buffer + (setq erc--session (make-erc--sid-dynamic)) + (erc--shrink-ids-and-buffer-names)) + + (should (equal (mapcar #'buffer-name (erc-buffer-list)) + '("foonet" "#a" "barnet" "#b"))) + + (erc-tests--clean-bufs)) + +(defun erc--shrink-ids-and-buffer-names--hook-outstanding-common () + + (with-current-buffer (get-buffer-create "foonet/tester") + (erc-mode) + (setq erc-network 'foonet + erc-server-current-nick "tester" + erc--session (make-erc--sid-dynamic :symbol 'foonet/tester + :parts [foonet "tester"] + :len 2) + erc-server-process (erc-tests--create-live-proc))) + + (with-current-buffer (get-buffer-create "#a@foonet/tester") + (erc-mode) + (setq erc-server-process (with-current-buffer "foonet/tester" + erc-server-process) + erc-network 'foonet + erc-server-current-nick "tester" + erc--session (with-current-buffer "foonet/tester" erc--session) + erc--buffer-target (erc--target-from-string "#a"))) + + (with-current-buffer (get-buffer-create "barnet/tester") + (erc-mode) + (setq erc-network 'barnet + erc-server-current-nick "tester" + erc--session (make-erc--sid-dynamic :symbol 'barnet/tester + :parts [barnet "tester"] + :len 2) + erc-server-process (erc-tests--create-live-proc))) + + (with-current-buffer (get-buffer-create "barnet/chester") + (erc-mode) + (setq erc-network 'barnet + erc-server-current-nick "chester" + erc--session (make-erc--sid-dynamic :symbol 'barnet/chester + :parts [barnet "chester"] + :len 2) + erc-server-process (erc-tests--create-live-proc))) + + (with-current-buffer (get-buffer-create "#a@barnet/tester") + (erc-mode) + (setq erc-network 'barnet + erc-server-current-nick "tester" + erc-server-process (with-current-buffer "barnet/tester" + erc-server-process) + erc--session (with-current-buffer "barnet/tester" erc--session) + erc--buffer-target (erc--target-from-string "#a")))) + +(ert-deftest erc--shrink-ids-and-buffer-names--hook-outstanding-server () + (erc--shrink-ids-and-buffer-names--hook-outstanding-common) + (with-current-buffer (get-buffer-create "foonet/chester") + (erc-mode) + (setq erc-network 'foonet + erc-server-current-nick "chester" + erc--session (make-erc--sid-dynamic :symbol 'foonet/chester + :parts [foonet "chester"] + :len 2) + erc-server-process (erc-tests--create-live-proc))) + + (with-current-buffer "foonet/chester" (kill-buffer)) + + (should (equal (mapcar #'buffer-name (erc-buffer-list)) + '("foonet" + "#a@foonet" + "barnet/tester" + "barnet/chester" + "#a@barnet/tester"))) + (erc-tests--clean-bufs)) + +(ert-deftest erc--shrink-ids-and-buffer-names--hook-outstanding-target () + (erc--shrink-ids-and-buffer-names--hook-outstanding-common) + (with-current-buffer (get-buffer-create "#a@foonet/chester") + (erc-mode) + (setq erc-network 'foonet + erc-server-current-nick "chester" + erc--session (make-erc--sid-dynamic :symbol 'foonet/chester + :parts [foonet "chester"] + :len 2) + erc--buffer-target (erc--target-from-string "#a") + erc-server-process (with-temp-buffer + (erc-tests--create-dead-proc)))) + + (with-current-buffer "#a@foonet/chester" (kill-buffer)) + + ;; Identical to *-server variant above + (should (equal (mapcar #'buffer-name (erc-buffer-list)) + '("foonet" + "#a@foonet" + "barnet/tester" + "barnet/chester" + "#a@barnet/tester"))) + (erc-tests--clean-bufs)) + +(ert-deftest erc--maybe-rename-surviving-target-buffer--shrink () + (erc--shrink-ids-and-buffer-names--hook-outstanding-common) + + ;; This buffer isn't "#a@foonet" (yet) because the shrink-ids hook + ;; hasn't run. However, when it's the rename hook runs, its session + ;; id *is* "foonet", not "foonet/tester". + (with-current-buffer "#a@foonet/tester" (kill-buffer)) + + (should (equal (mapcar #'buffer-name (erc-buffer-list)) + '("foonet" + "barnet/tester" + "barnet/chester" + "#a"))) + + (erc-tests--clean-bufs)) + +(defun erc--shrink-ids-and-buffer-names--hook-collapse (check) + + (with-current-buffer (get-buffer-create "foonet/tester") + (erc-mode) + (setq erc-network 'foonet + erc-server-current-nick "tester" + erc--session (make-erc--sid-dynamic :symbol 'foonet/tester + :parts [foonet "tester"] + :len 2) + erc-server-process (erc-tests--create-live-proc))) + + (with-current-buffer (get-buffer-create "#a@foonet/tester") + (erc-mode) + (setq erc-server-process (with-current-buffer "foonet/tester" + erc-server-process) + erc-network 'foonet + erc-server-current-nick "tester" + erc--session (with-current-buffer "foonet/tester" erc--session) + erc--buffer-target (erc--target-from-string "#a"))) + + (with-current-buffer (get-buffer-create "barnet/tester") + (erc-mode) + (setq erc-network 'barnet + erc-server-current-nick "tester" + erc--session (make-erc--sid-dynamic :symbol 'barnet/tester + :parts [barnet "tester"] + :len 2) + erc-server-process (erc-tests--create-live-proc))) + + (with-current-buffer (get-buffer-create "#b@foonet/tester") + (erc-mode) + (setq erc-network 'barnet + erc-server-current-nick "tester" + erc-server-process (with-current-buffer "barnet/tester" + erc-server-process) + erc--session (with-current-buffer "barnet/tester" erc--session) + erc--buffer-target (erc--target-from-string "#b"))) + + (funcall check) + + (should (equal (mapcar #'buffer-name (erc-buffer-list)) + '("foonet" "#a" "barnet" "#b"))) + + (erc-tests--clean-bufs)) + +(ert-deftest erc--shrink-ids-and-buffer-names--hook-collapse-server () + (erc--shrink-ids-and-buffer-names--hook-collapse + (lambda () + (with-current-buffer (get-buffer-create "foonet/chester") + (erc-mode) + (setq erc-network 'foonet + erc-server-current-nick "chester" + erc--session (make-erc--sid-dynamic :symbol 'foonet/chester + :parts [foonet "chester"] + :len 2) + erc-server-process (erc-tests--create-live-proc))) + + (with-current-buffer "foonet/chester" + (kill-buffer))))) + +(ert-deftest erc--shrink-ids-and-buffer-names--hook-collapse-target () + (erc--shrink-ids-and-buffer-names--hook-collapse + (lambda () + (with-current-buffer (get-buffer-create "#a@foonet/chester") + (erc-mode) + (setq erc-network 'foonet + erc-server-current-nick "chester" + erc--session (make-erc--sid-dynamic :symbol 'foonet/chester + :parts [foonet "chester"] + :len 2) + ;; `erc-kill-buffer-function' uses legacy target detection + ;; but falls back on buffer name, so no need for: + ;; + ;; erc-default-recipients '("#a") + ;; + erc--buffer-target (erc--target-from-string "#a") + erc-server-process (with-temp-buffer + (erc-tests--create-dead-proc)))) + + (with-current-buffer "#a@foonet/chester" (kill-buffer))))) + +;; FIXME this test is old and may describe impossible states: +;; leftover sessions being qual-equal but not eq (implies +;; `erc-networks--maybe-reclaim-target-buffers' is somehow broken). +;; +;; Otherwise, the point of this test is to show that server process +;; identity does not impact the hunt for duplicates. + +(defun erc-tests--prep-erc-reconcile-buffer-names--duplicates (start) + + (with-current-buffer (get-buffer-create "foonet") + (erc-mode) + (setq erc-network 'foonet + erc-server-current-nick "tester" + erc--session (erc--sid-create nil) + erc-server-process (funcall start))) + + (with-current-buffer (get-buffer-create "#chan") ; prior session + (erc-mode) + (setq erc-server-process (with-current-buffer "foonet" erc-server-process) + erc--buffer-target (erc--target-from-string "#chan") + erc--session (erc--sid-create nil))) + + (ert-info ("Conflicts not recognized as ERC buffers and not renamed") + (get-buffer-create "#chan@foonet") + (should (equal (erc-tests--bufnames "#chan") '("#chan" "#chan@foonet")))) + + ;; These are dupes (not "collisions") + + (with-current-buffer "#chan@foonet" ; same proc + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "#chan") + erc-network 'foonet + erc-server-current-nick "tester" + erc-server-process (with-current-buffer "foonet" erc-server-process) + erc--session (erc--sid-create nil))) + + (with-current-buffer (get-buffer-create "#chan@foonet") + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "#chan") + erc-server-process (erc-tests--create-dead-proc) + erc-network 'foonet + erc-server-current-nick "tester" + erc--session (erc--sid-create nil))) + + (with-current-buffer (get-buffer-create "#chan@foonet") + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "#chan") + erc-server-process (erc-tests--create-live-proc) + erc-network 'foonet + erc-server-current-nick "tester" + erc--session (erc--sid-create nil))) + + (let ((created (list (get-buffer "#chan@foonet") + (get-buffer "#chan@foonet") + (get-buffer "#chan@foonet")))) + + (with-current-buffer "foonet" + (should (string= (erc--reconcile-buffer-names + (erc--target-from-string "#chan") erc--session) + "#chan"))) + + (ert-info ("All buffers considered dupes renamed") + (should (equal (erc-tests--bufnames "#chan") + '("#chan" "#chan<2>" "#chan<3>" "#chan<4>")))) + + (ert-info ("All buffers renamed from newest to oldest") + (should (equal created (list (get-buffer "#chan<2>") + (get-buffer "#chan<3>") + (get-buffer "#chan<4>")))))) + + (erc-tests--clean-bufs)) + +(defun erc-tests--prep-erc-reconcile-buffer-names--duplicates-given (start) + + (with-current-buffer (get-buffer-create "oofnet") + (erc-mode) + (setq erc--session (erc--sid-create 'oofnet)) + ;; The network is determined before target bufs are created. At + ;; least this shows that the network doesn't matter when only + ;; assigned (given) IDs are present. + (setq erc-network 'foonet) + (setq erc-server-current-nick "tester") + (setq erc-server-process (funcall start))) + + (with-current-buffer (get-buffer-create "#chan") ; prior session + (erc-mode) + (setq erc--session (erc--sid-create 'oofnet) + erc-server-process (with-current-buffer "oofnet" erc-server-process) + erc--buffer-target (erc--target-from-string "#chan"))) + + (with-current-buffer (get-buffer-create "#chan@oofnet") ;dupe/not collision + (erc-mode) + (setq erc--session (erc--sid-create 'oofnet) + erc-server-process (with-current-buffer "oofnet" erc-server-process) + erc--buffer-target (erc--target-from-string "#chan"))) + + (with-current-buffer "oofnet" + (should (string= (erc--reconcile-buffer-names + (erc--target-from-string "#chan") erc--session) + "#chan"))) + + (ert-info ("All buffers matching target and network renamed") + (should (equal (erc-tests--bufnames "#chan") '("#chan" "#chan<2>")))) + + (erc-tests--clean-bufs)) + +(ert-deftest erc--reconcile-buffer-names--duplicates () + (ert-info ("Process live, no error") + (erc-tests--prep-erc-reconcile-buffer-names--duplicates + #'erc-tests--create-live-proc)) + + (ert-info ("Process live, no error, given ID") + (erc-tests--prep-erc-reconcile-buffer-names--duplicates-given + #'erc-tests--create-live-proc)) + + (ert-info ("Process dead") + (erc-tests--prep-erc-reconcile-buffer-names--duplicates + #'erc-tests--create-dead-proc)) + + (ert-info ("Process dead, given ID") + (erc-tests--prep-erc-reconcile-buffer-names--duplicates-given + #'erc-tests--create-dead-proc))) + +(defun erc-tests--prep-erc-reconcile-buffer-names--no-server-buf (check) + (let ((foonet-proc (with-temp-buffer (erc-tests--create-dead-proc)))) + (with-current-buffer (get-buffer-create "barnet") + (erc-mode) + (setq erc-network 'barnet) + (setq erc-server-current-nick "tester") + (setq erc--session (erc--sid-create nil)) + (setq erc-server-process (erc-tests--create-dead-proc))) + + ;; Different proc and not "qual-equal" (different elts) + (with-current-buffer (get-buffer-create "#chan") + (erc-mode) + (setq erc-network 'foonet) + (setq erc-server-current-nick "tester") + (setq erc--session (erc--sid-create nil)) + (setq erc--buffer-target (erc--target-from-string "#chan")) + (setq erc-server-process foonet-proc)) + (funcall check) + (erc-tests--clean-bufs))) + +(ert-deftest erc--reconcile-buffer-names--no-server-buf () + (ert-info ("Existing #chan buffer respected") + (erc-tests--prep-erc-reconcile-buffer-names--no-server-buf + (lambda () + (with-current-buffer "barnet" + (should (string= (erc--reconcile-buffer-names + (erc--target-from-string "#chan") erc--session) + "#chan@barnet"))) + (ert-info ("Existing #chan buffer found and renamed") + (should (equal (erc-tests--bufnames "#chan") '("#chan@foonet"))))))) + + (ert-info ("Existing #chan buffer") + (erc-tests--prep-erc-reconcile-buffer-names--no-server-buf + (lambda () + (with-current-buffer (get-buffer-create "foonet") + (erc-mode) + (setq erc-network 'foonet) + (setq erc-server-current-nick "tester") + (setq erc--session (erc--sid-create nil)) + (setq erc-server-process (erc-tests--create-dead-proc)) + (should (string= (erc--reconcile-buffer-names + (erc--target-from-string "#chan") erc--session) + "#chan"))) + (ert-info ("Nothing renamed") + (should (equal (erc-tests--bufnames "#chan") '("#chan"))))))) + + (ert-info ("Existing #chan@foonet and #chan@barnet buffers") + (erc-tests--prep-erc-reconcile-buffer-names--no-server-buf + (lambda () + (with-current-buffer "#chan" + (rename-buffer "#chan@foonet")) + (should-not (get-buffer "#chan@barnet")) + (with-current-buffer (get-buffer-create "#chan@barnet") + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "#chan")) + (setq erc-server-process (with-current-buffer "barnet" + erc-server-process)) + (setq erc--session (erc--sid-create nil))) + (with-current-buffer (get-buffer-create "foonet") + (erc-mode) + (setq erc-network 'foonet) + (setq erc-server-current-nick "tester") + (setq erc-server-process (erc-tests--create-live-proc)) + (setq erc--session (erc--sid-create nil)) + (set-process-query-on-exit-flag erc-server-process nil) + (should (string= (erc--reconcile-buffer-names + (erc--target-from-string "#chan") erc--session) + "#chan@foonet"))) + (ert-info ("Nothing renamed") + (should (equal (erc-tests--bufnames "#chan") + '("#chan@barnet" "#chan@foonet")))))))) + +(defun erc-tests--prep-erc-reconcile-buffer-names--no-server-buf-given (check) + (let ((oofnet-proc (with-temp-buffer (erc-tests--create-dead-proc)))) + + (with-current-buffer (get-buffer-create "rabnet") + (erc-mode) + ;; Again, given name preempts network lookup (unrealistic but + ;; highlights priorities) + (setq erc--session (erc--sid-create 'rabnet)) + (setq erc-network 'barnet) + (setq erc-server-current-nick "tester") + (setq erc-server-process (erc-tests--create-dead-proc))) + + ;; Session is not "qual-equal" to above + (with-current-buffer (get-buffer-create "#chan") + (erc-mode) + (setq erc--session (erc--sid-create 'oofnet)) + (setq erc-network 'foonet) + (setq erc--buffer-target (erc--target-from-string "#chan")) + (setq erc-server-process oofnet-proc)) + (funcall check) + (erc-tests--clean-bufs))) + +(ert-deftest erc--reconcile-buffer-names--no-server-buf-given () + + (ert-info ("Existing #chan buffer respected") + (erc-tests--prep-erc-reconcile-buffer-names--no-server-buf-given + (lambda () + (with-current-buffer "rabnet" + (should (string= (erc--reconcile-buffer-names + (erc--target-from-string "#chan") erc--session) + "#chan@rabnet"))) + + (ert-info ("Existing #chan buffer found and renamed") + (should (equal (erc-tests--bufnames "#chan") '("#chan@oofnet"))))))) + + (ert-info ("Existing #chan@oofnet and #chan@rabnet buffers") + (erc-tests--prep-erc-reconcile-buffer-names--no-server-buf-given + (lambda () + ;; #chan has already been uniquified (but not grown) + (with-current-buffer "#chan" (rename-buffer "#chan@oofnet")) + (should-not (get-buffer "#chan@rabnet")) + + (with-current-buffer (get-buffer-create "#chan@rabnet") + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "#chan")) + (setq erc-server-process (with-current-buffer "rabnet" + erc-server-process)) + (setq erc--session (with-current-buffer "rabnet" erc--session))) + + (with-current-buffer (get-buffer-create "oofnet") + (erc-mode) + (setq erc-network 'oofnet) + (setq erc-server-current-nick "tester") + (setq erc-server-process (erc-tests--create-live-proc)) + (setq erc--session (erc--sid-create 'oofnet)) ; given + (set-process-query-on-exit-flag erc-server-process nil) + (should (string= (erc--reconcile-buffer-names + (erc--target-from-string "#chan") erc--session) + "#chan@oofnet"))) + + (ert-info ("Nothing renamed") + (should (equal (erc-tests--bufnames "#chan") + '("#chan@oofnet" "#chan@rabnet")))))))) + +;; This is a corner case in which the user previously explicitly +;; assigned an ID via `erc-tls' but has since connected again, this +;; time without one. It would actually probably be better if the +;; given session were to win and the derived got an -suffix. +;; +;; If we just compared session-IDs, the two would match, but they +;; don't here because one has a given name and the other a +;; discovered/assembled one; so they are *not* qual-equal. +(ert-deftest erc--reconcile-buffer-names--no-server-buf-given-mismatch () + ;; Existing #chan buffer *not* respected + (erc-tests--prep-erc-reconcile-buffer-names--no-server-buf-given + (lambda () + (with-current-buffer (get-buffer-create "oofnet") + (erc-mode) + (setq erc-network 'oofnet) + (setq erc-server-current-nick "tester") + (setq erc-server-process (erc-tests--create-dead-proc)) + (setq erc--session (erc--sid-create nil)) ; derived + (should (string= (erc--reconcile-buffer-names + (erc--target-from-string "#chan") erc--session) + "#chan@oofnet"))) + + (ert-info ("Collision renamed but not grown (because it's a given)") + ;; Original chan uniquified and moved out of the way + (should (equal (erc-tests--bufnames "#chan") + '("#chan@oofnet<2>"))))))) + +(defun erc-tests--prep-erc-reconcile-buffer-names--multi-net (check) + + (with-current-buffer (get-buffer-create "foonet") + (erc-mode) + (setq erc-network 'foonet + erc-server-current-nick "tester" + erc-server-process (erc-tests--create-dead-proc) + erc--session (erc--sid-create nil))) ; derived + + (with-current-buffer (get-buffer-create "barnet") + (erc-mode) + (setq erc-network 'barnet + erc-server-current-nick "tester" + erc-server-process (erc-tests--create-dead-proc) + erc--session (erc--sid-create nil))) ; derived + + (with-current-buffer (get-buffer-create (elt ["#chan" "#chan@foonet"] + (random 2))) + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "#chan")) + (cl-multiple-value-setq (erc-server-process erc--session) + (with-current-buffer "foonet" + (list erc-server-process erc--session)))) + + (with-current-buffer (get-buffer-create "#chan@barnet") + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "#chan")) + (cl-multiple-value-setq (erc-server-process erc--session) + (with-current-buffer "barnet" + (list erc-server-process erc--session)))) + + (funcall check) + (erc-tests--clean-bufs)) + +(ert-deftest erc--reconcile-buffer-names--multi-net () + (ert-info ("Same network rename") + (erc-tests--prep-erc-reconcile-buffer-names--multi-net + (lambda () + (with-current-buffer "foonet" + (let ((result (erc--reconcile-buffer-names + (erc--target-from-string "#chan") erc--session))) + (should (string= result "#chan@foonet")))) + + (should (equal (erc-tests--bufnames "#chan") + '("#chan@barnet" "#chan@foonet")))))) + + (ert-info ("Same network keep name") + (erc-tests--prep-erc-reconcile-buffer-names--multi-net + (lambda () + (with-current-buffer "barnet" + (let ((result (erc--reconcile-buffer-names + (erc--target-from-string "#chan") erc--session))) + (should (string= result "#chan@barnet")))) + + (should (equal (erc-tests--bufnames "#chan") + '("#chan@barnet" "#chan@foonet"))))))) + +(defun erc-tests--prep-erc-reconcile-buffer-names--multi-net-given (check) + + (with-current-buffer (get-buffer-create "oofnet") + (erc-mode) + (setq erc-network 'foonet + erc-server-current-nick "tester" + erc--session (erc--sid-create 'oofnet) ; one given + erc-server-process (erc-tests--create-dead-proc))) + + (with-current-buffer (get-buffer-create "rabnet") + (erc-mode) + (setq erc-network 'barnet + erc-server-current-nick "tester" + erc--session (erc--sid-create 'rabnet) ; another given + erc-server-process (erc-tests--create-dead-proc))) + + (with-current-buffer (get-buffer-create (elt ["chan" "#chan@oofnet"] + (random 2))) + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "#chan")) + (cl-multiple-value-setq (erc-server-process erc--session) + (with-current-buffer "oofnet" + (list erc-server-process erc--session)))) + + (with-current-buffer (get-buffer-create "#chan@barnet") + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "#chan")) + (cl-multiple-value-setq (erc-server-process erc--session) + (with-current-buffer "rabnet" + (list erc-server-process erc--session)))) + + (funcall check) + (erc-tests--clean-bufs)) + +(ert-deftest erc--reconcile-buffer-names--multi-net-given () + (ert-info ("Same network rename") + (erc-tests--prep-erc-reconcile-buffer-names--multi-net-given + (lambda () + (with-current-buffer "oofnet" + (let ((result (erc--reconcile-buffer-names + (erc--target-from-string "#chan") erc--session))) + (should (string= result "#chan@oofnet")))) + + (should (equal (erc-tests--bufnames "#chan") + '("#chan@oofnet" "#chan@rabnet")))))) + + (ert-info ("Same network keep name") + (erc-tests--prep-erc-reconcile-buffer-names--multi-net-given + (lambda () + (with-current-buffer "rabnet" + (let ((result (erc--reconcile-buffer-names + (erc--target-from-string "#chan") erc--session))) + (should (string= result "#chan@rabnet")))) + + (should (equal (erc-tests--bufnames "#chan") + '("#chan@oofnet" "#chan@rabnet"))))))) + +(defun erc-tests--prep-erc-reconcile-buffer-names--multi-net-mixed (check) + + (with-current-buffer (get-buffer-create "foonet") + (erc-mode) + (setq erc-network 'foonet + erc-server-current-nick "tester" + erc--session (erc--sid-create nil) ; one derived + erc-server-process (erc-tests--create-dead-proc))) + + (with-current-buffer (get-buffer-create "my-conn") + (erc-mode) + (setq erc-network 'barnet + erc-server-current-nick "tester" + erc--session (erc--sid-create 'my-conn) ; one given + erc-server-process (erc-tests--create-dead-proc))) + + (with-current-buffer (get-buffer-create (elt ["#chan" "#chan@foonet"] + (random 2))) + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "#chan")) + (cl-multiple-value-setq (erc-server-process erc--session) + (with-current-buffer "foonet" + (list erc-server-process erc--session)))) + + (with-current-buffer (get-buffer-create "#chan@my-conn") + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "#chan")) + (cl-multiple-value-setq (erc-server-process erc--session) + (with-current-buffer "my-conn" + (list erc-server-process erc--session)))) + + (funcall check) + (erc-tests--clean-bufs)) + +(ert-deftest erc--reconcile-buffer-names--multi-net-existing () + + (ert-info ("Buf name derived from network") + (erc-tests--prep-erc-reconcile-buffer-names--multi-net-mixed + (lambda () + (with-current-buffer "foonet" + (let ((result (erc--reconcile-buffer-names + (erc--target-from-string "#chan") erc--session))) + (should (string= result "#chan@foonet")))) + + (should (equal (erc-tests--bufnames "#chan") + '("#chan@foonet" "#chan@my-conn")))))) + + (ert-info ("Buf name given") + (erc-tests--prep-erc-reconcile-buffer-names--multi-net-mixed + (lambda () + (with-current-buffer "my-conn" + (let ((result (erc--reconcile-buffer-names + (erc--target-from-string "#chan") erc--session))) + (should (string= result "#chan@my-conn")))) + + (should (equal (erc-tests--bufnames "#chan") + '("#chan@foonet" "#chan@my-conn"))))))) + +(ert-deftest erc--reconcile-buffer-names--multi-net-suffixed () + ;; Two networks, same channel. One network has two connections. + ;; When same channel joined on latter network with different nick, + ;; all buffer names invovling that net are suffixed with session-id. + + (with-current-buffer (get-buffer-create "foonet/bob") + (erc-mode) + (setq erc-network 'foonet + erc-server-current-nick "bob" + erc--session (make-erc--sid-dynamic :symbol 'foonet/bob + :parts [foonet "bob"] + :len 2) + erc-server-process (erc-tests--create-live-proc))) + + (with-current-buffer (get-buffer-create + (elt ["#chan@foonet" "#chan@foonet/bob"] (random 2))) + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "#chan") + erc-server-process (with-current-buffer "foonet/bob" + erc-server-process) + erc--session (with-current-buffer "foonet/bob" + erc--session))) + + (with-current-buffer (get-buffer-create "barnet") + (erc-mode) + (setq erc-network 'barnet + erc-server-current-nick (elt ["alice" "bob"] (random 2)) + erc--session (erc--sid-create 'barnet) + erc-server-process (erc-tests--create-live-proc))) + + (with-current-buffer (get-buffer-create "#chan@barnet") + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "#chan") + erc-server-process (with-current-buffer "barnet" + erc-server-process) + erc--session (with-current-buffer "barnet" + erc--session))) + + (with-current-buffer (get-buffer-create "foonet/alice") + (erc-mode) + (setq erc-network 'foonet + erc-server-current-nick "alice" + erc--session (make-erc--sid-dynamic :symbol 'foonet/alice + :parts [foonet "alice"] + :len 2) + erc-server-process (erc-tests--create-live-proc))) + + (with-current-buffer "foonet/alice" + (let ((result (erc--reconcile-buffer-names + (erc--target-from-string "#chan") erc--session))) + (should (string= result "#chan@foonet/alice")))) + + (should (equal (erc-tests--bufnames "#chan") + '("#chan@barnet" "#chan@foonet/bob"))) + + (erc-tests--clean-bufs)) + +(ert-deftest erc-reconcile-buffer-names--local () + (let ((erc-isupport-parameters '((CHANTYPES "&#")))) + (with-current-buffer (get-buffer-create "DALnet") + (erc-mode) + (setq erc-network 'DALnet + erc-server-announced-name "elysium.ga.us.dal.net" + erc-server-process (erc-tests--create-dead-proc) + erc--session (erc--sid-create nil))) + + (ert-info ("Local chan buffer from older, disconnected session") + (with-current-buffer (get-buffer-create "&chan") + (erc-mode) + (setq erc--buffer-target (erc--target-from-string "&chan") + erc-network 'DALnet + erc-server-announced-name "twisted.ma.us.dal.net" + erc-server-process (erc-tests--create-dead-proc) + erc--session (erc--sid-create nil)))) + + (ert-info ("Local channels renamed using network server names") + (with-current-buffer "DALnet" + (let ((result (erc--reconcile-buffer-names + (erc--target-from-string "&chan") erc--session))) + (should (string= result "&chan@elysium.ga.us.dal.net"))))) + + (should (get-buffer "&chan@twisted.ma.us.dal.net")) + (should-not (get-buffer "&chan")) + (erc-tests--clean-bufs))) + ;;; erc-tests.el ends here -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0014-Register-erc-kill-buffer-function-locally.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Wed, 27 Oct 2021 21:13:24 -0700 Subject: [PATCH 14/28] Register erc-kill-buffer-function locally * lisp/erc/erc.el (erc-kill-buffer-function): don't add hook when loading file. Not that it matters, but this would run twice because of the erc{-backend} dependency cycle. Move to major-mode setup and make buffer-local instead. Depends on tests in Bug#48598. --- lisp/erc/erc.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 35d56c3b82..3a87d0d846 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1538,6 +1538,7 @@ erc-mode (setq-local paragraph-start (concat "\\(" (regexp-quote (erc-prompt)) "\\)")) (setq-local completion-ignore-case t) + (add-hook 'kill-buffer-hook #'erc-kill-buffer-function nil t) (add-hook 'completion-at-point-functions #'erc-complete-word-at-point nil t)) ;; activation @@ -7126,9 +7127,6 @@ erc-format-message ;;; Various hook functions -;; FIXME: Don't set the hook globally! -(add-hook 'kill-buffer-hook #'erc-kill-buffer-function) - (defcustom erc-kill-server-hook '(erc-kill-server erc--shrink-ids-and-buffer-names) "Invoked whenever a live server buffer is killed via `kill-buffer'." -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0015-Don-t-call-erc-auto-query-twice-on-PRIVMSG.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Fri, 7 May 2021 01:52:41 -0700 Subject: [PATCH 15/28] Don't call erc-auto-query twice on PRIVMSG * erc-backend.el (erc-server-PRIVMSG): don't call erc-auto-query at all and instead use some of its logic to detect when a query buffer should be created instead of a channel buffer. (erc-server-JOIN): use erc--open-target instead of calling erc-join. * erc.el (erc-query, erc--open-target): Replace uses of erc-query with erc--open-target and make the latter obsolete for the next release. Don't call erc-update-mode-line because erc-open already does that. (erc-auto-query): Make the function form obsolete. It was previously only used in erc-backend.el and only sewed confusion. (erc-query-on-unjoined-chan-privmsg): Add note questioning its role. Was previously only used by erc-auto-query. (erc-cmd-QUERY): Update the mode line explicitly after calling erc-query in case it's needed after erc-setup-buffer runs. Simplify. * lisp/erc/erc-backend.el (erc-server-JOIN): Call `erc--open-target'. --- lisp/erc/erc-backend.el | 23 ++++++--------- lisp/erc/erc.el | 63 ++++++++++++++++++++--------------------- 2 files changed, 39 insertions(+), 47 deletions(-) diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index 9e96a24e8c..ae082dccca 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -1558,14 +1558,7 @@ define-erc-response-handler (let* ((str (cond ;; If I have joined a channel ((erc-current-nick-p nick) - (setq buffer (erc-open erc-session-server erc-session-port - nick erc-session-user-full-name - nil nil - (list chnl) chnl - erc-server-process - nil - (erc--session-id erc-session))) - (when buffer + (when (setq buffer (erc--open-target chnl)) (set-buffer buffer) (with-suppressed-warnings ((obsolete erc-add-default-channel)) @@ -1756,6 +1749,12 @@ define-erc-response-handler fnick) (setf (erc-response.contents parsed) msg) (setq buffer (erc-get-buffer (if privp nick tgt) proc)) + ;; Even worth checking for empty target here? (invalid anyway) + (unless (or buffer noticep (string-empty-p tgt) (eq ?$ (aref tgt 0))) + (if (and privp msgp (not (erc-is-message-ctcp-and-not-action-p msg))) + (let ((erc-join-buffer erc-auto-query)) + (setq buffer (erc--open-target nick))) + (setq buffer (erc--open-target tgt)))) (when buffer (with-current-buffer buffer ;; update the chat partner info. Add to the list if private @@ -1790,13 +1789,7 @@ define-erc-response-handler s parsed buffer nick) (run-hook-with-args-until-success 'erc-echo-notice-hook s parsed buffer nick)) - (erc-display-message parsed nil buffer s))) - (when (string= cmd "PRIVMSG") - (erc-auto-query proc parsed)))))) - -;; FIXME: need clean way of specifying extra hooks in -;; define-erc-response-handler. -(add-hook 'erc-server-PRIVMSG-functions #'erc-auto-query) + (erc-display-message parsed nil buffer s))))))) (define-erc-response-handler (QUIT) "Another user has quit IRC." nil diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 3a87d0d846..2fefa00778 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -3792,22 +3792,16 @@ erc-query-display (const :tag "Use current buffer" buffer) (const :tag "Use current buffer" t))) -(defun erc-cmd-QUERY (&optional user) +(defun erc-cmd-QUERY (user) "Open a query with USER. The type of query window/frame/etc will depend on the value of -`erc-query-display'. +`erc-query-display'." + (interactive "MStart a query with: ") + (let ((erc-join-buffer erc-query-display)) + (erc-with-server-buffer + (erc--open-target user) + (erc-update-mode-line)))) -If USER is omitted, close the current query buffer if one exists -- except this is broken now ;-)" - (interactive - (list (read-string "Start a query with: "))) - (let ((session-buffer (erc-server-buffer)) - (erc-join-buffer erc-query-display)) - (if user - (erc-query user session-buffer) - ;; currently broken, evil hack to display help anyway - ;(erc-delete-query)))) - (signal 'wrong-number-of-arguments "")))) (defalias 'erc-cmd-Q #'erc-cmd-QUERY) (defun erc-quit/part-reason-default () @@ -4489,27 +4483,27 @@ erc-debug-missing-hooks (nconc erc-server-vectors (list parsed)) nil) -(defun erc-query (target server) - "Open a query buffer on TARGET, using SERVER. +(defun erc--open-target (target) + "Open an ERC buffer on TARGET." + (erc-open erc-session-server + erc-session-port + (erc-current-nick) + erc-session-user-full-name + nil + nil + (list target) + target + erc-server-process + nil + (erc--sid-given erc--session))) + +(defun erc-query (target server-buffer) + "Open a query buffer on TARGET, using SERVER buffer. To change how this query window is displayed, use `let' to bind `erc-join-buffer' before calling this." - (unless (and server - (buffer-live-p server) - (set-buffer server)) - (error "Couldn't switch to server buffer")) - (let ((buf (erc-open erc-session-server - erc-session-port - (erc-current-nick) - erc-session-user-full-name - nil - nil - (list target) - target - erc-server-process))) - (unless buf - (error "Couldn't open query window")) - (erc-update-mode-line) - buf)) + (with-current-buffer server-buffer (erc--open-target target))) + +(make-obsolete 'erc-query 'erc--open-target "29.1") (defcustom erc-auto-query 'window-noselect "If non-nil, create a query buffer each time you receive a private message. @@ -4528,6 +4522,9 @@ erc-auto-query (const :tag "Use current buffer" buffer) (const :tag "Use current buffer" t))) +;; FIXME either retire this or put it to use or more clearly explain +;; what it's supposed to do. It's currently only used by the obsolete +;; function `erc-auto-query'. (defcustom erc-query-on-unjoined-chan-privmsg t "If non-nil create query buffer on receiving any PRIVMSG at all. This includes PRIVMSGs directed to channels. If you are using an IRC @@ -4651,6 +4648,8 @@ erc-auto-query (erc-cmd-QUERY query)) nil)))) +(make-obsolete 'erc-auto-query "try erc-cmd-QUERY instead" "29.1") + (defun erc-is-message-ctcp-p (message) "Check if MESSAGE is a CTCP message or not." (string-match "^\C-a\\([^\C-a]*\\)\C-a?$" message)) -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0016-SQUASH-ME-Add-ERC-scenarios-for-session-aware-msg-ha.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Thu, 30 Sep 2021 06:11:50 -0700 Subject: [PATCH 16/28] SQUASH-ME: Add ERC scenarios for session-aware msg handlers --- .../base/mask-target-routing/foonet.lispdata | 45 +++++++++++++++++++ test/lisp/erc/erc-scenarios.el | 36 +++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 test/lisp/erc/erc-scenarios-resources/base/mask-target-routing/foonet.lispdata diff --git a/test/lisp/erc/erc-scenarios-resources/base/mask-target-routing/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/mask-target-routing/foonet.lispdata new file mode 100644 index 0000000000..796d5566b6 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/mask-target-routing/foonet.lispdata @@ -0,0 +1,45 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Mon, 31 May 2021 09:56:24 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 4 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 254 tester 2 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 4 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 4 4 :Current local users 4, max 4") + (0 ":irc.foonet.org 266 tester 4 4 :Current global users 4, max 4") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + ;; No mode answer + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":tester!~u@gq7yjr7gsu7nn.irc JOIN #foo") + (0 ":irc.foonet.org 353 tester = #foo :alice @bob rando tester") + (0 ":irc.foonet.org 366 tester #foo :End of /NAMES list.") + (0 ":***!znc@znc.in PRIVMSG #foo :Buffer Playback...") + (0 ":alice!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :[10:00:02] bob: All that he is hath reference to your highness.") + (0 ":bob!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :[10:00:06] alice: Excellent workman! Thou canst not paint a man so bad as is thyself.") + (0 ":***!znc@znc.in PRIVMSG #foo :Playback Complete.") + (0 ":irc.foonet.org NOTICE tester :[09:56:57] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":irc.foonet.org 305 tester :You are no longer marked as being away")) + +((mode 5 "MODE #foo") + (0 ":irc.foonet.org 324 tester #foo +nt") + (0 ":irc.foonet.org 329 tester #foo 1622454985") + ;; Invalid msg + (0.1 ":rando!~u@em2i467d4ejul.irc PRIVMSG :") + (0.1 ":alice!~u@gq7yjr7gsu7nn.irc PRIVMSG #foo :bob: Farewell, pretty lady: you must hold the credit of your father.") + (0.1 ":bob!~u@gq7yjr7gsu7nn.irc NOTICE $* :[Global notice] going down soon.") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #foo :bob: Well, this is the forest of Arden.") + (0.1 ":bob!~u@gq7yjr7gsu7nn.irc NOTICE $$* :[Global notice] this is a warning.") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #foo :bob: Be married under a bush, like a beggar ? Get you to church, and have a good priest that can tell you what marriage is: this fellow will but join you together as they join wainscot; then one of you will prove a shrunk panel, and like green timber, warp, warp.") + (0.1 ":bob!~u@gq7yjr7gsu7nn.irc PRIVMSG $* :[Global msg] second warning.") + (0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #foo :bob: And will you, being a man of your breeding.") + (0.1 ":bob!~u@gq7yjr7gsu7nn.irc NOTICE #* :[Global notice] final warning.")) diff --git a/test/lisp/erc/erc-scenarios.el b/test/lisp/erc/erc-scenarios.el index f7931b35b9..0e2928b9a1 100644 --- a/test/lisp/erc/erc-scenarios.el +++ b/test/lisp/erc/erc-scenarios.el @@ -1676,4 +1676,40 @@ erc-scenarios-networks-announced-missing (should-not erc-network) (should (string= erc-server-announced-name "irc.foonet.org")))))) +;; Targets that are host/server masks like $*, $$*, and #* are routed +;; to the server buffer: https://github.com/ircdocs/wooooms/issues/5 + +(ert-deftest erc-scenarios-base-mask-target-routing () + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/mask-target-routing") + (erc-d-linger-secs 0.5) + (dumb-server (erc-d-run "localhost" t 'foonet)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (expect (erc-d-t-make-expecter))) + + (ert-info ("Connect to foonet") + (with-current-buffer (erc :server "127.0.0.1" + :port port + :nick "tester" + :password "changeme" + :full-name "tester") + (should (string= (buffer-name) (format "127.0.0.1:%d" port))))) + + (erc-d-t-wait-for 1 "server buffer ready" (get-buffer "foonet")) + + (ert-info ("Channel buffer #foo playback received") + (erc-d-t-wait-for 3 "#foo exists" (get-buffer "#foo")) + (with-current-buffer "#foo" + (funcall expect 10 "Excellent workman"))) + + (ert-info ("Global notices routed to server buffer") + (with-current-buffer "foonet" + (funcall expect 10 "going down soon") + (funcall expect 10 "this is a warning") + (funcall expect 10 "second warning") + (funcall expect 10 "final warning"))) + + (should-not (get-buffer "$*")))) + ;;; erc-scenarios.el ends here -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0017-Favor-session-IDs-and-networks-in-erc-join.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Sun, 30 May 2021 00:50:50 -0700 Subject: [PATCH 17/28] Favor session IDs and networks in erc-join * lisp/erc/erc-join.el (erc-autojoin-channels, erc-autojoin-add, erc-autojoin-remove): favor session IDs, which in practice are almost always the same as networks, when dealing with `erc-autojoin-alist'. (erc-autojoin--join): Factor out new helper from hookees `erc-autojoin-after-ident' and `erc-autojoin-channels'. (erc-autojoin-after-ident, erc-autojoin-channels): No longer make a point of returning nil because the hooks they're registered on, `erc-nickserv-identified-hook' and `erc-after-connect', don't stop on success. --- lisp/erc/erc-join.el | 116 +++++------ test/lisp/erc/erc-join-tests.el | 345 ++++++++++++++++++++++++++++++++ 2 files changed, 391 insertions(+), 70 deletions(-) create mode 100644 test/lisp/erc/erc-join-tests.el diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el index 1a6bdedc98..ab2ffc9f72 100644 --- a/lisp/erc/erc-join.el +++ b/lisp/erc/erc-join.el @@ -33,8 +33,6 @@ ;;; Code: (require 'erc) -(require 'auth-source) -(require 'erc-networks) (defgroup erc-autojoin nil "Enable autojoining." @@ -127,33 +125,32 @@ erc-autojoin-channels-delayed (erc-autojoin-channels server nick)))) (defun erc-autojoin-server-match (candidate) - "Match the current network or server against CANDIDATE. -This should be a key from `erc-autojoin-channels-alist'." - (or (eq candidate (erc-network)) - (and (stringp candidate) - (or (and erc-server-announced-name ; unnecessary after #48598 - (string-match-p candidate erc-server-announced-name)) - (string-match-p candidate erc-session-server))))) + "Match the current session ID or server against CANDIDATE. +CANDIDATE is a key from `erc-autojoin-channels-alist'. Return the +matching entity, either a string or a non-nil symbol, in the case of a +network or a session ID. Return nil on failure." + (if (symbolp candidate) + (when-let ((esid (erc--sid-symbol erc--session)) + ((eq esid candidate))) + esid) + (when (stringp candidate) + (or (and erc-server-announced-name ; unnecessary after #48598 + (string-match-p candidate erc-server-announced-name)) + (string-match-p candidate erc-session-server))))) + +(defun erc-autojoin--join () + ;; This is called in the server buffer + (pcase-dolist (`(,name . ,channels) erc-autojoin-channels-alist) + (when-let ((match (erc-autojoin-server-match name))) + (dolist (chan channels) + (unless (erc-get-buffer chan erc-server-process) + (erc-server-join-channel match chan)))))) (defun erc-autojoin-after-ident (_network _nick) "Autojoin channels in `erc-autojoin-channels-alist'. This function is run from `erc-nickserv-identified-hook'." - (if erc--autojoin-timer - (setq erc--autojoin-timer - (cancel-timer erc--autojoin-timer))) (when (eq erc-autojoin-timing 'ident) - (let ((server (or erc-session-server erc-server-announced-name)) - (joined (mapcar (lambda (buf) - (with-current-buffer buf (erc-default-target))) - (erc-channel-list erc-server-process)))) - ;; We may already be in these channels, e.g. because the - ;; autojoin timer went off. - (dolist (l erc-autojoin-channels-alist) - (when (erc-autojoin-server-match (car l)) - (dolist (chan (cdr l)) - (unless (erc-member-ignore-case chan joined) - (erc-server-join-channel server chan))))))) - nil) + (erc-autojoin--join))) (defun erc-autojoin-channels (server nick) "Autojoin channels in `erc-autojoin-channels-alist'." @@ -166,24 +163,7 @@ erc-autojoin-channels #'erc-autojoin-channels-delayed server nick (current-buffer)))) ;; `erc-autojoin-timing' is `connect': - (let ((server (or erc-session-server erc-server-announced-name))) - (dolist (l erc-autojoin-channels-alist) - (when (erc-autojoin-server-match (car l)) - (dolist (chan (cdr l)) - (let ((buffer - (car (erc-buffer-filter - (lambda () - (let ((current (erc-default-target))) - (and (stringp current) - (erc-autojoin-server-match (car l)) - (string-equal (erc-downcase chan) - (erc-downcase current))))))))) - (when (or (not buffer) - (not (with-current-buffer buffer - (erc-server-process-alive)))) - (erc-server-join-channel server chan)))))))) - ;; Return nil to avoid stomping on any other hook funcs. - nil) + (erc-autojoin--join))) (defun erc-autojoin-current-server () "Compute the current server for lookup in `erc-autojoin-channels-alist'. @@ -197,22 +177,17 @@ erc-autojoin-current-server (defun erc-autojoin-add (proc parsed) "Add the channel being joined to `erc-autojoin-channels-alist'." - (let* ((chnl (erc-response.contents parsed)) - (nick (car (erc-parse-user (erc-response.sender parsed)))) - (server (with-current-buffer (process-buffer proc) - (erc-autojoin-current-server)))) - (when (erc-current-nick-p nick) - (let ((elem (or (assoc (erc-network) erc-autojoin-channels-alist) - (assoc server erc-autojoin-channels-alist)))) - (if elem - (unless (member chnl (cdr elem)) - (setcdr elem (cons chnl (cdr elem)))) - ;; This always keys on server, not network -- user can - ;; override by simply adding a network to - ;; `erc-autojoin-channels-alist' - (setq erc-autojoin-channels-alist - (cons (list server chnl) - erc-autojoin-channels-alist)))))) + (when-let* ((nick (car (erc-parse-user (erc-response.sender parsed)))) + ((erc-current-nick-p nick)) + (chnl (erc-response.contents parsed)) + (elem (or (and (erc-valid-local-channel-p chnl) + (regexp-quote erc-server-announced-name)) + (erc--sid-symbol erc--session) + (with-current-buffer (process-buffer proc) + (erc-autojoin-current-server))))) + (cl-pushnew chnl (alist-get elem erc-autojoin-channels-alist + nil nil (if (symbolp elem) #'eq #'equal)) + :test #'equal)) ;; We must return nil to tell ERC to continue running the other ;; functions. nil) @@ -221,18 +196,19 @@ erc-autojoin-add (defun erc-autojoin-remove (proc parsed) "Remove the channel being left from `erc-autojoin-channels-alist'." - (let* ((chnl (car (erc-response.command-args parsed))) - (nick (car (erc-parse-user (erc-response.sender parsed)))) - (server (with-current-buffer (process-buffer proc) - (erc-autojoin-current-server)))) - (when (erc-current-nick-p nick) - (let ((elem (or (assoc (erc-network) erc-autojoin-channels-alist) - (assoc server erc-autojoin-channels-alist)))) - (when elem - (setcdr elem (delete chnl (cdr elem))) - (unless (cdr elem) - (setq erc-autojoin-channels-alist - (delete elem erc-autojoin-channels-alist))))))) + (when-let* ((nick (car (erc-parse-user (erc-response.sender parsed)))) + ((erc-current-nick-p nick)) + (chnl (car (erc-response.command-args parsed))) + (elem (or (and (erc-valid-local-channel-p chnl) + (regexp-quote erc-server-announced-name)) + (erc--sid-symbol erc--session) + (with-current-buffer (process-buffer proc) + (erc-autojoin-current-server)))) + (test (if (symbolp elem) #'eq #'equal))) + (let ((chans (delete chnl (assoc-default elem erc-autojoin-channels-alist + test)))) + (setf (alist-get elem erc-autojoin-channels-alist nil (null chans) test) + chans))) ;; We must return nil to tell ERC to continue running the other ;; functions. nil) diff --git a/test/lisp/erc/erc-join-tests.el b/test/lisp/erc/erc-join-tests.el new file mode 100644 index 0000000000..9e1352668d --- /dev/null +++ b/test/lisp/erc/erc-join-tests.el @@ -0,0 +1,345 @@ +;;; erc-join-tests.el --- Tests for erc-join. -*- lexical-binding:t -*- + +;; Copyright (C) 2020-2021 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 . + +;;; Code: + +(require 'ert-x) +(require 'erc-join) +(require 'erc-networks) + +(ert-deftest erc-autojoin-channels--connect () + (should (eq erc-autojoin-timing 'connect)) + (should (= erc-autojoin-delay 30)) + (should-not erc--autojoin-timer) + + (let (calls + common + erc-kill-server-hook) + + (cl-letf (((symbol-function 'erc-server-send) + (lambda (line) (push line calls)))) + + (setq common + (lambda () + (ert-with-test-buffer (:name "foonet") + (erc-mode) + (setq erc-server-process + (start-process "true" (current-buffer) "true") + erc-network 'FooNet + erc-session-server "irc.gnu.chat" + erc-server-current-nick "tester" + erc--session (erc--sid-create nil) + erc-server-announced-name "foo.gnu.chat") + (set-process-query-on-exit-flag erc-server-process nil) + (erc-autojoin-channels erc-server-announced-name + "tester") + (should-not erc--autojoin-timer)))) + + (ert-info ("Join immediately on connect; server") + (let ((erc-autojoin-channels-alist '(("\\.gnu\\.chat\\'" "#chan")))) + (funcall common)) + (should (equal (pop calls) "JOIN #chan"))) + + (ert-info ("Join immediately on connect; network") + (let ((erc-autojoin-channels-alist '((FooNet "#chan")))) + (funcall common)) + (should (equal (pop calls) "JOIN #chan"))) + + (ert-info ("Do nothing; server") + (let ((erc-autojoin-channels-alist '(("bar\\.gnu\\.chat" "#chan")))) + (funcall common)) + (should-not calls)) + + (ert-info ("Do nothing; network") + (let ((erc-autojoin-channels-alist '((BarNet "#chan")))) + (funcall common)) + (should-not calls))))) + +(ert-deftest erc-autojoin-channels--delay () + (should (eq erc-autojoin-timing 'connect)) + (should (= erc-autojoin-delay 30)) + (should-not erc--autojoin-timer) + + (let (calls + common + erc-kill-server-hook + (erc-autojoin-timing 'ident) + (erc-autojoin-delay 0.05)) + + (cl-letf (((symbol-function 'erc-server-send) + (lambda (line) (push line calls))) + ((symbol-function 'erc-autojoin-after-ident) + (lambda (&rest _r) (error "I ran but shouldn't have")))) + + (setq common + (lambda () + (ert-with-test-buffer (:name "foonet") + (erc-mode) + (setq erc-server-process + (start-process "true" (current-buffer) "true") + erc-network 'FooNet + erc-session-server "irc.gnu.chat" + erc-server-current-nick "tester" + erc--session (erc--sid-create nil) + erc-server-announced-name "foo.gnu.chat") + (set-process-query-on-exit-flag erc-server-process nil) + (should-not erc--autojoin-timer) + (erc-autojoin-channels erc-server-announced-name "tester") + (should erc--autojoin-timer) + (should-not calls) + (sleep-for 0.1)))) + + (ert-info ("Deferred on connect; server") + (let ((erc-autojoin-channels-alist '(("\\.gnu\\.chat\\'" "#chan")))) + (funcall common)) + (should (equal (pop calls) "JOIN #chan"))) + + (ert-info ("Deferred on connect; network") + (let ((erc-autojoin-channels-alist '((FooNet "#chan")))) + (funcall common)) + (should (equal (pop calls) "JOIN #chan"))) + + (ert-info ("Do nothing; server") + (let ((erc-autojoin-channels-alist '(("bar\\.gnu\\.chat" "#chan")))) + (funcall common)) + (should-not calls))))) + +(ert-deftest erc-autojoin-channels--ident () + (should (eq erc-autojoin-timing 'connect)) + (should (= erc-autojoin-delay 30)) + (should-not erc--autojoin-timer) + + (let (calls + common + erc-kill-server-hook + (erc-autojoin-timing 'ident)) + + (cl-letf (((symbol-function 'erc-server-send) + (lambda (line) (push line calls)))) + + (setq common + (lambda () + (ert-with-test-buffer (:name "foonet") + (erc-mode) + (setq erc-server-process + (start-process "true" (current-buffer) "true") + erc-network 'FooNet + erc-server-current-nick "tester" + erc--session (erc--sid-create nil) + erc-server-announced-name "foo.gnu.chat") + (set-process-query-on-exit-flag erc-server-process nil) + (erc-autojoin-after-ident 'FooNet "tester") + (should-not erc--autojoin-timer)))) + + (ert-info ("Join on NickServ hook; server") + (let ((erc-autojoin-channels-alist '(("\\.gnu\\.chat\\'" "#chan")))) + (funcall common)) + (should (equal (pop calls) "JOIN #chan"))) + + (ert-info ("Join on NickServ hook; network") + (let ((erc-autojoin-channels-alist '((FooNet "#chan")))) + (funcall common)) + (should (equal (pop calls) "JOIN #chan")))))) + +(defun erc-join-tests--autojoin-add--common (setup) + (let (calls + erc-autojoin-channels-alist) + + (cl-letf (((symbol-function 'erc-handle-parsed-server-response) + (lambda (_p m) (push m calls)))) + + (ert-with-test-buffer (:name "foonet") + (erc-mode) + (setq erc-server-process + (start-process "true" (current-buffer) "true") + erc-server-current-nick "tester" + erc-isupport-parameters '((CHANTYPES "&#")) + erc-server-announced-name "foo.gnu.chat") + (funcall setup) + (set-process-query-on-exit-flag erc-server-process nil) + (should-not calls) + + (ert-info ("Add #chan") + (erc-parse-server-response erc-server-process + ":tester!~i@c.u JOIN #chan") + (should calls) + (erc-autojoin-add erc-server-process (pop calls)) + (should (equal erc-autojoin-channels-alist '((FooNet "#chan"))))) + + (ert-info ("More recently joined chans are prepended") + (erc-parse-server-response erc-server-process + ":tester!~i@c.u JOIN #spam") + (should calls) + (erc-autojoin-add erc-server-process (pop calls)) + (should (equal erc-autojoin-channels-alist + '((FooNet "#spam" "#chan"))))) + + (ert-info ("Duplicates skipped") + (erc-parse-server-response erc-server-process + ":tester!~i@c.u JOIN #chan") + (should calls) + (erc-autojoin-add erc-server-process (pop calls)) + (should (equal erc-autojoin-channels-alist + '((FooNet "#spam" "#chan"))))) + + (ert-info ("Server used for local channel") + (erc-parse-server-response erc-server-process + ":tester!~i@c.u JOIN &local") + (should calls) + (erc-autojoin-add erc-server-process (pop calls)) + (should (equal erc-autojoin-channels-alist + '(("foo\\.gnu\\.chat" "&local") + (FooNet "#spam" "#chan"))))))))) + +(ert-deftest erc-autojoin-add--network () + (erc-join-tests--autojoin-add--common + (lambda () (setq erc-network 'FooNet + erc--session (erc--sid-create nil))))) + +(ert-deftest erc-autojoin-add--session-id () + (erc-join-tests--autojoin-add--common + (lambda () (setq erc-network 'invalid + erc--session (erc--sid-create 'FooNet))))) + +(ert-deftest erc-autojoin-add--server () + (let (calls + erc-autojoin-channels-alist) + + (cl-letf (((symbol-function 'erc-handle-parsed-server-response) + (lambda (_p m) (push m calls)))) + + (ert-info ("Network unavailable, announced name used") + (setq erc-autojoin-channels-alist nil) + (ert-with-test-buffer (:name "foonet") + (erc-mode) + (setq erc-server-process + (start-process "true" (current-buffer) "true") + erc-server-current-nick "tester" + erc-server-announced-name "foo.gnu.chat" + erc--session (make-erc--sid)) ; assume too early + (set-process-query-on-exit-flag erc-server-process nil) + (should-not calls) + (erc-parse-server-response erc-server-process + ":tester!~u@q6ddatxcq6txy.irc JOIN #chan") + (should calls) + (erc-autojoin-add erc-server-process (pop calls)) + (should (equal erc-autojoin-channels-alist + '(("gnu.chat" "#chan"))))))))) + +(defun erc-join-tests--autojoin-remove--common (setup) + (let (calls + erc-autojoin-channels-alist) + + (cl-letf (((symbol-function 'erc-handle-parsed-server-response) + (lambda (_p m) (push m calls)))) + + (setq erc-autojoin-channels-alist ; mutated, so can't quote whole thing + (list '(FooNet "#spam" "##chan") + '(BarNet "#bar" "##bar") + '("foo\\.gnu\\.chat" "&local"))) + + (ert-with-test-buffer (:name "foonet") + (erc-mode) + (setq erc-server-process + (start-process "true" (current-buffer) "true") + erc-server-current-nick "tester" + erc-isupport-parameters '((CHANTYPES "&#")) + erc-server-announced-name "foo.gnu.chat") + (funcall setup) + (set-process-query-on-exit-flag erc-server-process nil) + (should-not calls) + + (ert-info ("Remove #chan") + (erc-parse-server-response erc-server-process + ":tester!~i@c.u PART ##chan") + (should calls) + (erc-autojoin-remove erc-server-process (pop calls)) + (should (equal erc-autojoin-channels-alist + '((FooNet "#spam") + (BarNet "#bar" "##bar") + ("foo\\.gnu\\.chat" "&local"))))) + + (ert-info ("Wrong network, nothing done") + (erc-parse-server-response erc-server-process + ":tester!~i@c.u PART #bar") + (should calls) + (erc-autojoin-remove erc-server-process (pop calls)) + (should (equal erc-autojoin-channels-alist + '((FooNet "#spam") + (BarNet "#bar" "##bar") + ("foo\\.gnu\\.chat" "&local"))))) + + (ert-info ("Local channel keyed by server found") + (erc-parse-server-response erc-server-process + ":tester!~i@c.u PART &local") + (should calls) + (erc-autojoin-remove erc-server-process (pop calls)) + (should (equal erc-autojoin-channels-alist + '((FooNet "#spam") (BarNet "#bar" "##bar"))))))))) + +(ert-deftest erc-autojoin-remove--network () + (erc-join-tests--autojoin-remove--common + (lambda () (setq erc-network 'FooNet + erc--session (erc--sid-create nil))))) + +(ert-deftest erc-autojoin-remove--session-id () + (erc-join-tests--autojoin-remove--common + (lambda () (setq erc-network 'fake-a-roo + erc--session (erc--sid-create 'FooNet))))) + +(ert-deftest erc-autojoin-remove--server () + (let (calls + erc-autojoin-channels-alist) + + (cl-letf (((symbol-function 'erc-handle-parsed-server-response) + (lambda (_p m) (push m calls)))) + + (setq erc-autojoin-channels-alist (list '("gnu.chat" "#spam" "##chan") + '("fsf.chat" "#bar" "##bar"))) + + (ert-with-test-buffer (:name "foonet") + (erc-mode) + (setq erc-server-process + (start-process "true" (current-buffer) "true") + erc-server-current-nick "tester" + erc-server-announced-name "foo.gnu.chat" + ;; Assume special case w/o known network + erc--session (make-erc--sid)) + (set-process-query-on-exit-flag erc-server-process nil) + (should-not calls) + + (ert-info ("Announced name matched, #chan removed") + (erc-parse-server-response erc-server-process + ":tester!~i@c.u PART ##chan") + (should calls) + (erc-autojoin-remove erc-server-process (pop calls)) + (should (equal erc-autojoin-channels-alist + '(("gnu.chat" "#spam") + ("fsf.chat" "#bar" "##bar"))))) + + (ert-info ("Wrong announced name, nothing done") + (erc-parse-server-response erc-server-process + ":tester!~i@c.u PART #bar") + (should calls) + (erc-autojoin-remove erc-server-process (pop calls)) + (should (equal erc-autojoin-channels-alist + '(("gnu.chat" "#spam") + ("fsf.chat" "#bar" "##bar"))))))))) + +;;; erc-join-tests.el ends here -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0018-SQUASH-ME-Add-ERC-test-scenarios-for-session-aware-a.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Thu, 30 Sep 2021 03:28:54 -0700 Subject: [PATCH 18/28] SQUASH-ME: Add ERC test scenarios for session-aware autojoin XXX this commit should not stand alone. It should be squashed or fixup'd into "Favor session IDs and networks in erc-join.el" --- .../base/session-id/autojoin/barnet.lispdata | 43 +++++ .../session-id/autojoin/foonet-again.lispdata | 43 +++++ .../base/session-id/autojoin/foonet.lispdata | 39 ++++ test/lisp/erc/erc-scenarios.el | 170 ++++++++++++++++++ 4 files changed, 295 insertions(+) create mode 100644 test/lisp/erc/erc-scenarios-resources/base/session-id/autojoin/barnet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/session-id/autojoin/foonet-again.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/session-id/autojoin/foonet.lispdata diff --git a/test/lisp/erc/erc-scenarios-resources/base/session-id/autojoin/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/session-id/autojoin/barnet.lispdata new file mode 100644 index 0000000000..1a13259383 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/session-id/autojoin/barnet.lispdata @@ -0,0 +1,43 @@ +;; -*- mode: lisp-data; -*- +((pass 2 "PASS :barnet:changeme")) +((nick 2 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") + (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.barnet.org 003 tester :This server was created Mon, 10 May 2021 00:58:22 UTC") + (0 ":irc.barnet.org 004 tester irc.barnet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.barnet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.barnet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=barnet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.barnet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.barnet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.barnet.org 252 tester 0 :IRC Operators online") + (0 ":irc.barnet.org 254 tester 1 :channels formed") + (0 ":irc.barnet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.barnet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.barnet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i")) +;; No mode answer + +((join 2 "JOIN #chan") + (0 ":tester!~u@6yximxrnkg65a.irc JOIN #chan") + (0 ":irc.barnet.org 353 tester = #chan :@joe mike tester") + (0 ":irc.barnet.org 366 tester #chan :End of NAMES list") + (0.1 ":joe!~u@6yximxrnkg65a.irc PRIVMSG #chan :tester, welcome!") + (0 ":mike!~u@6yximxrnkg65a.irc PRIVMSG #chan :tester, welcome!")) + +((mode 1 "MODE #chan") + (0 ":irc.barnet.org 324 tester #chan +nt") + (0 ":irc.barnet.org 329 tester #chan 1620608304") + ;; Wait for foonet's buffer playback + (0.1 ":mike!~u@6yximxrnkg65a.irc PRIVMSG #chan :joe: Go take her hence, and marry her instantly.") + (0.1 ":joe!~u@6yximxrnkg65a.irc PRIVMSG #chan :mike: Of all the four, or the three, or the two, or one of the four.") + (0.1 ":mike!~u@6yximxrnkg65a.irc PRIVMSG #chan :joe: And gives the crutch the cradle's infancy.") + (0.1 ":joe!~u@6yximxrnkg65a.irc PRIVMSG #chan :mike: Such is the simplicity of man to hearken after the flesh.") + (0.05 ":mike!~u@6yximxrnkg65a.irc PRIVMSG #chan :joe: The leaf to read them. Let us toward the king.") + (0.05 ":joe!~u@6yximxrnkg65a.irc PRIVMSG #chan :mike: Many can brook the weather that love not the wind.") + (0.05 ":mike!~u@6yximxrnkg65a.irc PRIVMSG #chan :joe: And now, dear maid, be you as free to us.") + (0.00 ":joe!~u@6yximxrnkg65a.irc PRIVMSG #chan :mike: He hath an uncle here in Messina will be very much glad of it.")) + +((linger 3.5 LINGER)) diff --git a/test/lisp/erc/erc-scenarios-resources/base/session-id/autojoin/foonet-again.lispdata b/test/lisp/erc/erc-scenarios-resources/base/session-id/autojoin/foonet-again.lispdata new file mode 100644 index 0000000000..2f1c656311 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/session-id/autojoin/foonet-again.lispdata @@ -0,0 +1,43 @@ +;; -*- mode: lisp-data; -*- +((pass-redux 10 "PASS :foonet:changeme")) +((nick-redux 1 "NICK tester")) + +((user-redux 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Mon, 10 May 2021 00:58:22 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + ;; No mode answer ^ + + ;; History + (0 ":tester!~u@q6ddatxcq6txy.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :@alice bob tester") + (0 ":irc.foonet.org 366 tester #chan :End of /NAMES list.") + (0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") + (0 ":bob!~u@q6ddatxcq6txy.irc PRIVMSG #chan :[02:43:23] alice: And soar with them above a common bound.") + (0 ":alice!~u@q6ddatxcq6txy.irc PRIVMSG #chan :[02:43:27] bob: And be aveng'd on cursed Tamora.") + (0 ":bob!~u@q6ddatxcq6txy.irc PRIVMSG #chan :[02:43:29] alice: He did love her, sir, as a gentleman loves a woman.") + (0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.")) + +((mode-redux 1 "MODE #chan") + (0 ":irc.foonet.org 324 tester #chan +nt") + (0 ":irc.foonet.org 329 tester #chan 1620608304") + (0.1 ":alice!~u@q6ddatxcq6txy.irc PRIVMSG #chan :bob: Ay, madam, with the swiftest wing of speed.") + (0.1 ":bob!~u@q6ddatxcq6txy.irc PRIVMSG #chan :alice: Five times in that ere once in our five wits.") + (0.1 ":alice!~u@q6ddatxcq6txy.irc PRIVMSG #chan :bob: And bid him come to take his last farewell.") + (0.1 ":bob!~u@q6ddatxcq6txy.irc PRIVMSG #chan :alice: But we are spirits of another sort.") + (0.1 ":alice!~u@q6ddatxcq6txy.irc PRIVMSG #chan :bob: It was not given me, nor I did not buy it.")) + +((linger 6 LINGER)) diff --git a/test/lisp/erc/erc-scenarios-resources/base/session-id/autojoin/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/session-id/autojoin/foonet.lispdata new file mode 100644 index 0000000000..1162cc3f24 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/session-id/autojoin/foonet.lispdata @@ -0,0 +1,39 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :foonet:changeme")) +((nick 1 "NICK tester")) + +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Mon, 10 May 2021 00:58:22 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i")) +;; No mode answer ^ + +((join 1 "JOIN #chan") + (0 ":tester!~u@q6ddatxcq6txy.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :@alice bob tester") + (0 ":irc.foonet.org 366 tester #chan :End of NAMES list") + (0.1 ":bob!~u@q6ddatxcq6txy.irc PRIVMSG #chan :tester, welcome!") + (0 ":alice!~u@q6ddatxcq6txy.irc PRIVMSG #chan :tester, welcome!")) + +((mode 1 "MODE #chan") + (0 ":irc.foonet.org 324 tester #chan +nt") + (0 ":irc.foonet.org 329 tester #chan 1620608304") + (0.1 ":bob!~u@q6ddatxcq6txy.irc PRIVMSG #chan :alice: Pray you, sir, deliver me this paper.") + (0.1 ":alice!~u@q6ddatxcq6txy.irc PRIVMSG #chan :bob: Wake when some vile thing is near.")) + +((quit 1 "QUIT :\2ERC\2")) + +((drop 0 DROP)) diff --git a/test/lisp/erc/erc-scenarios.el b/test/lisp/erc/erc-scenarios.el index 0e2928b9a1..1d2f988338 100644 --- a/test/lisp/erc/erc-scenarios.el +++ b/test/lisp/erc/erc-scenarios.el @@ -278,6 +278,176 @@ erc-scenarios-base-association-same-network--new-buffer (funcall expect 5 "welcome again") (erc-cmd-QUIT ""))))) +;; XXX this is okay, but we also need to check that target buffers are +;; already associated with a new process *before* a JOIN is sent by a +;; server's playback burst. This doesn't do that. + +(defun erc-scenarios-common--base-session-id-autojoin (foo-reconnector + foo-id bar-id) + "Ensure channels rejoined by erc-join.el DTRT. +Originally from scenario clash-of-chans/autojoin as described in +Bug#48598: 28.0.50; buffer-naming collisions involving bouncers in ERC." + (erc-scenarios-common-with-cleanup + ((chan-buf-foo (format "#chan@%s" (or foo-id "foonet"))) + (chan-buf-bar (format "#chan@%s" (or bar-id "barnet"))) + (erc-scenarios-common-dialog "base/session-id/autojoin") + (erc-d-t-cleanup-sleep-secs 1) + (erc-server-flood-penalty 0.5) + (dumb-server (erc-d-run "localhost" t 'foonet 'barnet 'foonet-again)) + (port (process-contact dumb-server :service)) + (dumb-server-buffer (get-buffer "*erc-d-server*")) + (expect (erc-d-t-make-expecter)) + erc-server-buffer-foo erc-server-process-foo + erc-server-buffer-bar erc-server-process-bar) + + (should (memq 'autojoin erc-modules)) + + (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" + :id foo-id)) + (setq erc-server-process-foo erc-server-process) + (erc-scenarios-common-assert-initial-buf-name foo-id port) + (erc-d-t-wait-for 1 "Network set to foonet" (eq (erc-network) 'foonet)) + (funcall expect 5 "foonet"))) + + (ert-info ("Join #chan, find sentinel, quit") + (with-current-buffer erc-server-buffer-foo (erc-cmd-JOIN "#chan")) + (erc-d-t-wait-for 5 "Buffer #chan created" (get-buffer "#chan")) + (with-current-buffer "#chan" + (funcall expect 5 "vile thing") + (erc-cmd-QUIT ""))) + + (erc-d-t-wait-for 2 "Foonet connection deceased" + (not (erc-server-process-alive erc-server-buffer-foo))) + + (should (equal erc-autojoin-channels-alist + (if foo-id '((oofnet "#chan")) '((foonet "#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" + :id bar-id)) + (setq erc-server-process-bar erc-server-process) + (erc-d-t-wait-for 5 "Network set to barnet" (eq erc-network 'barnet)) + (should (string= (buffer-name) (if bar-id "rabnet" "barnet"))))) + + (ert-info ("Server buffers are unique, no stray IP-based names") + (should-not (eq erc-server-buffer-foo erc-server-buffer-bar)) + (should-not (erc-scenarios-common-buflist "127.0.0.1"))) + + (ert-info ("Only one #chan buffer exists") + (should (equal (list (get-buffer "#chan")) + (erc-scenarios-common-buflist "#chan")))) + + (ert-info ("#chan is not auto-joined") + (with-current-buffer "#chan" + (erc-d-t-search-for -0.1 "") + (should-not (process-live-p erc-server-process)) + (erc-d-t-wait-for -0.1 "server buffer remains foonet" + (not (eq erc-server-process erc-server-process-foo))))) + + (with-current-buffer erc-server-buffer-bar + (erc-cmd-JOIN "#chan") + (erc-d-t-wait-for 3 "#chan buffers renamed" (get-buffer chan-buf-foo)) + (erc-d-t-wait-for 3 "#chan buffers renamed" (get-buffer chan-buf-bar)) + (with-current-buffer chan-buf-bar + (erc-d-t-wait-for 3 "server-buffer is barnet" + (eq erc-server-process erc-server-process-bar)) + (funcall expect 5 "marry her instantly"))) + + (ert-info ("Reconnect to foonet") + (with-current-buffer (setq erc-server-buffer-foo + (funcall foo-reconnector)) + (should (member (if foo-id '(oofnet "#chan") '(foonet "#chan")) + erc-autojoin-channels-alist)) + (erc-d-t-wait-for 3 "process is alive" (erc-server-process-alive)) + (setq erc-server-process-foo erc-server-process) + (erc-d-t-wait-for 2 "Network set to foonet" (eq erc-network 'foonet)) + (should (string= (buffer-name) (if foo-id "oofnet" "foonet"))) + (funcall expect 5 "foonet"))) + + (ert-info ("#chan@foonet is clean, no cross-contamination") + (with-current-buffer chan-buf-foo + (erc-d-t-wait-for 3 "server buffer is foonet" + (eq erc-server-process erc-server-process-foo)) + (funcall expect 3 "") + (erc-d-t-search-for -0.1 "") + (while (accept-process-output erc-server-process-foo)) + (funcall expect 3 "not given me"))) + + (ert-info ("All #chan@barnet output received") + (with-current-buffer chan-buf-bar + (while (accept-process-output erc-server-process-bar)) + (funcall expect 3 "hath an uncle here"))))) + +(ert-deftest erc-scenarios-base-session-id-autojoin--cmd-reconnect () + (let ((connect (lambda () + (with-current-buffer "foonet" + (erc-cmd-RECONNECT) + (should (eq (current-buffer) + (process-buffer erc-server-process))) + (current-buffer))))) + (erc-scenarios-common--base-session-id-autojoin connect nil nil))) + +(ert-deftest erc-scenarios-base-session-id-autojoin--cmd-reconnect-id () + (let ((connect (lambda () + (with-current-buffer "oofnet" + (erc-cmd-RECONNECT) + (should (eq (current-buffer) + (process-buffer erc-server-process))) + (current-buffer))))) + (erc-scenarios-common--base-session-id-autojoin connect 'oofnet nil))) + +(ert-deftest erc-scenarios-base-session-id-autojoin--cmd-reconnect-ids () + (let ((connect (lambda () + (with-current-buffer "oofnet" + (erc-cmd-RECONNECT) + (should (eq (current-buffer) + (process-buffer erc-server-process))) + (current-buffer))))) + (erc-scenarios-common--base-session-id-autojoin connect 'oofnet 'rabnet))) + +(ert-deftest erc-scenarios-base-session-id-autojoin--new-invocation () + (let ((connect (lambda () + (erc :server "127.0.0.1" + :port (with-current-buffer "foonet" + (process-contact erc-server-process :service)) + :nick "tester" + :password "foonet:changeme" + :full-name "tester")))) + (erc-scenarios-common--base-session-id-autojoin connect nil nil))) + +(ert-deftest erc-scenarios-base-session-id-autojoin--new-invocation-id () + (let ((connect (lambda () + (erc :server "127.0.0.1" + :port (with-current-buffer "oofnet" + (process-contact erc-server-process :service)) + :nick "tester" + :password "foonet:changeme" + :full-name "tester" + :id 'oofnet)))) + (erc-scenarios-common--base-session-id-autojoin connect 'oofnet nil))) + +(ert-deftest erc-scenarios-base-session-id-autojoin--new-invocation-ids () + (let ((connect (lambda () + (erc :server "127.0.0.1" + :port (with-current-buffer "oofnet" + (process-contact erc-server-process :service)) + :nick "tester" + :password "foonet:changeme" + :full-name "tester" + :id 'oofnet)))) + (erc-scenarios-common--base-session-id-autojoin connect 'oofnet 'rabnet))) + ;; Playback for same channel on two networks routed correctly. ;; Originally from Bug#48598: 28.0.50; buffer-naming collisions ;; involving bouncers in ERC. -- 2.31.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0019-Standardize-auth-source-queries-in-ERC.patch Content-Transfer-Encoding: quoted-printable >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Mon, 16 Aug 2021 04:38:18 -0700 Subject: [PATCH 19/28] Standardize auth-source queries in ERC * lisp/erc/erc.el (erc-password): deprecate variable only used by `erc-select-read-args'. Server passwords are primarily used as surrogates for other forms of authentication. Such use is common but nonstandard and often discouraged in favor of things like SASL. Fans of invoking `erc(-tls)' interactively should be coerced into using auth-source instead. (erc-select-read-args): Before this change, `erc-select-read-args' offered to use the value of a non-nil `erc-password' as the :password argument for `erc' and `erc-tls', referring to it as the "default" password. And when `erc-prompt-for-password' was nil and `erc-password' wasn't, the latter was passed along unconditionally. This only further complicated an already confusing situation for new users, who in most cases shouldn't be worried about sending a PASS command at all. Until SASL arrives, they should provide server passwords manually or learn to use auth-source. (erc--auth-source-determine-params): New helper for `erc--auth-source-search' with potential for wider role as default value of custom function. Favors :host and :port fields above others. (erc--auth-source-search): New function for consulting auth-source and sorting result as per default params provided by above functions. (erc-server-join-channel): Use helper for consulting auth source facility. Also accept nil for first argument (instead of server). In this case, allow default params option above to determine best course of action. (erc-cmd-JOIN): use above-mentioned facilities when joining new channel. Omit server when calling erc-server-join-channel. Don't filter target buffers twice. Don't call `switch-to-buffer', which would create phantom buffers with names like target/server that were never used. IOW, only switch to existing target buffers. (erc-open, erc-determine-parameters, erc-compute-password): Move password figuring from former to latter, and from there to erc-compute password, which is a new function that figures out how to call auth-source-search based on the value of the new option erc-connect-auth-source-host. (erc-connect-auth-source-host): Add new option for customizing the :host param passed to auth-source-search while looking up the initial PASS arg. The default setting preserves existing behavior of matching against the dialed host name or IP address stored in erc-session-server. Other options allow skipping auth-source lookup altogether, or favoring network, when non-nil. * test/lisp/erc/erc-tests.el: Add tests for new helpers. * lisp/erc/erc-services.el (erc-nickserv-get-password): pass network when looking up password in erc-nickserv-passwords and when formatting prompt for user input. * test/lisp/erc/erc-services-tests.el: add new test file for above changes. --- lisp/erc/erc-services.el | 41 +++---- lisp/erc/erc.el | 174 +++++++++++++++++++--------- test/lisp/erc/erc-services-tests.el | 63 ++++++++++ test/lisp/erc/erc-tests.el | 114 ++++++++++++++++++ 4 files changed, 309 insertions(+), 83 deletions(-) create mode 100644 test/lisp/erc/erc-services-tests.el diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el index adb3f521cd..b0c58ae0ce 100644 --- a/lisp/erc/erc-services.el +++ b/lisp/erc/erc-services.el @@ -431,34 +431,19 @@ erc-nickserv-get-password lookups stops and this function returns it (or returns nil if it is empty). Otherwise, no corresponding password was found, and it returns nil." - (let (network server port) - ;; Fill in local vars, switching to the server buffer once only - (erc-with-server-buffer - (setq network erc-network - server erc-session-server - port erc-session-port)) - (let ((ret - (or - (when erc-nickserv-passwords - (cdr (assoc nick - (cl-second (assoc network - erc-nickserv-passwords))))) - (when erc-use-auth-source-for-nickserv-password - (let ((secret (cl-first (auth-source-search - :max 1 :require '(:secret) - :host server - ;; Ensure a string for :port - :port (format "%s" port) - :user nick)))) - (when secret - (let ((passwd (plist-get secret :secret))) - (if (functionp passwd) (funcall passwd) passwd))))) - (when erc-prompt-for-nickserv-password - (read-passwd - (format "NickServ password for %s on %s (RET to cancel): " - nick network)))))) - (when (and ret (not (string=3D ret ""))) - ret)))) + (when-let* + ((esid (erc-network)) + (ret (or (when erc-nickserv-passwords + (assoc-default nick + (cadr (assq esid erc-nickserv-passwords))= )) + (when erc-use-auth-source-for-nickserv-password + (erc--auth-source-search :user nick)) + (when erc-prompt-for-nickserv-password + (read-passwd + (format "NickServ password for %s on %s (RET to cancel)= : " + nick esid))))) + ((not (string-empty-p ret)))) + ret)) =20 (defvar erc-auto-discard-away) =20 diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 2fefa00778..8ebe50fa89 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -206,9 +206,14 @@ erc-rename-buffers "old behavior when t now permanent" "29.1") =20 (defvar erc-password nil - "Password to use when authenticating to an IRC server. -It is not strictly necessary to provide this, since ERC will -prompt you for it.") + "Password to use when authenticating to an IRC server interactively. + +This variable only exists for legacy reasons. It's not customizable and +is limited to a single server password. Users looking for similar +functionality should consider auth-source instead. See info +node `(auth) Top' and info node `(erc) Connecting'.") + +(make-obsolete-variable 'erc-password "use auth-source instead" "29.1") =20 (defcustom erc-user-mode "+i" ;; +i "Invisible". Hides user from global /who and /names. @@ -219,10 +224,30 @@ erc-user-mode =20 =20 (defcustom erc-prompt-for-password t - "Asks before using the default password, or whether to enter a new one." + "Ask for a server password when invoking `erc-tls' interactively." :group 'erc :type 'boolean) =20 +(defcustom erc-connect-auth-source-host 'server + "Host \"type\" for querying auth-source when first connecting. +This is for determining the \"server password\" argument of the IRC +\"PASS\" command sent to the server. The entry points `erc' and +`erc-tls' query auth-source for such a password when a :password +argument isn't provided. Because ERC also interfaces with auth-source +for other secrets, such as NickServ passwords and channel keys, +additional ways of selecting entries are sometimes necessary. See info +node `(auth) Top'. + +Note that there aren't any options for specifying a network, like +Libera.Chat, or a network-specific server, such as foo.libera.chat, +because such information isn't available until after initial +introductions have completed (\"registration\" in IRC speak)." + :group 'erc + :type '(choice (const :tag "Don't query auth-source" nil) + (const :tag "Dialed host name or IP address" server) + (const :tag "Prompt for a machine/host value" prompt) + (string :tag "Literal value to use for :host"))) + (defcustom erc-warn-about-blank-lines t "Warn the user if they attempt to send a blank line." :group 'erc @@ -2217,22 +2242,6 @@ erc-open (setq erc-logged-in nil) ;; The local copy of `erc-nick' - the list of nicks to choose (setq erc-default-nicks (if (consp erc-nick) erc-nick (list erc-nick))) - ;; password stuff - (setq erc-session-password - (or passwd - (let ((secret - (plist-get - (nth 0 - (auth-source-search :host server - :max 1 - :user nick - ;; secrets.el wouldn=E2=80= =99t accept a number - :port (if (numberp port) (n= umber-to-string port) port) - :require '(:secret))) - :secret))) - (if (functionp secret) - (funcall secret) - secret)))) ;; client certificate (only useful if connecting over TLS) (setq erc-session-client-certificate client-certificate) (setq erc--session (if connect @@ -2252,7 +2261,7 @@ erc-open (erc-display-prompt) (goto-char (point-max))) =20 - (erc-determine-parameters server port nick full-name) + (erc-determine-parameters server port nick full-name passwd) =20 ;; Saving log file on exit (run-hook-with-args 'erc-connect-pre-hook buffer) @@ -2350,11 +2359,9 @@ erc-select-read-args (setq server user-input) =20 (setq passwd (if erc-prompt-for-password - (if (and erc-password - (y-or-n-p "Use the default password? ")) - erc-password - (read-passwd "Password: ")) - erc-password)) + (read-passwd "Server password: ") + (with-suppressed-warnings ((obsolete erc-password)) + erc-password))) (when (and passwd (string=3D "" passwd)) (setq passwd nil)) =20 @@ -3366,22 +3373,71 @@ erc-cmd-HELP (defalias 'erc-cmd-H #'erc-cmd-HELP) (put 'erc-cmd-HELP 'process-not-needed t) =20 +;; Users may want to override this. We could convert it to the +;; default value of a -function option (or use a defmethod). + +(defun erc--auth-source-determine-params () + "Return a plist of default args to pass to `auth-source-search'. +Favor a discovered network name over an announced server unless +`erc--buffer-target' is a local channel. Consider the dialed server +address as a fallback for the announced name in both cases." + (let* ((net (and-let* ((net (erc-network))) (symbol-name net))) + (localp (and erc--buffer-target + (erc--target-local-p erc--buffer-target))) + (hosts (if localp + (list erc-server-announced-name erc-session-server net) + (list net erc-server-announced-name erc-session-server))) + (ports (list (cl-typecase erc-session-port + (integer (number-to-string erc-session-port)) + (string (and (string=3D erc-session-port "irc") + erc-session-port)) ; or nil + (t erc-session-port)) + "irc"))) + (list :host (delq nil hosts) + :port (delq nil ports) + :require (list :secret)))) + +(defun erc--auth-source-search (&rest plist) + "Ask auth-source for a secret and return it if found. +Favor overrides in PLIST, if any. Otherwise, use whatever's present in +the list returned by `erc--auth-source-determine-params'. Return a +string if found or nil otherwise." + (let* ((defaults (erc--auth-source-determine-params)) + priority + (test (lambda (a b) + (catch 'done + (dolist (key priority) + (let* ((d (plist-get defaults key)) + (default-value (if (listp d) d (list d))) + ;; featurep 'seq via auth-source > json > map + (p (seq-position default-value (plist-get a ke= y))) + (q (seq-position default-value (plist-get b ke= y)))) + (unless (eql p q) + (throw 'done (when p (or (not q) (< p q))))))))))) + (cl-loop for (key value) on defaults by #'cddr + when value unless (plist-get plist key) + do (setq plist (plist-put plist key value))) + (let ((keys (nreverse (map-keys defaults)))) + (dolist (key (map-keys plist)) + (cl-pushnew key keys)) + (setq priority (nreverse keys))) + (unless (plist-get plist :max) ; from `auth-source-netrc-parse' + (setq plist (plist-put plist :max 5000))) + (when-let* ((sorted (sort (apply #'auth-source-search plist) test)) + (secret (plist-get (car sorted) :secret))) + (if (functionp secret) (funcall secret) secret)))) + (defun erc-server-join-channel (server channel &optional secret) - (let* ((secret (or secret - (plist-get (nth 0 (auth-source-search - :max 1 - :host server - :port "irc" - :user channel)) - :secret))) - (password (if (functionp secret) - (funcall secret) - secret))) - (erc-log (format "cmd: JOIN: %s" channel)) - (erc-server-send (concat "JOIN " channel - (if password - (concat " " password) - ""))))) + "Join CHANNEL, optionally with SECRET. +Without SECRET, consult auth source, using SERVER if non-nil." + (unless secret + (unless server + (when (and erc-server-announced-name (erc-valid-local-channel-p chan= nel)) + (setq server erc-server-announced-name))) + (let ((args `(,@(when server (list :host server)) :user channel))) + (setq secret (apply #'erc--auth-source-search args)))) + (erc-log (format "cmd: JOIN: %s" channel)) + (erc-server-send (concat "JOIN " channel (when secret (concat " " secret= ))))) =20 (defun erc-valid-local-channel-p (channel) "Non-nil when channel is server-local on a network that allows them." @@ -3401,18 +3457,11 @@ erc-cmd-JOIN (setq chnl (erc-ensure-channel-name channel))) (when chnl ;; Prevent double joining of same channel on same server. - (let* ((joined-channels - (mapcar (lambda (chanbuf) - (with-current-buffer chanbuf (erc-default-target))) - (erc-channel-list erc-server-process))) - (server (with-current-buffer (process-buffer erc-server-proce= ss) - (or erc-session-server erc-server-announced-name))) - (chnl-name (car (erc-member-ignore-case chnl joined-channels)= ))) - (if chnl-name - (switch-to-buffer (if (get-buffer chnl-name) - chnl-name - (concat chnl-name "/" server))) - (erc-server-join-channel server chnl key))))) + (if-let* ((existing (erc-get-buffer chnl erc-server-process)) + ((with-current-buffer existing + (erc-get-channel-user (erc-current-nick))))) + (switch-to-buffer existing) + (erc-server-join-channel nil chnl key)))) t) =20 (defalias 'erc-cmd-CHANNEL #'erc-cmd-JOIN) @@ -6368,7 +6417,7 @@ erc-login =20 ;; connection properties' heuristics =20 -(defun erc-determine-parameters (&optional server port nick name) +(defun erc-determine-parameters (&optional server port nick name passwd) "Determine the connection and authentication parameters. Sets the buffer local variables: =20 @@ -6376,11 +6425,13 @@ erc-determine-parameters - `erc-session-server' - `erc-session-port' - `erc-session-user-full-name' +- `erc-session-password' - `erc-server-current-nick'" (setq erc-session-connector erc-server-connect-function erc-session-server (erc-compute-server server) erc-session-port (or port erc-default-port) - erc-session-user-full-name (erc-compute-full-name name)) + erc-session-user-full-name (erc-compute-full-name name) + erc-session-password (erc-compute-server-password passwd nick)) (erc-set-current-nick (erc-compute-nick nick))) =20 (defun erc-compute-server (&optional server) @@ -6413,6 +6464,19 @@ erc-compute-nick (getenv "IRCNICK") (user-login-name))) =20 +(defun erc-compute-server-password (password nick) + "Determine initial PASSWORD value for IRC PASS command. +Use the value of `erc-connect-auth-source-host' to determine the +machine/host query param. Use NICK for the user/login query param." + (or password + (when erc-connect-auth-source-host + (let* ((host (pcase erc-connect-auth-source-host + ('server erc-session-server) + ((and (pred stringp) v) v) + ('prompt (read-string "Auth-source host: " + nil t (list nil))))) + (args `(,@(when host (list :host host)) :user ,nick))) + (apply #'erc--auth-source-search args))))) =20 (defun erc-compute-full-name (&optional full-name) "Return user's full name. diff --git a/test/lisp/erc/erc-services-tests.el b/test/lisp/erc/erc-servic= es-tests.el new file mode 100644 index 0000000000..c646b1c69d --- /dev/null +++ b/test/lisp/erc/erc-services-tests.el @@ -0,0 +1,63 @@ +;;; erc-services-tests.el --- Tests for erc-services. -*- lexical-binding= :t -*- + +;; Copyright (C) 2020-2021 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 . + +;;; Code: + +(require 'ert-x) +(require 'erc-services) + +(ert-deftest erc-nickserv-get-password () + (should erc-prompt-for-nickserv-password) + (let* ((entries (list + "machine GNU/chat port 6697 user bob password spam" + "machine FSF.chat port 6697 user bob password sesame" + "machine MyHost port irc password 123")) + (netrc-file (make-temp-file "auth-source-test" nil nil + (mapconcat 'identity entries "\n"))) + (auth-sources (list netrc-file)) + (auth-source-do-cache nil) + (erc-nickserv-passwords '((FSF.chat (("alice" . "foo") + ("joe" . "bar"))))) + (erc-use-auth-source-for-nickserv-password t) + (erc-session-server "irc.gnu.org") + (erc-server-announced-name "west.gnu.org") + (erc-network 'FSF.chat) + (erc-session-port 6697)) + + (ert-info ("Lookup custom option") + (should (string=3D (erc-nickserv-get-password "alice") "foo"))) + + (unwind-protect + (ert-info ("Auth source") + + (ert-info ("Network") + (should (string=3D (erc-nickserv-get-password "bob") "sesame")= ))) + + (delete-file netrc-file)) + + (ert-info ("Read input") + (should (string=3D + (ert-simulate-keys "baz\r" (erc-nickserv-get-password "mike= ")) + "baz"))) + + (ert-info ("Failed") + (should-not (ert-simulate-keys "\r" + (erc-nickserv-get-password "fake")))))) + +;;; erc-services-tests.el ends here diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el index 8d078a2053..a337195898 100644 --- a/test/lisp/erc/erc-tests.el +++ b/test/lisp/erc/erc-tests.el @@ -238,6 +238,120 @@ erc--target-from-string (should (equal (erc--target-from-string "&Bitlbee") #s(erc--target "&Bitlbee" &bitlbee t t))))) =20 +;; This stuff is related to bug#23438. + +(defvar erc-join-tests--auth-source-entries + '("machine irc.gnu.org port irc user \"#chan\" password bar" + "machine west.gnu.org port irc user \"#chan\" password baz" + "machine GNU.chat port irc user \"#chan\" password foo")) + +(ert-deftest erc--auth-source-search--standard () + (let* ((entries (sort (copy-sequence erc-join-tests--auth-source-entries) + (lambda (&rest _) (zerop (random 2))))) + (netrc-file (make-temp-file "auth-source-test" nil nil + (mapconcat 'identity entries "\n"))) + (auth-sources (list netrc-file)) + (auth-source-do-cache nil)) + + (unwind-protect + + (ert-info ("Normal ordering") + + (ert-info ("Network wins") + (let ((erc-session-server "irc.gnu.org") + (erc-server-announced-name "west.gnu.org") + (erc-session-port 6697) + (erc-network 'GNU.chat)) + (should (string=3D (erc--auth-source-search :user "#chan") + "foo")))) + + (ert-info ("Announced wins") + (let ((erc-session-server "irc.gnu.org") + (erc-server-announced-name "west.gnu.org") + (erc-session-port 6697) + erc-network) + (should (string=3D (erc--auth-source-search :user "#chan") + "baz"))))) + + (delete-file netrc-file)))) + +(ert-deftest erc--auth-source-search--announced () + (let* ((entries (sort (copy-sequence erc-join-tests--auth-source-entries) + (lambda (&rest _) (zerop (random 2))))) + (netrc-file (make-temp-file "auth-source-test" nil nil + (mapconcat 'identity entries "\n"))) + (auth-sources (list netrc-file)) + (auth-source-do-cache nil) + (erc-isupport-parameters '((CHANTYPES "&#"))) + (erc--buffer-target (erc--target-from-string "&chan"))) + + (unwind-protect + + (ert-info ("Announced prioritized") + + (ert-info ("Announced wins") + (let ((erc-session-server "irc.gnu.org") + (erc-server-announced-name "west.gnu.org") + (erc-session-port 6697) + (erc-network 'GNU.chat)) + (should (string=3D (erc--auth-source-search :user "#chan") + "baz")))) + + (ert-info ("Peer next") + (let ((erc-server-announced-name "irc.gnu.org") + (erc-session-port 6697) + (erc-network 'GNU.chat)) + (should (string=3D (erc--auth-source-search :user "#chan") + "bar")))) + + (ert-info ("Network used as fallback") + (let ((erc-session-port 6697) + (erc-network 'GNU.chat)) + (should (string=3D (erc--auth-source-search :user "#chan") + "foo"))))) + + (delete-file netrc-file)))) + +(ert-deftest erc--auth-source-search--overrides () + (let* ((extra (list + "machine GNU.chat port 6697 user \"#chan\" password spam" + "machine west.gnu.org port irc user \"#fsf\" password 42" + "machine irc.gnu.org port 6667 password sesame" + "machine MyHost port irc password 456" + "machine MyHost port 6667 password 123")) + (entries (sort (append erc-join-tests--auth-source-entries extra) + (lambda (&rest _) (zerop (random 2))))) + (netrc-file (make-temp-file "auth-source-test" nil nil + (mapconcat 'identity entries "\n"))) + (auth-sources (list netrc-file)) + (auth-source-do-cache nil) + (erc-session-server "irc.gnu.org") + (erc-server-announced-name "west.gnu.org") + (erc-network 'GNU.chat) + (erc-session-port 6667)) + + (unwind-protect + (ert-info ("Specificity and overrides") + + (ert-info ("More specific port") + (let ((erc-session-port 6697)) + (should (string=3D (erc--auth-source-search :user "#chan") + "spam")))) + + (ert-info ("Network wins") + (should (string=3D (erc--auth-source-search :user '("#fsf")) + "42"))) + + (ert-info ("Actual override") + (should (string=3D (erc--auth-source-search :port "6667") + "sesame"))) + + (ert-info ("Overrides don't interfere with post-processing") + (should (string=3D (erc--auth-source-search :host "MyHost") + "123")))) + + (delete-file netrc-file)))) + (ert-deftest erc-ring-previous-command-base-case () (ert-info ("Create ring when nonexistent and do nothing") (let (erc-input-ring --=20 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0020-Make-auth-source-searches-session-ID-aware-in-ERC.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Mon, 16 Aug 2021 04:46:25 -0700 Subject: [PATCH 20/28] Make auth-source searches session-ID aware in ERC XXX this commit was split off from the previous one, entitled something like "Standardize auth-source queries in ERC", so that the latter could be applied independently, and not be tied to all this session-ID/buffer-naming stuff. But if that commit ends up remaining the parent of this one, there's no reason this can't be squashed into it. * lisp/erc/erc.el(erc--auth-source-determine-params): Now prioritizes session IDs over announced servers and dialed endpoints. (erc-connect-auth-source-host): Change network-oriented choice to favor session-id over server * lisp/erc/erc-join.el (erc-autojoin--join): Don't pass session-like entity from erc-autojoin-alist match to erc-server-join-channel. Allow that function to decide for itself which host to look up if necessary. * test/lisp/erc/erc-tests.el: Update tests to use session ID. * lisp/erc/erc-services.el (erc-nickserv-get-password): pass effective session ID when looking up password in erc-nickserv-passwords and when formatting prompt for user input. (erc-nickserv-passwords): add comment to custom option definition type tag. * test/lisp/erc/erc-services-tests.el (erc-nickserv-get-password): adjust test for above changes. --- lisp/erc/erc-join.el | 2 +- lisp/erc/erc-services.el | 4 +-- lisp/erc/erc.el | 10 ++++--- test/lisp/erc/erc-services-tests.el | 8 ++++- test/lisp/erc/erc-tests.el | 45 +++++++++++++++++++++-------- 5 files changed, 49 insertions(+), 20 deletions(-) diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el index ab2ffc9f72..3921694d4d 100644 --- a/lisp/erc/erc-join.el +++ b/lisp/erc/erc-join.el @@ -144,7 +144,7 @@ erc-autojoin--join (when-let ((match (erc-autojoin-server-match name))) (dolist (chan channels) (unless (erc-get-buffer chan erc-server-process) - (erc-server-join-channel match chan)))))) + (erc-server-join-channel nil chan)))))) (defun erc-autojoin-after-ident (_network _nick) "Autojoin channels in `erc-autojoin-channels-alist'. diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el index b0c58ae0ce..0171a01cfe 100644 --- a/lisp/erc/erc-services.el +++ b/lisp/erc/erc-services.el @@ -202,7 +202,7 @@ erc-nickserv-passwords (const QuakeNet) (const Rizon) (const SlashNET) - (symbol :tag "Network name")) + (symbol :tag "Network name or session ID")) (repeat :tag "Nickname and password" (cons :tag "Identity" (string :tag "Nick") @@ -432,7 +432,7 @@ erc-nickserv-get-password is empty). Otherwise, no corresponding password was found, and it returns nil." (when-let* - ((esid (erc-network)) + ((esid (erc--sid-symbol erc--session)) (ret (or (when erc-nickserv-passwords (assoc-default nick (cadr (assq esid erc-nickserv-passwords)))) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 8ebe50fa89..a9986574d6 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -246,6 +246,7 @@ erc-connect-auth-source-host :type '(choice (const :tag "Don't query auth-source" nil) (const :tag "Dialed host name or IP address" server) (const :tag "Prompt for a machine/host value" prompt) + (const :tag "Session ID, if set, otherwise server" t) (string :tag "Literal value to use for :host"))) (defcustom erc-warn-about-blank-lines t @@ -3378,10 +3379,11 @@ 'erc-cmd-H (defun erc--auth-source-determine-params () "Return a plist of default args to pass to `auth-source-search'. -Favor a discovered network name over an announced server unless -`erc--buffer-target' is a local channel. Consider the dialed server -address as a fallback for the announced name in both cases." - (let* ((net (and-let* ((net (erc-network))) (symbol-name net))) +Favor a session ID over an announced server unless `erc--buffer-target' +is a local channel. Treat the dialed server address as a fallback for +the announced name in both cases." + (let* ((net (and-let* ((esid (erc--sid-symbol erc--session)) + ((symbol-name esid))))) (localp (and erc--buffer-target (erc--target-local-p erc--buffer-target))) (hosts (if localp diff --git a/test/lisp/erc/erc-services-tests.el b/test/lisp/erc/erc-services-tests.el index c646b1c69d..f1c9dca196 100644 --- a/test/lisp/erc/erc-services-tests.el +++ b/test/lisp/erc/erc-services-tests.el @@ -38,6 +38,8 @@ erc-nickserv-get-password (erc-session-server "irc.gnu.org") (erc-server-announced-name "west.gnu.org") (erc-network 'FSF.chat) + (erc-server-current-nick "tester") + (erc--session (erc--sid-create nil)) (erc-session-port 6697)) (ert-info ("Lookup custom option") @@ -47,7 +49,11 @@ erc-nickserv-get-password (ert-info ("Auth source") (ert-info ("Network") - (should (string= (erc-nickserv-get-password "bob") "sesame")))) + (should (string= (erc-nickserv-get-password "bob") "sesame"))) + + (ert-info ("Session ID") + (let ((erc--session (erc--sid-create 'GNU/chat))) + (should (string= (erc-nickserv-get-password "bob") "spam"))))) (delete-file netrc-file)) diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el index a337195898..8b9e2f53eb 100644 --- a/test/lisp/erc/erc-tests.el +++ b/test/lisp/erc/erc-tests.el @@ -257,11 +257,23 @@ erc--auth-source-search--standard (ert-info ("Normal ordering") - (ert-info ("Network wins") + (ert-info ("Session wins") (let ((erc-session-server "irc.gnu.org") (erc-server-announced-name "west.gnu.org") (erc-session-port 6697) - (erc-network 'GNU.chat)) + (erc-network 'fake) + (erc-server-current-nick "tester") + (erc--session (erc--sid-create 'GNU.chat))) + (should (string= (erc--auth-source-search :user "#chan") + "foo")))) + + (ert-info ("Network wins") + (let* ((erc-session-server "irc.gnu.org") + (erc-server-announced-name "west.gnu.org") + (erc-session-port 6697) + (erc-network 'GNU.chat) + (erc-server-current-nick "tester") + (erc--session (erc--sid-create nil))) (should (string= (erc--auth-source-search :user "#chan") "foo")))) @@ -269,7 +281,8 @@ erc--auth-source-search--standard (let ((erc-session-server "irc.gnu.org") (erc-server-announced-name "west.gnu.org") (erc-session-port 6697) - erc-network) + erc-network + (erc--session (erc--sid-create nil))) (should (string= (erc--auth-source-search :user "#chan") "baz"))))) @@ -290,23 +303,29 @@ erc--auth-source-search--announced (ert-info ("Announced prioritized") (ert-info ("Announced wins") - (let ((erc-session-server "irc.gnu.org") - (erc-server-announced-name "west.gnu.org") - (erc-session-port 6697) - (erc-network 'GNU.chat)) + (let* ((erc-session-server "irc.gnu.org") + (erc-server-announced-name "west.gnu.org") + (erc-session-port 6697) + (erc-network 'GNU.chat) + (erc-server-current-nick "tester") + (erc--session (erc--sid-create nil))) (should (string= (erc--auth-source-search :user "#chan") "baz")))) (ert-info ("Peer next") - (let ((erc-server-announced-name "irc.gnu.org") - (erc-session-port 6697) - (erc-network 'GNU.chat)) + (let* ((erc-server-announced-name "irc.gnu.org") + (erc-session-port 6697) + (erc-network 'GNU.chat) + (erc-server-current-nick "tester") + (erc--session (erc--sid-create nil))) (should (string= (erc--auth-source-search :user "#chan") "bar")))) (ert-info ("Network used as fallback") - (let ((erc-session-port 6697) - (erc-network 'GNU.chat)) + (let* ((erc-session-port 6697) + (erc-network 'GNU.chat) + (erc-server-current-nick "tester") + (erc--session (erc--sid-create nil))) (should (string= (erc--auth-source-search :user "#chan") "foo"))))) @@ -328,6 +347,8 @@ erc--auth-source-search--overrides (erc-session-server "irc.gnu.org") (erc-server-announced-name "west.gnu.org") (erc-network 'GNU.chat) + (erc-server-current-nick "tester") + (erc--session (erc--sid-create nil)) (erc-session-port 6667)) (unwind-protect -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0021-SQUASH-ME-Add-ERC-test-scenarios-involving-auth-sour.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Wed, 29 Sep 2021 01:30:16 -0700 Subject: [PATCH 21/28] SQUASH-ME: Add ERC test scenarios involving auth-source XXX this should be combined with the commit entitled "Make auth-source searches session-ID aware in ERC". It was split off for the sake of flexibility during code review. * test/lisp/erc/erc-scenarios.el: Add session-aware scenarios involving the auth-source queries. See bug#48598 for background. --- .../base/auth-source/foonet.lispdata | 23 +++ .../base/auth-source/nopass.lispdata | 22 +++ .../services/auth-source/libera.lispdata | 49 +++++++ test/lisp/erc/erc-scenarios.el | 135 ++++++++++++++++++ 4 files changed, 229 insertions(+) create mode 100644 test/lisp/erc/erc-scenarios-resources/base/auth-source/foonet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/auth-source/nopass.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/services/auth-source/libera.lispdata diff --git a/test/lisp/erc/erc-scenarios-resources/base/auth-source/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/auth-source/foonet.lispdata new file mode 100644 index 0000000000..1fe772c7e2 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/auth-source/foonet.lispdata @@ -0,0 +1,23 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Tue, 04 May 2021 05:06:18 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=FooNet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 253 tester 0 :unregistered connections") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + (0 ":irc.foonet.org 221 tester +i") + (0 ":irc.foonet.org NOTICE tester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) diff --git a/test/lisp/erc/erc-scenarios-resources/base/auth-source/nopass.lispdata b/test/lisp/erc/erc-scenarios-resources/base/auth-source/nopass.lispdata new file mode 100644 index 0000000000..3fdb4ecf7b --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/auth-source/nopass.lispdata @@ -0,0 +1,22 @@ +;; -*- mode: lisp-data; -*- +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Tue, 04 May 2021 05:06:18 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=FooNet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 253 tester 0 :unregistered connections") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + (0 ":irc.foonet.org 221 tester +i") + (0 ":irc.foonet.org NOTICE tester :This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) diff --git a/test/lisp/erc/erc-scenarios-resources/services/auth-source/libera.lispdata b/test/lisp/erc/erc-scenarios-resources/services/auth-source/libera.lispdata new file mode 100644 index 0000000000..c8dbc9d425 --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/services/auth-source/libera.lispdata @@ -0,0 +1,49 @@ +;; -*- mode: lisp-data; -*- +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0.26 ":zirconium.libera.chat NOTICE * :*** Checking Ident") + (0.01 ":zirconium.libera.chat NOTICE * :*** Looking up your hostname...") + (0.01 ":zirconium.libera.chat NOTICE * :*** No Ident response") + (0.02 ":zirconium.libera.chat NOTICE * :*** Found your hostname: static-198-54-131-100.cust.tzulo.com") + (0.02 ":zirconium.libera.chat 001 tester :Welcome to the Libera.Chat Internet Relay Chat Network tester") + (0.01 ":zirconium.libera.chat 002 tester :Your host is zirconium.libera.chat[46.16.175.175/6697], running version solanum-1.0-dev") + (0.03 ":zirconium.libera.chat 003 tester :This server was created Wed Jun 9 2021 at 01:38:28 UTC") + (0.02 ":zirconium.libera.chat 004 tester zirconium.libera.chat solanum-1.0-dev DGQRSZaghilopsuwz CFILMPQSbcefgijklmnopqrstuvz bkloveqjfI") + (0.00 ":zirconium.libera.chat 005 tester ETRACE WHOX FNC MONITOR=100 SAFELIST ELIST=CTU CALLERID=g KNOCK CHANTYPES=# EXCEPTS INVEX CHANMODES=eIbq,k,flj,CFLMPQScgimnprstuz :are supported by this server") + (0.03 ":zirconium.libera.chat 005 tester CHANLIMIT=#:250 PREFIX=(ov)@+ MAXLIST=bqeI:100 MODES=4 NETWORK=Libera.Chat STATUSMSG=@+ CASEMAPPING=rfc1459 NICKLEN=16 MAXNICKLEN=16 CHANNELLEN=50 TOPICLEN=390 DEAF=D :are supported by this server") + (0.02 ":zirconium.libera.chat 005 tester TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,PRIVMSG:4,NOTICE:4,ACCEPT:,MONITOR: EXTBAN=$,ajrxz CLIENTVER=3.0 :are supported by this server") + (0.02 ":zirconium.libera.chat 251 tester :There are 68 users and 37640 invisible on 25 servers") + (0.00 ":zirconium.libera.chat 252 tester 36 :IRC Operators online") + (0.01 ":zirconium.libera.chat 253 tester 5 :unknown connection(s)") + (0.00 ":zirconium.libera.chat 254 tester 19341 :channels formed") + (0.01 ":zirconium.libera.chat 255 tester :I have 3321 clients and 1 servers") + (0.01 ":zirconium.libera.chat 265 tester 3321 4289 :Current local users 3321, max 4289") + (0.00 ":zirconium.libera.chat 266 tester 37708 38929 :Current global users 37708, max 38929") + (0.01 ":zirconium.libera.chat 250 tester :Highest connection count: 4290 (4289 clients) (38580 connections received)") + (0.21 ":zirconium.libera.chat 375 tester :- zirconium.libera.chat Message of the Day - ") + (0.00 ":zirconium.libera.chat 372 tester :- This server provided by Seeweb ") + (0.01 ":zirconium.libera.chat 372 tester :- Welcome to Libera Chat, the IRC network for") + (0.01 ":zirconium.libera.chat 372 tester :- free & open-source software and peer directed projects.") + (0.00 ":zirconium.libera.chat 372 tester :- ") + (0.00 ":zirconium.libera.chat 372 tester :- Use of Libera Chat is governed by our network policies.") + (0.00 ":zirconium.libera.chat 372 tester :- ") + (0.01 ":zirconium.libera.chat 372 tester :- Please visit us in #libera for questions and support.") + (0.01 ":zirconium.libera.chat 372 tester :- ") + (0.01 ":zirconium.libera.chat 372 tester :- Website and documentation: https://libera.chat") + (0.01 ":zirconium.libera.chat 372 tester :- Webchat: https://web.libera.chat") + (0.01 ":zirconium.libera.chat 372 tester :- Network policies: https://libera.chat/policies") + (0.01 ":zirconium.libera.chat 372 tester :- Email: support@libera.chat") + (0.00 ":zirconium.libera.chat 376 tester :End of /MOTD command.")) + +((mode-user 1.2 "MODE tester +i") + (0.02 ":tester MODE tester :+Zi") + (0.02 ":NickServ!NickServ@services.libera.chat NOTICE tester :This nickname is registered. Please choose a different nickname, or identify via \2/msg NickServ IDENTIFY tester \2")) + +((privmsg 2 "PRIVMSG NickServ :IDENTIFY changeme") + (0.96 ":NickServ!NickServ@services.libera.chat NOTICE tester :You are now identified for \2tester\2.") + (0.25 ":NickServ!NickServ@services.libera.chat NOTICE tester :Last login from: \2~tester@school.edu/tester\2 on Jun 18 01:15:56 2021 +0000.")) + +((quit 5 "QUIT :\2ERC\2") + (0.19 ":tester!~user@static-198-54-131-100.cust.tzulo.com QUIT :Client Quit")) + +((linger 1 LINGER)) diff --git a/test/lisp/erc/erc-scenarios.el b/test/lisp/erc/erc-scenarios.el index 1d2f988338..5a74a266b8 100644 --- a/test/lisp/erc/erc-scenarios.el +++ b/test/lisp/erc/erc-scenarios.el @@ -1759,6 +1759,141 @@ erc-scenarios-base-legacy-autojoin (erc-d-t-wait-for 6 "#chan exists" (get-buffer "#chan")) (erc-d-t-search-for 10 "Live, and be prosperous"))))) +;; Auth source consulted for initial PASS arg. Option +;; `erc-connect-auth-source-host' obeyed. + +(defun erc-scenarios-common--auth-source (id dialog &rest rest) + (push "machine GNU.chat port %d user \"#chan\" password spam" rest) + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "base/auth-source") + (dumb-server (erc-d-run "localhost" t dialog)) + (port (process-contact dumb-server :service)) + (ents `(,@(mapcar (lambda (fmt) (format fmt port)) rest) + "machine MyHost port irc password 123")) + (netrc-file (make-temp-file "auth-source-test" nil nil + (string-join ents "\n"))) + (auth-sources (list netrc-file)) + (auth-source-do-cache nil) + (erc-scenarios-common-extra-teardown (lambda () + (delete-file netrc-file))) + (dumb-server-buffer (get-buffer "*erc-d-server*"))) + + (ert-info ("Connect") + (with-current-buffer (erc :server "127.0.0.1" + :port port + :nick "tester" + :full-name "tester" + :id id) + (should (string= (buffer-name) (if id + (symbol-name id) + (format "127.0.0.1:%d" port)))) + (erc-d-t-wait-for 1 "Network determined" (eq erc-network 'FooNet)))))) + +(ert-deftest erc-scenarios-base-auth-source--dialed () + (should (eq erc-connect-auth-source-host 'server)) + (erc-scenarios-common--auth-source + nil 'foonet + "machine GNU.chat port %d user tester password fake" + "machine 127.0.0.1 port %d user tester password changeme" + "machine 127.0.0.1 port %d user imposter password fake")) + +(ert-deftest erc-scenarios-base-auth-source--dialed-fallback () + (let ((erc-connect-auth-source-host t)) + (erc-scenarios-common--auth-source + nil 'foonet + "machine FooNet port %d user tester password fake" + "machine 127.0.0.1 port %d user tester password changeme" + "machine 127.0.0.1 port %d user imposter password fake"))) + +(ert-deftest erc-scenarios-base-auth-source--session-id () + (let ((erc-connect-auth-source-host t)) + (erc-scenarios-common--auth-source + 'MySession 'foonet + "machine MySession port %d user tester password changeme" + "machine 127.0.0.1 port %d user tester password fake" + "machine FooNet port %d user tester password fake"))) + +(ert-deftest erc-scenarios-base-auth-source--string--session-id () + (let ((erc-connect-auth-source-host "MyHost")) + (erc-scenarios-common--auth-source + 'MySession 'foonet + "machine 127.0.0.1 port %d user tester password fake" + "machine MyHost port %d user tester password changeme" + "machine MySession port %d user tester password fake"))) + +(ert-deftest erc-scenarios-base-auth-source--nopass () + (let (erc-connect-auth-source-host) ; nil + (erc-scenarios-common--auth-source nil 'nopass))) + +(ert-deftest erc-scenarios-base-auth-source--nopass--session-id () + (let (erc-connect-auth-source-host) ; nil + (erc-scenarios-common--auth-source 'MySession 'nopass))) + +;; Identify via auth source with no initial password + +(defun erc-scenarios-common--services-auth-source (&rest rest) + (defvar erc-use-auth-source-for-nickserv-password) + (erc-scenarios-common-with-cleanup + ((erc-scenarios-common-dialog "services/auth-source") + (erc-server-flood-penalty 0.1) + (dumb-server (erc-d-run "localhost" t 'libera)) + (port (process-contact dumb-server :service)) + (ents `(,@(mapcar (lambda (fmt) (format fmt port)) rest) + "machine MyHost port irc password 123")) + (netrc-file (make-temp-file "auth-source-test" nil nil + (string-join ents "\n"))) + (auth-sources (list netrc-file)) + (auth-source-do-cache nil) + (erc-modules (cons 'services erc-modules)) + (erc-use-auth-source-for-nickserv-password t) ; do consult for NickServ + (expect (erc-d-t-make-expecter)) + (erc-scenarios-common-extra-teardown (lambda () + (delete-file netrc-file))) + (dumb-server-buffer (get-buffer "*erc-d-server*"))) + + (cl-letf (((symbol-function 'read-passwd) + (lambda (&rest _) (error "Unexpected read-passwd call")))) + (ert-info ("Connect without password") + (with-current-buffer (erc :server "127.0.0.1" + :port port + :nick "tester" + :full-name "tester") + (should (string= (buffer-name) (format "127.0.0.1:%d" port))) + (erc-d-t-wait-for 3 "Network determined" + (eq erc-network 'Libera.Chat)) + (funcall expect 3 "This nickname is registered.") + (funcall expect 3 "You are now identified") + (funcall expect 3 "Last login from") + (erc-cmd-QUIT "")))) + + (erc-services-mode -1) + + (should-not (memq 'services erc-modules)))) + +(ert-deftest erc-scenarios-services-auth-source--network () + (let (erc-connect-auth-source-host) ; don't consult auth-source for PASS + (erc-scenarios-common--services-auth-source + "machine 127.0.0.1 port %d user tester password spam" + "machine zirconium.libera.chat port %d user tester password fake" + "machine Libera.Chat port %d user tester password changeme"))) + +(ert-deftest erc-scenarios-services-auth-source--network-connect-lookup () + (should (eq erc-connect-auth-source-host 'server)) + (erc-scenarios-common--services-auth-source + "machine zirconium.libera.chat port %d user tester password fake" + "machine Libera.Chat port %d user tester password changeme")) + +(ert-deftest erc-scenarios-services-auth-source--announced () + (let (erc-connect-auth-source-host) ; don't consult auth-source for PASS + (erc-scenarios-common--services-auth-source + "machine 127.0.0.1 port %d user tester password spam" + "machine zirconium.libera.chat port %d user tester password changeme"))) + +(ert-deftest erc-scenarios-services-auth-source--dialed () + (let (erc-connect-auth-source-host) ; don't consult auth-source for PASS + (erc-scenarios-common--services-auth-source + "machine 127.0.0.1 port %d user tester password changeme"))) + (ert-deftest erc-scenarios-services-password () (defvar erc-nickserv-passwords) -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0022-SQUASH-ME-Add-ERC-test-scenario-for-erc-cmd-JOIN.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Thu, 30 Sep 2021 06:29:24 -0700 Subject: [PATCH 22/28] SQUASH-ME: Add ERC test scenario for erc-cmd-JOIN DELETE THIS NOTE: This scenario belongs here because it indirectly asserts that the changes to erc-cmd-JOIN work as intended. See note atop the `ert-deftest' and helper. The assertion involving the presence of an entry for the current user in a defunct channel buffer has to do with trying to shift to a cleaner means of checking whether a channel buffer is subscribed to (whether it's JOINed or PARTed). The old means of checking, basically seeing whether `erc-default-target' is non-nil, depends on `erc-default-recipients', whose purpose has never been well defined. --- .../channel-buffers/barnet.lispdata | 68 +++++++++++ .../channel-buffers/foonet.lispdata | 66 +++++++++++ test/lisp/erc/erc-scenarios.el | 109 ++++++++++++++++++ 3 files changed, 243 insertions(+) create mode 100644 test/lisp/erc/erc-scenarios-resources/base/reuse-buffers/channel-buffers/barnet.lispdata create mode 100644 test/lisp/erc/erc-scenarios-resources/base/reuse-buffers/channel-buffers/foonet.lispdata diff --git a/test/lisp/erc/erc-scenarios-resources/base/reuse-buffers/channel-buffers/barnet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/reuse-buffers/channel-buffers/barnet.lispdata new file mode 100644 index 0000000000..c90c399aed --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/reuse-buffers/channel-buffers/barnet.lispdata @@ -0,0 +1,68 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :barnet:changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") + (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.barnet.org 003 tester :This server was created Wed, 05 May 2021 09:05:33 UTC") + (0 ":irc.barnet.org 004 tester irc.barnet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.barnet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.barnet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=barnet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.barnet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.barnet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.barnet.org 252 tester 0 :IRC Operators online") + (0 ":irc.barnet.org 254 tester 1 :channels formed") + (0 ":irc.barnet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.barnet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.barnet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.barnet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + ;; No mode answer + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":tester!~u@wvys46tx8tpmk.irc JOIN #chan") + (0 ":irc.barnet.org 353 tester = #chan :joe @mike tester") + (0 ":irc.barnet.org 366 tester #chan :End of /NAMES list.") + (0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") + (0 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:16] joe: Tush! none but minstrels like of sonneting.") + (0 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:19] mike: Prithee, nuncle, be contented; 'tis a naughty night to swim in. Now a little fire in a wide field were like an old lecher's heart; a small spark, all the rest on's body cold. Look! here comes a walking fire.") + (0 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:22] joe: My name is Edgar, and thy father's son.") + (0 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:26] mike: Good my lord, be good to me; your honour is accounted a merciful man; good my lord.") + (0 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:31] joe: Thy child shall live, and I will see it nourish'd.") + (0 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :[09:09:33] mike: Quick, quick; fear nothing; I'll be at thy elbow.") + (0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.") + (0 ":irc.barnet.org NOTICE tester :[09:05:35] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":irc.barnet.org 305 tester :You are no longer marked as being away")) + +((mode 1 "MODE #chan") + (0 ":irc.barnet.org 324 tester #chan +nt") + (0 ":irc.barnet.org 329 tester #chan 1620205534") + (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: That will be given to the loudest noise we make.") + (0.1 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: If it please your honour, I am the poor duke's constable, and my name is Elbow: I do lean upon justice, sir; and do bring in here before your good honour two notorious benefactors.") + (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: Following the signs, woo'd but the sign of she.") + (0.5 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: That, sir, which I will not report after her.") + (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: Boyet, prepare: I will away to-night.") + (0.1 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: If the man be a bachelor, sir, I can; but if he be a married man, he is his wife's head, and I can never cut off a woman's head.") + (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: Thyself upon thy virtues, they on thee.") + (0.1 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: Arm it in rags, a pigmy's straw doth pierce it.")) + +((part 5.1 "PART #chan :" quit) + (0 ":tester!~u@wvys46tx8tpmk.irc PART #chan :" quit)) + +((join 10.1 "JOIN #chan") + (0 ":tester!~u@wvys46tx8tpmk.irc JOIN #chan") + (0 ":irc.barnet.org 353 tester = #chan :@mike joe tester") + (0 ":irc.barnet.org 366 tester #chan :End of NAMES list") + (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :tester, welcome!") + (0 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :tester, welcome!")) + +((mode 1 "MODE #chan") + (0 ":irc.barnet.org 324 tester #chan +nt") + (0 ":irc.barnet.org 329 tester #chan 1620205534") + (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: Chi non te vede, non te pretia.") + (0.1 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: Well, if ever thou dost fall from this faith, thou wilt prove a notable argument.") + (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: Of heavenly oaths, vow'd with integrity.") + (0.1 ":joe!~u@wvys46tx8tpmk.irc PRIVMSG #chan :mike: These herblets shall, which we upon you strew.") + (0.1 ":mike!~u@wvys46tx8tpmk.irc PRIVMSG #chan :joe: Aaron will have his soul black like his face.")) + +((linger 0.5 LINGER)) diff --git a/test/lisp/erc/erc-scenarios-resources/base/reuse-buffers/channel-buffers/foonet.lispdata b/test/lisp/erc/erc-scenarios-resources/base/reuse-buffers/channel-buffers/foonet.lispdata new file mode 100644 index 0000000000..648321875b --- /dev/null +++ b/test/lisp/erc/erc-scenarios-resources/base/reuse-buffers/channel-buffers/foonet.lispdata @@ -0,0 +1,66 @@ +;; -*- mode: lisp-data; -*- +((pass 1 "PASS :foonet:changeme")) +((nick 1 "NICK tester")) +((user 1 "USER user 0 * :tester") + (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") + (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") + (0 ":irc.foonet.org 003 tester :This server was created Wed, 05 May 2021 09:05:34 UTC") + (0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv") + (0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server") + (0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=foonet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server") + (0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server") + (0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)") + (0 ":irc.foonet.org 252 tester 0 :IRC Operators online") + (0 ":irc.foonet.org 254 tester 1 :channels formed") + (0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers") + (0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3") + (0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3") + (0 ":irc.foonet.org 422 tester :MOTD File is missing")) + +((mode-user 1.2 "MODE tester +i") + ;; No mode answer + (0 ":irc.znc.in 306 tester :You have been marked as being away") + (0 ":tester!~u@247eaxkrufj44.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :alice @bob tester") + (0 ":irc.foonet.org 366 tester #chan :End of /NAMES list.") + (0 ":***!znc@znc.in PRIVMSG #chan :Buffer Playback...") + (0 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :[09:07:19] bob: Is this; she hath bought the name of whore thus dearly.") + (0 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :[09:07:24] alice: He sent to me, sir,Here he comes.") + (0 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :[09:07:26] bob: Till I torment thee for this injury.") + (0 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :[09:07:29] alice: There's an Italian come; and 'tis thought, one of Leonatus' friends.") + (0 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :[09:09:33] bob: Ay, and the particular confirmations, point from point, to the full arming of the verity.") + (0 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :[09:09:35] alice: Kneel in the streets and beg for grace in vain.") + (0 ":***!znc@znc.in PRIVMSG #chan :Playback Complete.") + (0 ":irc.foonet.org NOTICE tester :[09:06:05] This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.") + (0 ":irc.foonet.org 305 tester :You are no longer marked as being away")) + +((mode 1 "MODE #chan") + (0 ":irc.foonet.org 324 tester #chan +nt") + (0 ":irc.foonet.org 329 tester #chan 1620205534") + (0.5 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :alice: Nor I no strength to climb without thy help.") + (0.1 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :bob: Nothing, but let him have thanks. Demand of him my condition, and what credit I have with the duke.") + (0.1 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :alice: Show me this piece. I am joyful of your sights.") + (0.2 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :bob: Whilst I can shake my sword or hear the drum.")) + +((part 5 "PART #chan :" quit) + (0 ":tester!~u@247eaxkrufj44.irc PART #chan :" quit)) + +((join 10 "JOIN #chan") + (0 ":tester!~u@247eaxkrufj44.irc JOIN #chan") + (0 ":irc.foonet.org 353 tester = #chan :@bob alice tester") + (0 ":irc.foonet.org 366 tester #chan :End of NAMES list") + (0.1 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :tester, welcome!") + (0 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :tester, welcome!")) + +((mode 1 "MODE #chan") + (0 ":irc.foonet.org 324 tester #chan +nt") + (0 ":irc.foonet.org 329 tester #chan 1620205534") + (0.1 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :alice: Thou desirest me to stop in my tale against the hair.") + (0.1 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :bob: And dar'st not stand, nor look me in the face.") + (0.1 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :alice: It should not be, by the persuasion of his new feasting.") + (0.1 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :bob: It was not given me, nor I did not buy it.") + (0.1 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :alice: He that would vouch it in any place but here.") + (0.1 ":alice!~u@yppdd5tt4admc.irc PRIVMSG #chan :bob: In everything I wait upon his will.") + (0.1 ":bob!~u@yppdd5tt4admc.irc PRIVMSG #chan :alice: Thou counterfeit'st most lively.")) + +((linger 8 LINGER)) diff --git a/test/lisp/erc/erc-scenarios.el b/test/lisp/erc/erc-scenarios.el index 5a74a266b8..4199c38b8b 100644 --- a/test/lisp/erc/erc-scenarios.el +++ b/test/lisp/erc/erc-scenarios.el @@ -968,6 +968,115 @@ erc-scenarios-base-reuse-buffers-server-buffers--disabled erc-reuse-buffers) (erc-scenarios-common--base-reuse-buffers-server-buffers))) +;; This also asserts that `erc-cmd-JOIN' is no longer susceptible to a +;; regression introduced in 28.1 (ERC 5.4) that caused phantom target +;; buffers of the form target/server to be created via +;; `switch-to-buffer' ("phantom" because they would go unused"). This +;; would happen (in place of a JOIN being sent out) when a previously +;; used (parted) target buffer existed and `erc-reuse-buffers' was +;; nil. +;; +;; Note: All the `erc-get-channel-user' calls have to do with the fact +;; that `erc-default-target' relies on the less-than-well-defined +;; `erc-default-recipients' and is thus overloaded in the sense of +;; being used both for retrieving a target name and checking if +;; channel has been PARTed. While not ideal, `erc-get-channel-user' +;; can (also) be used to detect the latter. + +(defun erc-scenarios-common--base-reuse-buffers-channel-buffers () + "The option `erc-reuse-buffers' is still respected when nil. +Adapted from scenario clash-of-chans/uniquify described in Bug#48598: +28.0.50; buffer-naming collisions involving bouncers in ERC." + (let ((expect (erc-d-t-make-expecter)) + (server-process-bar (with-current-buffer "barnet" erc-server-process)) + (server-process-foo (with-current-buffer "foonet" erc-server-process))) + + (ert-info ("Unique #chan buffers exist") + (let ((chan-bufs (erc-scenarios-common-buflist "#chan")) + (names '("#chan@barnet" "#chan@foonet"))) + (should (member (buffer-name (pop chan-bufs)) names)) + (should (member (buffer-name (pop chan-bufs)) names)) + (should-not chan-bufs))) + + (ert-info ("#chan@foonet is exclusive and not contaminated") + (with-current-buffer "#chan@foonet" + (funcall expect 1 "") + (erc-d-t-search-for -0.1 "") + (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@barnet" + (funcall expect 1 "") + (erc-d-t-search-for -0.1 "") + (funcall expect 1 "the loudest noise") + (should (eq erc-server-process server-process-bar)))) + + (ert-info ("Part #chan@foonet") + (with-current-buffer "#chan@foonet" + (erc-d-t-search-for 1 "shake my sword") + (erc-cmd-PART "#chan") + (funcall expect 3 "You have left channel #chan") + (erc-cmd-JOIN "#chan"))) + + (ert-info ("Part #chan@barnet") + (with-current-buffer "#chan@barnet" + (funcall expect 3 "Arm it in rags") + (should (erc-get-channel-user (erc-current-nick))) + (erc-cmd-PART "#chan") + (funcall expect 3 "You have left channel #chan") + (should-not (erc-get-channel-user (erc-current-nick))) + (erc-cmd-JOIN "#chan"))) + + (erc-d-t-wait-for 3 "New unique target buffer for #chan@foonet created" + (get-buffer "#chan@foonet<2>")) + + (ert-info ("Activity continues in new, -suffixed #chan@foonet buffer") + (with-current-buffer "#chan@foonet" + (should-not (erc-get-channel-user (erc-current-nick)))) + (with-current-buffer "#chan@foonet<2>" + (should (erc-get-channel-user (erc-current-nick))) + (funcall expect 2 "You have joined channel #chan") + (funcall expect 2 "#chan was created on") + (funcall expect 2 "") + (should (eq erc-server-process server-process-foo)) + (erc-d-t-search-for -0.2 ""))) + + (erc-d-t-wait-for 3 "New unique target buffer for #chan@barnet created" + (get-buffer "#chan@barnet<2>")) + + (ert-info ("Activity continues in new, -suffixed #chan@barnet buffer") + (with-current-buffer "#chan@barnet" + (should-not (erc-get-channel-user (erc-current-nick)))) + (with-current-buffer "#chan@barnet<2>" + (funcall expect 2 "You have joined channel #chan") + (funcall expect 1 "Users on #chan: @mike joe tester") + (funcall expect 2 "") + (should (eq erc-server-process server-process-bar)) + (erc-d-t-search-for -0.2 ""))) + + (ert-info ("Two new chans created for a total of four") + (let* ((bufs (erc-scenarios-common-buflist "#chan")) + (names (sort (mapcar #'buffer-name bufs) #'string<))) + (should (equal names '("#chan@barnet" "#chan@barnet<2>" + "#chan@foonet" "#chan@foonet<2>"))))) + + (ert-info ("All output sent") + (with-current-buffer "#chan@foonet<2>" + (while (accept-process-output server-process-foo)) + (funcall expect 3 "most lively")) + (with-current-buffer "#chan@barnet<2>" + (while (accept-process-output server-process-bar)) + (funcall expect 3 "soul black"))))) + +(ert-deftest erc-scenarios-base-reuse-buffers-channel-buffers--disabled () + (should erc-reuse-buffers) + (let ((erc-scenarios-common-dialog "base/reuse-buffers/channel-buffers") + (erc-server-flood-penalty 0.1) + erc-reuse-buffers) + (erc-scenarios-common--base-reuse-buffers-server-buffers + #'erc-scenarios-common--base-reuse-buffers-channel-buffers))) + ;; The server changes your nick just after registration. (ert-deftest erc-scenarios-base-renick-self-auto () -- 2.31.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0023-Update-ERC-s-Info-doc-with-session-ID-related-change.patch >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Fri, 18 Jun 2021 04:25:44 -0700 Subject: [PATCH 23/28] Update ERC's Info doc with session-ID related changes * doc/misc/erc.texi: Update the erc and erc-tls entry-point sections with the new :id keyword parameter. Expand the auth-info related information in the passwords section. Remove all mention of the variable erc-rename-buffers, whose "on" behavior has been made permanent. --- doc/misc/erc.texi | 86 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 66 insertions(+), 20 deletions(-) diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index 3b8e231d3a..1eaf7f6c33 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi @@ -521,6 +521,7 @@ Connecting @item @var{nick} @item @var{password} @item @var{full-name} +@item @var{id} @end itemize That is, if called with the following arguments, @var{server} and @@ -531,8 +532,24 @@ Connecting @example (erc :server "irc.libera.chat" :full-name "J. Random Hacker") @end example + +The optional @var{id} param can be used to explicitly declare a +``session identifier'', which ERC will use to refer to the connection +when relating buffers to each other. This is meant for rare +situations in which ERC would otherwise have trouble discerning +between connections. One example would be to allow multiple +connections to the same network with the same nick but different +(non-standard) "device" identifiers, which some bouncers may support. +Another might be to mimic the experience of popular standalone +clients, which normally offer ``named'' persistent configurations with +server buffers reflecting those names. Yet another use case might +involve writing code that needs to identify a connection unequivocally +but in a human-friendly way that isn't dependent on meaningless +suffixes. + @end defun +@noindent To connect securely over an encrypted TLS connection, use @kbd{M-x erc-tls}. @@ -547,13 +564,14 @@ Connecting @item @var{password} @item @var{full-name} @item @var{client-certificate} +@item @var{id} @end itemize That is, if called with the following arguments, @var{server} and @var{full-name} will be set to those values, whereas @code{erc-compute-port} and @code{erc-compute-nick} will be invoked for the values of the other parameters, and @code{client-certificate} -will be @code{nil}. +will be @code{nil}. See @code{erc} for the meaning of @var{id}. @example (erc-tls :server "irc.libera.chat" :full-name "J. Random Hacker") @@ -697,22 +715,65 @@ Connecting @cindex password @defopt erc-prompt-for-password -If non-@code{nil} (the default), @kbd{M-x erc} prompts for a password. +If non-@code{nil} (the default), @kbd{M-x erc} prompts for a server +password. This only affects interactive invocations of @code{erc} and +@code{erc-tls}. @end defopt +@noindent If you prefer, you can set this option to @code{nil} and use the @code{auth-source} mechanism to store your password. For instance, if -you use @file{~/.authinfo} as your auth-source backend, then put +the option @code{auth-sources} contains @file{~/.authinfo}, put something like the following in that file: @example -machine irc.example.net login "#fsf" password sEcReT +machine irc.example.net login mynick password sEcReT +@end example + +@noindent +Here, @code{irc.example.net} corresponds to the @var{server} param +passed to @code{erc} or @code{erc-tls} or provideed at the ``IRC +server:'' prompt. Unfortunately, specifying a network, like +``Libera.Chat'', or a specific network server, like +@code{zirconium.libera.chat}, won't work for this introductory +exchange because IRC servers don't provide such information up front. + +If ERC can't find a suitable server password, it'll just skip the IRC +@code{PASS} command altogether, which users may want when using CertFP +or engaging NickServ via ERC's ``services'' module. If that sounds +like you, set the option @code{erc-connect-auth-source-host} to +@code{nil}. You can also set it to @code{t} to tell ERC to favor a +``session identifier'' (corresponding to the @var{id} parameter of +@code{erc-tls}) as the ``machine'' field and to fall back on +@var{server} when an @var{id} hasn't been provided. Note that some +networks and IRCds may support NickServ authentication via server +password when specified using the non-standard ``mynick:sEcReT'' +convention. + +Another entry in an @code{auth-source} file can be used to +authenticate to a nickname service (bot), often called ``NickServ''. +To tell ERC to do that, set the option +@code{erc-use-auth-source-for-nickserv-password} to @code{t}. For +these queries, entries featuring session IDs and networks are matched +first, followed by network-specific servers and dialed TCP endpoints +(the @var{SERVER} passed to @code{erc}). The following netrc-style +entries appear in order of precedence: + +@example +machine Libera/cellphone login "mynick" password sEcReT +machine Libera.Chat login "mynick" password sEcReT +machine zirconium.libera.chat login "mynick" password sEcReT +machine irc.libera.chat login "mynick" password sEcReT @end example @noindent ERC also consults @code{auth-source} to find any channel keys required for the channels that you wish to autojoin, as specified by the -variable @code{erc-autojoin-channels-alist}. +variable @code{erc-autojoin-channels-alist}. When modifying a +netrc-style @code{auth-source} file for such use, ensure an entry +exists with the channel name, for example ``#erc'', in the value of +the ``login'' field (also known as the ``user'' field). The actual key +goes in the ``password'' field. For more details, @pxref{Top,,auth-source, auth, Emacs auth-source Library}. @@ -801,12 +862,6 @@ Sample Configuration (setq erc-autojoin-channels-alist '(("Libera.Chat" "#emacs" "#erc"))) -;; Rename server buffers to reflect the current network name instead -;; of SERVER:PORT (e.g., "Libera.Chat" instead of -;; "irc.libera.chat:6667"). This is useful when using a bouncer like -;; ZNC where you have multiple connections to the same server. -(setq erc-rename-buffers t) - ;; Interpret mIRC-style color commands in IRC chats (setq erc-interpret-mirc-color t) @@ -865,15 +920,6 @@ Options nickname is considered a lurker. @end defopt -@defopt erc-rename-buffers -If non, @code{nil}, this will rename server buffers to reflect the -current network name instead of IP:PORT - -@example -(setq erc-rename-buffers t) -@end example -@end defopt - @node Getting Help and Reporting Bugs @chapter Getting Help and Reporting Bugs @cindex help, getting -- 2.31.1 --=-=-=--