2020-08-05 10:27:40 +02:00
|
|
|
;;; erc-tests.el --- Tests for erc. -*- lexical-binding:t -*-
|
|
|
|
|
|
2022-01-01 02:45:51 -05:00
|
|
|
;; Copyright (C) 2020-2022 Free Software Foundation, Inc.
|
2020-08-05 10:27:40 +02:00
|
|
|
|
|
|
|
|
;; Author: Lars Ingebrigtsen <larsi@gnus.org>
|
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
2022-03-13 22:39:36 -07:00
|
|
|
(require 'ert-x)
|
2020-08-05 10:27:40 +02:00
|
|
|
(require 'erc)
|
2021-02-27 05:35:40 +01:00
|
|
|
(require 'erc-ring)
|
2020-08-05 10:27:40 +02:00
|
|
|
|
|
|
|
|
(ert-deftest erc--read-time-period ()
|
|
|
|
|
(cl-letf (((symbol-function 'read-string) (lambda (&rest _) "")))
|
|
|
|
|
(should (equal (erc--read-time-period "foo: ") nil)))
|
|
|
|
|
|
|
|
|
|
(cl-letf (((symbol-function 'read-string) (lambda (&rest _) " ")))
|
|
|
|
|
(should (equal (erc--read-time-period "foo: ") nil)))
|
|
|
|
|
|
|
|
|
|
(cl-letf (((symbol-function 'read-string) (lambda (&rest _) " 432 ")))
|
|
|
|
|
(should (equal (erc--read-time-period "foo: ") 432)))
|
|
|
|
|
|
|
|
|
|
(cl-letf (((symbol-function 'read-string) (lambda (&rest _) "432")))
|
|
|
|
|
(should (equal (erc--read-time-period "foo: ") 432)))
|
|
|
|
|
|
|
|
|
|
(cl-letf (((symbol-function 'read-string) (lambda (&rest _) "1h")))
|
|
|
|
|
(should (equal (erc--read-time-period "foo: ") 3600)))
|
|
|
|
|
|
|
|
|
|
(cl-letf (((symbol-function 'read-string) (lambda (&rest _) "1h10s")))
|
|
|
|
|
(should (equal (erc--read-time-period "foo: ") 3610)))
|
|
|
|
|
|
|
|
|
|
(cl-letf (((symbol-function 'read-string) (lambda (&rest _) "1d")))
|
|
|
|
|
(should (equal (erc--read-time-period "foo: ") 86400))))
|
2021-02-27 05:35:40 +01:00
|
|
|
|
2021-09-16 15:25:18 +02:00
|
|
|
(ert-deftest erc-with-all-buffers-of-server ()
|
|
|
|
|
(let (proc-exnet
|
|
|
|
|
proc-onet
|
|
|
|
|
erc-kill-channel-hook erc-kill-server-hook erc-kill-buffer-hook)
|
|
|
|
|
|
|
|
|
|
(with-current-buffer (get-buffer-create "OtherNet")
|
|
|
|
|
(erc-mode)
|
|
|
|
|
(setq proc-onet (start-process "sleep" (current-buffer) "sleep" "1")
|
|
|
|
|
erc-server-process proc-onet
|
|
|
|
|
erc-network 'OtherNet)
|
|
|
|
|
(set-process-query-on-exit-flag erc-server-process nil))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer (get-buffer-create "ExampleNet")
|
|
|
|
|
(erc-mode)
|
|
|
|
|
(setq proc-exnet (start-process "sleep" (current-buffer) "sleep" "1")
|
|
|
|
|
erc-server-process proc-exnet
|
|
|
|
|
erc-network 'ExampleNet)
|
|
|
|
|
(set-process-query-on-exit-flag erc-server-process nil))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer (get-buffer-create "#foo")
|
|
|
|
|
(erc-mode)
|
|
|
|
|
(setq erc-server-process proc-exnet)
|
|
|
|
|
(setq erc-default-recipients '("#foo")))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer (get-buffer-create "#spam")
|
|
|
|
|
(erc-mode)
|
|
|
|
|
(setq erc-server-process proc-onet)
|
|
|
|
|
(setq erc-default-recipients '("#spam")))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer (get-buffer-create "#bar")
|
|
|
|
|
(erc-mode)
|
|
|
|
|
(setq erc-server-process proc-onet)
|
|
|
|
|
(setq erc-default-recipients '("#bar")))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer (get-buffer-create "#baz")
|
|
|
|
|
(erc-mode)
|
|
|
|
|
(setq erc-server-process proc-exnet)
|
|
|
|
|
(setq erc-default-recipients '("#baz")))
|
|
|
|
|
|
|
|
|
|
(should (eq (get-buffer-process "ExampleNet") proc-exnet))
|
|
|
|
|
(erc-with-all-buffers-of-server (get-buffer-process "ExampleNet")
|
|
|
|
|
nil
|
|
|
|
|
(kill-buffer))
|
|
|
|
|
|
|
|
|
|
(should-not (get-buffer "ExampleNet"))
|
|
|
|
|
(should-not (get-buffer "#foo"))
|
|
|
|
|
(should-not (get-buffer "#baz"))
|
|
|
|
|
(should (get-buffer "OtherNet"))
|
|
|
|
|
(should (get-buffer "#bar"))
|
|
|
|
|
(should (get-buffer "#spam"))
|
|
|
|
|
|
|
|
|
|
(let* ((test (lambda () (not (string= (buffer-name) "#spam"))))
|
|
|
|
|
(calls 0)
|
|
|
|
|
(get-test (lambda () (cl-incf calls) test)))
|
|
|
|
|
|
|
|
|
|
(erc-with-all-buffers-of-server proc-onet
|
|
|
|
|
(funcall get-test)
|
|
|
|
|
(kill-buffer))
|
|
|
|
|
|
|
|
|
|
(should (= calls 1)))
|
|
|
|
|
|
|
|
|
|
(should-not (get-buffer "OtherNet"))
|
|
|
|
|
(should-not (get-buffer "#bar"))
|
|
|
|
|
(should (get-buffer "#spam"))
|
|
|
|
|
(kill-buffer "#spam")))
|
|
|
|
|
|
2022-04-05 17:45:00 -07:00
|
|
|
(defun erc-tests--send-prep ()
|
|
|
|
|
;; Caller should probably shadow `erc-insert-modify-hook' or
|
|
|
|
|
;; populate user tables for erc-button.
|
|
|
|
|
(erc-mode)
|
|
|
|
|
(insert "\n\n")
|
|
|
|
|
(setq erc-input-marker (make-marker)
|
|
|
|
|
erc-insert-marker (make-marker))
|
|
|
|
|
(set-marker erc-insert-marker (point-max))
|
|
|
|
|
(erc-display-prompt)
|
|
|
|
|
(should (= (point) erc-input-marker)))
|
|
|
|
|
|
|
|
|
|
(defun erc-tests--set-fake-server-process (&rest args)
|
|
|
|
|
(setq erc-server-process
|
|
|
|
|
(apply #'start-process (car args) (current-buffer) args))
|
|
|
|
|
(set-process-query-on-exit-flag erc-server-process nil))
|
|
|
|
|
|
|
|
|
|
(ert-deftest erc-hide-prompt ()
|
|
|
|
|
(let (erc-kill-channel-hook erc-kill-server-hook erc-kill-buffer-hook)
|
|
|
|
|
|
|
|
|
|
(with-current-buffer (get-buffer-create "ServNet")
|
|
|
|
|
(erc-tests--send-prep)
|
|
|
|
|
(goto-char erc-insert-marker)
|
|
|
|
|
(should (looking-at-p (regexp-quote erc-prompt)))
|
|
|
|
|
(erc-tests--set-fake-server-process "sleep" "1")
|
|
|
|
|
(set-process-sentinel erc-server-process #'ignore)
|
|
|
|
|
(setq erc-network 'ServNet)
|
|
|
|
|
(set-process-query-on-exit-flag erc-server-process nil))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer (get-buffer-create "#chan")
|
|
|
|
|
(erc-tests--send-prep)
|
|
|
|
|
(goto-char erc-insert-marker)
|
|
|
|
|
(should (looking-at-p (regexp-quote erc-prompt)))
|
|
|
|
|
(setq erc-server-process (buffer-local-value 'erc-server-process
|
|
|
|
|
(get-buffer "ServNet"))
|
|
|
|
|
erc-default-recipients '("#chan")))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer (get-buffer-create "bob")
|
|
|
|
|
(erc-tests--send-prep)
|
|
|
|
|
(goto-char erc-insert-marker)
|
|
|
|
|
(should (looking-at-p (regexp-quote erc-prompt)))
|
|
|
|
|
(setq erc-server-process (buffer-local-value 'erc-server-process
|
|
|
|
|
(get-buffer "ServNet"))
|
|
|
|
|
erc-default-recipients '("bob")))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Value: t (default)")
|
|
|
|
|
(should (eq erc-hide-prompt t))
|
|
|
|
|
(with-current-buffer "ServNet"
|
|
|
|
|
(should (= (point) erc-insert-marker))
|
|
|
|
|
(erc--hide-prompt erc-server-process)
|
|
|
|
|
(should (string= ">" (get-text-property (point) 'display))))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer "#chan"
|
|
|
|
|
(goto-char erc-insert-marker)
|
|
|
|
|
(should (string= ">" (get-text-property (point) 'display)))
|
|
|
|
|
(should (memq #'erc--unhide-prompt-on-self-insert pre-command-hook))
|
|
|
|
|
(goto-char erc-input-marker)
|
|
|
|
|
(ert-simulate-command '(self-insert-command 1 ?/))
|
|
|
|
|
(goto-char erc-insert-marker)
|
|
|
|
|
(should-not (get-text-property (point) 'display))
|
|
|
|
|
(should-not (memq #'erc--unhide-prompt-on-self-insert
|
|
|
|
|
pre-command-hook)))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer "bob"
|
|
|
|
|
(goto-char erc-insert-marker)
|
|
|
|
|
(should (string= ">" (get-text-property (point) 'display)))
|
|
|
|
|
(should (memq #'erc--unhide-prompt-on-self-insert pre-command-hook))
|
|
|
|
|
(goto-char erc-input-marker)
|
|
|
|
|
(ert-simulate-command '(self-insert-command 1 ?/))
|
|
|
|
|
(goto-char erc-insert-marker)
|
|
|
|
|
(should-not (get-text-property (point) 'display))
|
|
|
|
|
(should-not (memq #'erc--unhide-prompt-on-self-insert
|
|
|
|
|
pre-command-hook)))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer "ServNet"
|
|
|
|
|
(should (get-text-property erc-insert-marker 'display))
|
|
|
|
|
(should (memq #'erc--unhide-prompt-on-self-insert pre-command-hook))
|
|
|
|
|
(erc--unhide-prompt)
|
|
|
|
|
(should-not (memq #'erc--unhide-prompt-on-self-insert
|
|
|
|
|
pre-command-hook))
|
|
|
|
|
(should-not (get-text-property erc-insert-marker 'display))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Value: server")
|
|
|
|
|
(setq erc-hide-prompt '(server))
|
|
|
|
|
(with-current-buffer "ServNet"
|
|
|
|
|
(erc--hide-prompt erc-server-process)
|
|
|
|
|
(should (string= ">" (get-text-property erc-insert-marker 'display))))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer "#chan"
|
|
|
|
|
(should-not (get-text-property erc-insert-marker 'display)))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer "bob"
|
|
|
|
|
(should-not (get-text-property erc-insert-marker 'display)))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer "ServNet"
|
|
|
|
|
(erc--unhide-prompt)
|
|
|
|
|
(should-not (get-text-property erc-insert-marker 'display))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Value: channel")
|
|
|
|
|
(setq erc-hide-prompt '(channel))
|
|
|
|
|
(with-current-buffer "ServNet"
|
|
|
|
|
(erc--hide-prompt erc-server-process)
|
|
|
|
|
(should-not (get-text-property erc-insert-marker 'display)))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer "bob"
|
|
|
|
|
(should-not (get-text-property erc-insert-marker 'display)))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer "#chan"
|
|
|
|
|
(should (string= ">" (get-text-property erc-insert-marker 'display)))
|
|
|
|
|
(erc--unhide-prompt)
|
|
|
|
|
(should-not (get-text-property erc-insert-marker 'display))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Value: query")
|
|
|
|
|
(setq erc-hide-prompt '(query))
|
|
|
|
|
(with-current-buffer "ServNet"
|
|
|
|
|
(erc--hide-prompt erc-server-process)
|
|
|
|
|
(should-not (get-text-property erc-insert-marker 'display)))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer "bob"
|
|
|
|
|
(should (string= ">" (get-text-property erc-insert-marker 'display)))
|
|
|
|
|
(erc--unhide-prompt)
|
|
|
|
|
(should-not (get-text-property erc-insert-marker 'display)))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer "#chan"
|
|
|
|
|
(should-not (get-text-property erc-insert-marker 'display))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Value: nil")
|
|
|
|
|
(setq erc-hide-prompt nil)
|
|
|
|
|
(with-current-buffer "ServNet"
|
|
|
|
|
(erc--hide-prompt erc-server-process)
|
|
|
|
|
(should-not (get-text-property erc-insert-marker 'display)))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer "bob"
|
|
|
|
|
(should-not (get-text-property erc-insert-marker 'display)))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer "#chan"
|
|
|
|
|
(should-not (get-text-property erc-insert-marker 'display))
|
|
|
|
|
(erc--unhide-prompt) ; won't blow up when prompt already showing
|
|
|
|
|
(should-not (get-text-property erc-insert-marker 'display))))
|
|
|
|
|
|
|
|
|
|
(when noninteractive
|
|
|
|
|
(kill-buffer "#chan")
|
|
|
|
|
(kill-buffer "bob")
|
|
|
|
|
(kill-buffer "ServNet"))))
|
|
|
|
|
|
2022-03-13 22:39:36 -07:00
|
|
|
(ert-deftest erc--switch-to-buffer ()
|
|
|
|
|
(defvar erc-modified-channels-alist) ; lisp/erc/erc-track.el
|
|
|
|
|
|
|
|
|
|
(let ((proc (start-process "aNet" (current-buffer) "true"))
|
|
|
|
|
(erc-modified-channels-alist `(("fake") (,(messages-buffer))))
|
|
|
|
|
(inhibit-message noninteractive)
|
|
|
|
|
(completion-fail-discreetly t) ; otherwise ^G^G printed to .log file
|
|
|
|
|
;;
|
|
|
|
|
erc-kill-channel-hook erc-kill-server-hook erc-kill-buffer-hook)
|
|
|
|
|
|
|
|
|
|
(with-current-buffer (get-buffer-create "server")
|
|
|
|
|
(erc-mode)
|
|
|
|
|
(set-process-buffer (setq erc-server-process proc) (current-buffer))
|
2022-03-19 02:33:24 -07:00
|
|
|
(set-process-query-on-exit-flag erc-server-process nil)
|
2022-03-13 22:39:36 -07:00
|
|
|
(with-current-buffer (get-buffer-create "#chan")
|
|
|
|
|
(erc-mode)
|
|
|
|
|
(setq erc-server-process proc))
|
|
|
|
|
(with-current-buffer (get-buffer-create "#foo")
|
|
|
|
|
(erc-mode)
|
|
|
|
|
(setq erc-server-process proc))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Channel #chan selectable from server buffer")
|
|
|
|
|
(ert-simulate-keys (list ?# ?c ?h ?a ?n ?\C-m)
|
|
|
|
|
(should (string= "#chan" (erc--switch-to-buffer))))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Channel #foo selectable from non-ERC buffer")
|
|
|
|
|
(ert-simulate-keys (list ?# ?f ?o ?o ?\C-m)
|
|
|
|
|
(should (string= "#foo" (erc--switch-to-buffer)))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Default selectable")
|
|
|
|
|
(ert-simulate-keys (list ?\C-m)
|
|
|
|
|
(should (string= "*Messages*" (erc--switch-to-buffer)))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Extant but non-ERC buffer not selectable")
|
|
|
|
|
(get-buffer-create "#fake") ; not ours
|
|
|
|
|
(ert-simulate-keys (kbd "#fake C-m C-a C-k C-m")
|
|
|
|
|
;; Initial query fails ~~~~~~^; clearing input accepts default
|
|
|
|
|
(should (string= "*Messages*" (erc--switch-to-buffer)))))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer (get-buffer-create "other")
|
|
|
|
|
(erc-mode)
|
2022-03-19 02:33:24 -07:00
|
|
|
(setq erc-server-process (start-process "bNet" (current-buffer) "true"))
|
|
|
|
|
(set-process-query-on-exit-flag erc-server-process nil))
|
2022-03-13 22:39:36 -07:00
|
|
|
|
|
|
|
|
(ert-info ("Foreign ERC buffer not selectable")
|
|
|
|
|
(ert-simulate-keys (kbd "other C-m C-a C-k C-m")
|
|
|
|
|
(with-current-buffer "server"
|
|
|
|
|
(should (string= "*Messages*" (erc--switch-to-buffer))))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Any ERC-buffer selectable from non-ERC buffer")
|
|
|
|
|
(should-not (eq major-mode 'erc-mode))
|
|
|
|
|
(ert-simulate-keys (list ?o ?t ?h ?e ?r ?\C-m)
|
|
|
|
|
(should (string= "other" (erc--switch-to-buffer)))))
|
|
|
|
|
|
|
|
|
|
(dolist (b '("server" "other" "#chan" "#foo" "#fake"))
|
|
|
|
|
(kill-buffer b))))
|
|
|
|
|
|
2021-09-16 15:25:18 +02:00
|
|
|
(ert-deftest erc-lurker-maybe-trim ()
|
|
|
|
|
(let (erc-lurker-trim-nicks
|
|
|
|
|
(erc-lurker-ignore-chars "_`"))
|
|
|
|
|
|
|
|
|
|
(should (string= "nick`" (erc-lurker-maybe-trim "nick`")))
|
|
|
|
|
|
|
|
|
|
(setq erc-lurker-trim-nicks t)
|
|
|
|
|
(should (string= "nick" (erc-lurker-maybe-trim "nick`")))
|
|
|
|
|
(should (string= "ni`_ck" (erc-lurker-maybe-trim "ni`_ck__``")))
|
|
|
|
|
|
|
|
|
|
(setq erc-lurker-ignore-chars "_-`") ; set of chars, not character alts
|
|
|
|
|
(should (string= "nick" (erc-lurker-maybe-trim "nick-_`")))))
|
|
|
|
|
|
2021-08-12 03:10:31 -07:00
|
|
|
(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--get-isupport-entry ()
|
|
|
|
|
(let ((erc--isupport-params (make-hash-table))
|
|
|
|
|
(erc-server-parameters '(("FOO" . "1") ("BAR") ("BAZ" . "A,B,C")))
|
|
|
|
|
(items (lambda ()
|
|
|
|
|
(cl-loop for k being the hash-keys of erc--isupport-params
|
|
|
|
|
using (hash-values v) collect (cons k v)))))
|
|
|
|
|
|
|
|
|
|
(should-not (erc--get-isupport-entry 'FAKE))
|
|
|
|
|
(should-not (erc--get-isupport-entry 'FAKE 'single))
|
|
|
|
|
(should (zerop (hash-table-count erc--isupport-params)))
|
|
|
|
|
|
|
|
|
|
(should (equal (erc--get-isupport-entry 'BAR) '(BAR)))
|
|
|
|
|
(should-not (erc--get-isupport-entry 'BAR 'single))
|
|
|
|
|
(should (= 1 (hash-table-count erc--isupport-params)))
|
|
|
|
|
|
|
|
|
|
(should (equal (erc--get-isupport-entry 'BAZ) '(BAZ "A" "B" "C")))
|
|
|
|
|
(should (equal (erc--get-isupport-entry 'BAZ 'single) "A"))
|
|
|
|
|
(should (= 2 (hash-table-count erc--isupport-params)))
|
|
|
|
|
|
|
|
|
|
(should (equal (erc--get-isupport-entry 'FOO 'single) "1"))
|
|
|
|
|
(should (equal (erc--get-isupport-entry 'FOO) '(FOO "1")))
|
|
|
|
|
|
|
|
|
|
(should (equal (funcall items)
|
|
|
|
|
'((BAR . --empty--) (BAZ "A" "B" "C") (FOO "1"))))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest erc-server-005 ()
|
|
|
|
|
(let* ((hooked 0)
|
|
|
|
|
(verify #'ignore)
|
|
|
|
|
(hook (lambda (_ _) (funcall verify) (cl-incf hooked)))
|
|
|
|
|
(erc-server-005-functions (list #'erc-server-005 hook #'ignore))
|
|
|
|
|
erc-server-parameters
|
|
|
|
|
erc--isupport-params
|
|
|
|
|
erc-timer-hook
|
|
|
|
|
calls
|
|
|
|
|
args
|
|
|
|
|
parsed)
|
|
|
|
|
|
|
|
|
|
(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 (zerop (hash-table-count erc--isupport-params)))
|
|
|
|
|
(should (equal "(ov)@+" (erc--get-isupport-entry 'PREFIX t)))
|
|
|
|
|
(should (equal '(EXCEPTS) (erc--get-isupport-entry 'EXCEPTS)))
|
|
|
|
|
(should (equal "B" (erc--get-isupport-entry 'BOT t)))
|
|
|
|
|
(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" "-FAKE" "PREFIX=(ohv)@%+" "are su...")
|
|
|
|
|
parsed (make-erc-response :command-args args :command "005"))
|
|
|
|
|
|
|
|
|
|
(setq verify
|
|
|
|
|
(lambda ()
|
|
|
|
|
(should (equal erc-server-parameters
|
|
|
|
|
'(("PREFIX" . "(ohv)@%+") ("BOT" . "B"))))
|
|
|
|
|
(should (string= (pop calls)
|
|
|
|
|
"-EXCEPTS -FAKE PREFIX=(ohv)@%+ are su..."))
|
|
|
|
|
(should (equal "(ohv)@%+" (erc--get-isupport-entry 'PREFIX t)))
|
|
|
|
|
(should (equal "B" (erc--get-isupport-entry 'BOT t)))
|
|
|
|
|
(should-not (erc--get-isupport-entry 'EXCEPTS))
|
|
|
|
|
(should (equal args (erc-response.command-args parsed)))))
|
|
|
|
|
|
|
|
|
|
(erc-call-hooks nil parsed))
|
|
|
|
|
(should (= hooked 2)))))
|
|
|
|
|
|
2021-10-05 19:03:56 -07:00
|
|
|
(ert-deftest erc-downcase ()
|
|
|
|
|
(let ((erc--isupport-params (make-hash-table)))
|
|
|
|
|
|
|
|
|
|
(puthash 'PREFIX '("(ov)@+") erc--isupport-params)
|
|
|
|
|
(puthash 'BOT '("B") erc--isupport-params)
|
|
|
|
|
|
|
|
|
|
(ert-info ("ascii")
|
|
|
|
|
(puthash 'CASEMAPPING '("ascii") erc--isupport-params)
|
|
|
|
|
(should (equal (erc-downcase "Bob[m]`") "bob[m]`"))
|
|
|
|
|
(should (equal (erc-downcase "Tilde~") "tilde~" ))
|
|
|
|
|
(should (equal (erc-downcase "\\O/") "\\o/" )))
|
|
|
|
|
|
|
|
|
|
(ert-info ("rfc1459")
|
|
|
|
|
(puthash 'CASEMAPPING '("rfc1459") erc--isupport-params)
|
|
|
|
|
(should (equal (erc-downcase "Bob[m]`") "bob{m}`" ))
|
|
|
|
|
(should (equal (erc-downcase "Tilde~") "tilde^" ))
|
|
|
|
|
(should (equal (erc-downcase "\\O/") "|o/" )))
|
|
|
|
|
|
|
|
|
|
(ert-info ("rfc1459-strict")
|
|
|
|
|
(puthash 'CASEMAPPING '("rfc1459-strict") erc--isupport-params)
|
|
|
|
|
(should (equal (erc-downcase "Bob[m]`") "bob{m}`"))
|
|
|
|
|
(should (equal (erc-downcase "Tilde~") "tilde~" ))
|
|
|
|
|
(should (equal (erc-downcase "\\O/") "|o/" )))))
|
|
|
|
|
|
2021-08-16 05:01:16 -07:00
|
|
|
(ert-deftest erc--valid-local-channel-p ()
|
|
|
|
|
(ert-info ("Local channels not supported")
|
|
|
|
|
(let ((erc--isupport-params (make-hash-table)))
|
|
|
|
|
(puthash 'CHANTYPES '("#") erc--isupport-params)
|
|
|
|
|
(should-not (erc--valid-local-channel-p "#chan"))
|
|
|
|
|
(should-not (erc--valid-local-channel-p "&local"))))
|
|
|
|
|
(ert-info ("Local channels supported")
|
|
|
|
|
(let ((erc--isupport-params (make-hash-table)))
|
|
|
|
|
(puthash 'CHANTYPES '("&#") erc--isupport-params)
|
|
|
|
|
(should-not (erc--valid-local-channel-p "#chan"))
|
|
|
|
|
(should (erc--valid-local-channel-p "&local")))))
|
|
|
|
|
|
2021-10-19 22:53:03 -07:00
|
|
|
(ert-deftest erc--target-from-string ()
|
|
|
|
|
(should (equal (erc--target-from-string "#chan")
|
|
|
|
|
#s(erc--target-channel "#chan" \#chan)))
|
|
|
|
|
|
|
|
|
|
(should (equal (erc--target-from-string "Bob")
|
|
|
|
|
#s(erc--target "Bob" bob)))
|
|
|
|
|
|
|
|
|
|
(let ((erc--isupport-params (make-hash-table)))
|
|
|
|
|
(puthash 'CHANTYPES '("&#") erc--isupport-params)
|
|
|
|
|
(should (equal (erc--target-from-string "&Bitlbee")
|
|
|
|
|
#s(erc--target-channel-local "&Bitlbee" &bitlbee)))))
|
|
|
|
|
|
2021-02-27 05:35:40 +01:00
|
|
|
(ert-deftest erc-ring-previous-command-base-case ()
|
|
|
|
|
(ert-info ("Create ring when nonexistent and do nothing")
|
|
|
|
|
(let (erc-input-ring
|
|
|
|
|
erc-input-ring-index)
|
|
|
|
|
(erc-previous-command)
|
|
|
|
|
(should (ring-p erc-input-ring))
|
|
|
|
|
(should (zerop (ring-length erc-input-ring)))
|
|
|
|
|
(should-not erc-input-ring-index)))
|
|
|
|
|
(should-not erc-input-ring))
|
|
|
|
|
|
|
|
|
|
(ert-deftest erc-ring-previous-command ()
|
|
|
|
|
(with-current-buffer (get-buffer-create "*#fake*")
|
|
|
|
|
(erc-mode)
|
2022-04-05 17:45:00 -07:00
|
|
|
(erc-tests--send-prep)
|
|
|
|
|
(setq-local erc-last-input-time 0)
|
2021-09-16 15:20:59 +02:00
|
|
|
(should-not (local-variable-if-set-p 'erc-send-completed-hook))
|
|
|
|
|
(set (make-local-variable 'erc-send-completed-hook) nil) ; skip t (globals)
|
|
|
|
|
;; Just in case erc-ring-mode is already on
|
|
|
|
|
(setq-local erc-pre-send-functions nil)
|
|
|
|
|
(add-hook 'erc-pre-send-functions #'erc-add-to-input-ring)
|
2021-02-27 05:35:40 +01:00
|
|
|
;;
|
|
|
|
|
(cl-letf (((symbol-function 'erc-process-input-line)
|
|
|
|
|
(lambda (&rest _)
|
|
|
|
|
(insert-before-markers
|
|
|
|
|
(erc-display-message-highlight 'notice "echo: one\n"))))
|
|
|
|
|
((symbol-function 'erc-command-no-process-p)
|
|
|
|
|
(lambda (&rest _) t)))
|
|
|
|
|
(ert-info ("Create ring, populate, recall")
|
|
|
|
|
(insert "/one")
|
|
|
|
|
(erc-send-current-line)
|
|
|
|
|
(should (ring-p erc-input-ring))
|
|
|
|
|
(should (zerop (ring-member erc-input-ring "/one"))) ; equal
|
2022-08-17 00:00:53 -07:00
|
|
|
(should (save-excursion (forward-line -1)
|
2021-02-27 05:35:40 +01:00
|
|
|
(looking-at-p "[*]+ echo: one")))
|
|
|
|
|
(should-not erc-input-ring-index)
|
|
|
|
|
(erc-bol)
|
|
|
|
|
(should (looking-at "$"))
|
|
|
|
|
(erc-previous-command)
|
|
|
|
|
(erc-bol)
|
|
|
|
|
(should (looking-at "/one"))
|
|
|
|
|
(should (zerop erc-input-ring-index)))
|
|
|
|
|
(ert-info ("Back to one")
|
|
|
|
|
(should (= (ring-length erc-input-ring) (1+ erc-input-ring-index)))
|
|
|
|
|
(erc-previous-command)
|
|
|
|
|
(should-not erc-input-ring-index)
|
|
|
|
|
(erc-bol)
|
|
|
|
|
(should (looking-at "$"))
|
|
|
|
|
(should (equal (ring-ref erc-input-ring 0) "/one")))
|
|
|
|
|
(ert-info ("Swap input after prompt with previous (#bug46339)")
|
|
|
|
|
(insert "abc")
|
|
|
|
|
(erc-previous-command)
|
|
|
|
|
(should (= 1 erc-input-ring-index))
|
|
|
|
|
(erc-bol)
|
|
|
|
|
(should (looking-at "/one"))
|
|
|
|
|
(should (equal (ring-ref erc-input-ring 0) "abc"))
|
|
|
|
|
(should (equal (ring-ref erc-input-ring 1) "/one"))
|
|
|
|
|
(erc-next-command)
|
|
|
|
|
(erc-bol)
|
|
|
|
|
(should (looking-at "abc")))))
|
|
|
|
|
(when noninteractive
|
|
|
|
|
(kill-buffer "*#fake*")))
|
2021-09-16 15:35:55 +02:00
|
|
|
|
|
|
|
|
(ert-deftest erc-log-irc-protocol ()
|
|
|
|
|
(should-not erc-debug-irc-protocol)
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(setq erc-server-process (start-process "fake" (current-buffer) "true")
|
|
|
|
|
erc-server-current-nick "tester"
|
|
|
|
|
erc-session-server "myproxy.localhost"
|
|
|
|
|
erc-session-port 6667)
|
|
|
|
|
(let ((inhibit-message noninteractive))
|
|
|
|
|
(erc-toggle-debug-irc-protocol)
|
|
|
|
|
(erc-log-irc-protocol "PASS changeme\r\n" 'outgoing)
|
|
|
|
|
(setq erc-server-announced-name "irc.gnu.org")
|
|
|
|
|
(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)
|
Address long-standing ERC buffer-naming issues
* lisp/erc/erc-backend.el (erc-server-connected): Revise doc string.
(erc-server-reconnect, erc-server-JOIN): Reuse original ID param from
the first connection when calling `erc-open'.
(erc-server-NICK): Apply same name generation process used by
`erc-open'; except here, do so for the purpose of "re-nicking".
Update network identifier and maybe buffer names after a user's own
nick changes.
* lisp/erc/erc-networks.el (erc-networks--id, erc-networks--id-fixed,
erc-networks--id-qualifying): Define new set of structs to contain all
info relevant to specifying a unique identifier for a network context.
Add a new variable `erc-networks--id' to store a local reference to a
`erc-networks--id' object, shared among all buffers in a logical
session.
(erc-networks--id-given, erc-networks--id-create,
erc-networks--id-on-connect, erc-networks--id--equal-p,
erc-networks--id-qualifying-init-parts,
erc-networks--id-qualifying-init-symbol,
erc-networks--id-qualifying-grow-id,
erc-networks--id-qualifying-reset-id,
erc-networks--id-qualifying-prefix-length,
erc-networks--id-qualifying-update, erc-networks--id-reload,
erc-networks--id-ensure-comparable, erc-networks--id-sort-buffers):
Add new functions to support management of `erc-networks--id' struct
instances.
(erc-networks--id-sep): New variable for to help when formatting
buffer names.
(erc-obsolete-var): Define new generic context rewriter.
(erc-networks-shrink-ids-and-buffer-names,
erc-networks--refresh-buffer-names,
erc-networks--shrink-ids-and-buffer-names-any): Add functions to
reassess all network IDs and shrink them if necessary along with
affected buffer names. Also add function to rename buffers so that
their names are unique. Register these on all three of ERC's
kill-buffer hooks because an orphaned target buffer is enough to keep
its session alive.
(erc-networks-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 that has become unique across all sessions and, in
most cases, all networks. IOW, remove the @NETWORK-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-networks--examine-targets): Add new utility function that visits
all ERC buffers and runs callbacks when a buffer-name collision is
encountered.
(erc-networks--qualified-sep): Add constant to hold separator between
target and suffix.
(erc-networks--construct-target-buffer-name,
erc-networks--ensure-unique-target-buffer-name,
erc-networks--ensure-unique-server-buffer-name,
erc-networks--maybe-update-buffer-name): Add helpers to support
`erc-networks--reconcile-buffer-names' and friends.
(erc-networks--reconcile-buffer-names): Add new buffer-naming strategy
function and helper for `erc-generate-new-buffer-name' that only run
in target buffers.
(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 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. The
rationale for not making this customizable is that the value signifies
the pathological case where a user of an uncommon IRC setup has not
yet set a mapping from announced- to network name. And the chances of
there being multiple unknown networks is low.
(erc-set-network-name, erc-networks--set-name): Deprecate former and
partially replace with latter. Ding with helpful message, and don't
set `erc-network' 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-unset-network-name): Deprecate function unused internally.
(erc-networks--insert-transplanted-content,
erc-networks--reclaim-orphaned-target-buffers,
erc-networks--copy-over-server-buffer-contents,
erc--update-server-identity): 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 network ID.
(erc-networks--init-identity): Add new function to perform one-time
session-related setup. This could be combined with
`erc-set-network-name'.
(erc-networks--rename-server-buffer): Add new function to replace
`erc-unset-network-name' as default `erc-disconnected-hook' member;
renames server buffers once network is discovered; added to/removed
from `erc-after-connect' hook on `erc-networks' minor mode.
(erc-networks--bouncer-targets): Add constant to hold target symbols
of well known bouncer-configuration bots.
(erc-networks-on-MOTD-end): Add primary network-context handler to run
on 376/422 functions, just before logical connection is officially
established.
(erc-networks-enable, erc-networks-mode): Register main network-setup
handler with 376/422 hooks.
* 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-reuse-buffers): Make this an obsolete variable, but take pains to
ensure its pre-28.1 behavior is preserved. That is, undo the
regression involving unwanted automatic reassociation of channel
buffers during joins, which arrived in ERC 5.4 and effectively
inverted the meaning of this variable, when nil, for channel buffers,
all without accompanying documentation or announcement.
(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 network-based uniquifying suffixes for channels and
query buffers. Fall back to the TCP host:port<n> convention when
necessary. Accept additional optional params 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 params.
(erc-open): Add new ID param to for a network identifier explicitly
passed to an entry-point command. This is stored in the `given' slot
of the `erc-network--id' object. Also initialize the latter in new
connections and otherwise copy it over. As part of the push to recast
erc-networks.el as an essential library, set `erc-network' explicitly,
when known, rather than via hooks.
(erc, erc-tls): Add new ID keyword parameter and pass it to
`erc-open'.
(erc-log-irc-protocol): Use `erc--network-id' instead of the function
`erc-network' to determine preferred peer name.
(erc-format-target-and/or-network): This is called frequently from
mode-line updates, so renaming buffers here is not ideal. Instead, do
so in `erc-networks--rename-server-buffer'.
(erc-kill-server-hook): Add `erc-networks-shrink-ids-and-buffer-names'
as default member.
(erc-kill-channel-hook, erc-kill-buffer-hook): Add
`erc-networks-shrink-ids-and-buffer-names' and
`erc-networks-rename-surviving-target-buffer' as default member.
* test/lisp/erc/erc-tests.el (erc-log-irc-protocol): Use network-ID
focused internal API.
* test/lisp/erc/erc-networks-tests.el: Add new file that includes
tests for the above network-ID focused functions.
See bug#48598 for background on all of the above.
2021-05-03 05:54:56 -07:00
|
|
|
(setq erc-networks--id (erc-networks--id-create nil))
|
2021-09-16 15:35:55 +02:00
|
|
|
(erc-log-irc-protocol ":irc.gnu.org 422 tester :MOTD missing")
|
Address long-standing ERC buffer-naming issues
* lisp/erc/erc-backend.el (erc-server-connected): Revise doc string.
(erc-server-reconnect, erc-server-JOIN): Reuse original ID param from
the first connection when calling `erc-open'.
(erc-server-NICK): Apply same name generation process used by
`erc-open'; except here, do so for the purpose of "re-nicking".
Update network identifier and maybe buffer names after a user's own
nick changes.
* lisp/erc/erc-networks.el (erc-networks--id, erc-networks--id-fixed,
erc-networks--id-qualifying): Define new set of structs to contain all
info relevant to specifying a unique identifier for a network context.
Add a new variable `erc-networks--id' to store a local reference to a
`erc-networks--id' object, shared among all buffers in a logical
session.
(erc-networks--id-given, erc-networks--id-create,
erc-networks--id-on-connect, erc-networks--id--equal-p,
erc-networks--id-qualifying-init-parts,
erc-networks--id-qualifying-init-symbol,
erc-networks--id-qualifying-grow-id,
erc-networks--id-qualifying-reset-id,
erc-networks--id-qualifying-prefix-length,
erc-networks--id-qualifying-update, erc-networks--id-reload,
erc-networks--id-ensure-comparable, erc-networks--id-sort-buffers):
Add new functions to support management of `erc-networks--id' struct
instances.
(erc-networks--id-sep): New variable for to help when formatting
buffer names.
(erc-obsolete-var): Define new generic context rewriter.
(erc-networks-shrink-ids-and-buffer-names,
erc-networks--refresh-buffer-names,
erc-networks--shrink-ids-and-buffer-names-any): Add functions to
reassess all network IDs and shrink them if necessary along with
affected buffer names. Also add function to rename buffers so that
their names are unique. Register these on all three of ERC's
kill-buffer hooks because an orphaned target buffer is enough to keep
its session alive.
(erc-networks-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 that has become unique across all sessions and, in
most cases, all networks. IOW, remove the @NETWORK-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-networks--examine-targets): Add new utility function that visits
all ERC buffers and runs callbacks when a buffer-name collision is
encountered.
(erc-networks--qualified-sep): Add constant to hold separator between
target and suffix.
(erc-networks--construct-target-buffer-name,
erc-networks--ensure-unique-target-buffer-name,
erc-networks--ensure-unique-server-buffer-name,
erc-networks--maybe-update-buffer-name): Add helpers to support
`erc-networks--reconcile-buffer-names' and friends.
(erc-networks--reconcile-buffer-names): Add new buffer-naming strategy
function and helper for `erc-generate-new-buffer-name' that only run
in target buffers.
(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 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. The
rationale for not making this customizable is that the value signifies
the pathological case where a user of an uncommon IRC setup has not
yet set a mapping from announced- to network name. And the chances of
there being multiple unknown networks is low.
(erc-set-network-name, erc-networks--set-name): Deprecate former and
partially replace with latter. Ding with helpful message, and don't
set `erc-network' 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-unset-network-name): Deprecate function unused internally.
(erc-networks--insert-transplanted-content,
erc-networks--reclaim-orphaned-target-buffers,
erc-networks--copy-over-server-buffer-contents,
erc--update-server-identity): 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 network ID.
(erc-networks--init-identity): Add new function to perform one-time
session-related setup. This could be combined with
`erc-set-network-name'.
(erc-networks--rename-server-buffer): Add new function to replace
`erc-unset-network-name' as default `erc-disconnected-hook' member;
renames server buffers once network is discovered; added to/removed
from `erc-after-connect' hook on `erc-networks' minor mode.
(erc-networks--bouncer-targets): Add constant to hold target symbols
of well known bouncer-configuration bots.
(erc-networks-on-MOTD-end): Add primary network-context handler to run
on 376/422 functions, just before logical connection is officially
established.
(erc-networks-enable, erc-networks-mode): Register main network-setup
handler with 376/422 hooks.
* 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-reuse-buffers): Make this an obsolete variable, but take pains to
ensure its pre-28.1 behavior is preserved. That is, undo the
regression involving unwanted automatic reassociation of channel
buffers during joins, which arrived in ERC 5.4 and effectively
inverted the meaning of this variable, when nil, for channel buffers,
all without accompanying documentation or announcement.
(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 network-based uniquifying suffixes for channels and
query buffers. Fall back to the TCP host:port<n> convention when
necessary. Accept additional optional params 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 params.
(erc-open): Add new ID param to for a network identifier explicitly
passed to an entry-point command. This is stored in the `given' slot
of the `erc-network--id' object. Also initialize the latter in new
connections and otherwise copy it over. As part of the push to recast
erc-networks.el as an essential library, set `erc-network' explicitly,
when known, rather than via hooks.
(erc, erc-tls): Add new ID keyword parameter and pass it to
`erc-open'.
(erc-log-irc-protocol): Use `erc--network-id' instead of the function
`erc-network' to determine preferred peer name.
(erc-format-target-and/or-network): This is called frequently from
mode-line updates, so renaming buffers here is not ideal. Instead, do
so in `erc-networks--rename-server-buffer'.
(erc-kill-server-hook): Add `erc-networks-shrink-ids-and-buffer-names'
as default member.
(erc-kill-channel-hook, erc-kill-buffer-hook): Add
`erc-networks-shrink-ids-and-buffer-names' and
`erc-networks-rename-surviving-target-buffer' as default member.
* test/lisp/erc/erc-tests.el (erc-log-irc-protocol): Use network-ID
focused internal API.
* test/lisp/erc/erc-networks-tests.el: Add new file that includes
tests for the above network-ID focused functions.
See bug#48598 for background on all of the above.
2021-05-03 05:54:56 -07:00
|
|
|
(setq erc-networks--id (erc-networks--id-create 'BarNet))
|
2021-09-16 15:35:55 +02:00
|
|
|
(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*"
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(search-forward "Version")
|
|
|
|
|
(search-forward "\r\n\r\n")
|
2022-08-21 17:33:55 +02:00
|
|
|
(search-forward "myproxy.localhost:6667 >> PASS" (pos-eol))
|
2021-09-16 15:35:55 +02:00
|
|
|
(forward-line)
|
2022-08-21 17:33:55 +02:00
|
|
|
(search-forward "irc.gnu.org << :irc.gnu.org 001" (pos-eol))
|
2021-09-16 15:35:55 +02:00
|
|
|
(forward-line)
|
2022-08-21 17:33:55 +02:00
|
|
|
(search-forward "irc.gnu.org << :irc.gnu.org 002" (pos-eol))
|
2021-09-16 15:35:55 +02:00
|
|
|
(forward-line)
|
2022-08-21 17:33:55 +02:00
|
|
|
(search-forward "FooNet << :irc.gnu.org 422" (pos-eol))
|
2021-09-16 15:35:55 +02:00
|
|
|
(forward-line)
|
2022-08-21 17:33:55 +02:00
|
|
|
(search-forward "BarNet << :irc.gnu.org 221" (pos-eol)))
|
2021-09-16 15:35:55 +02:00
|
|
|
(when noninteractive
|
|
|
|
|
(kill-buffer "*erc-protocol*")
|
|
|
|
|
(should-not erc-debug-irc-protocol)))
|
2021-09-26 01:53:56 +02:00
|
|
|
|
Improve ERC's handling of multiline prompt input
* lisp/erc/erc.el (erc--pre-send-split-functions): Add new internal
hook allowing members to revise individual lines before sending. This
was created with an eye toward possibly exporting it publicly as a
customizable option.
(erc-last-input-time): Tweak meaning of variable to match likely
original intent, which is that it's only updated on successful calls
to `erc-send-current-line'.
(erc--discard-trailing-multiline-nulls): Conditionally truncate list
of lines to be sent, skipping trailing blanks. This constitutes a
behavioral change. But, considering the nature of the bug being
fixed, it is thought to be justified.
(erc--input-split): Add new internal struct containing split input
lines and flag for command detection.
(erc--input-line-delim-regexp): Add regex var for splitting multiline
prompt input.
(erc--blank-in-multiline-p): Add helper for detecting blank lines.
(erc--check-prompt-input-for-multiline-blanks,
erc--check-prompt-input-for-point-in-bounds,
erc--check-prompt-input-for-running-process): New functions to
encapsulate logic for various pre-flight idiot checks.
(erc--check-prompt-input-functions): Add new hook for validating
prompt input prior to clearing it, internal for now.
(erc-send-current-line): Pre-screen for blank lines and bail out if
necessary.
(erc-send-input): Add optional param to skip checking for blank lines.
Call hook `erc--pre-send-split-functions'.
* test/lisp/erc/erc-tests.el (erc-ring-previous-command): Use new test
helper.
(erc--input-line-delim-regexp,
erc--blank-in-multiline-input-p): Add tests.
(erc-tests--send-prep, erc-tests--set-fake-server-process,
erc-tests--with-process-input-spy): Add test helpers.
(erc--check-prompt-input-functions, erc-send-current-line,
erc-send-whitespace-lines): Add tests.
(Bug#54536)
2022-03-21 05:40:16 -07:00
|
|
|
(ert-deftest erc--input-line-delim-regexp ()
|
|
|
|
|
(let ((p erc--input-line-delim-regexp))
|
|
|
|
|
;; none
|
|
|
|
|
(should (equal '("a" "b") (split-string "a\r\nb" p)))
|
|
|
|
|
(should (equal '("a" "b") (split-string "a\nb" p)))
|
|
|
|
|
(should (equal '("a" "b") (split-string "a\rb" p)))
|
|
|
|
|
|
|
|
|
|
;; one
|
|
|
|
|
(should (equal '("") (split-string "" p)))
|
|
|
|
|
(should (equal '("a" "" "b") (split-string "a\r\rb" p)))
|
|
|
|
|
(should (equal '("a" "" "b") (split-string "a\n\rb" p)))
|
|
|
|
|
(should (equal '("a" "" "b") (split-string "a\n\nb" p)))
|
|
|
|
|
(should (equal '("a" "" "b") (split-string "a\r\r\nb" p)))
|
|
|
|
|
(should (equal '("a" "" "b") (split-string "a\n\r\nb" p)))
|
|
|
|
|
(should (equal '("a" "") (split-string "a\n" p)))
|
|
|
|
|
(should (equal '("a" "") (split-string "a\r" p)))
|
|
|
|
|
(should (equal '("a" "") (split-string "a\r\n" p)))
|
|
|
|
|
(should (equal '("" "b") (split-string "\nb" p)))
|
|
|
|
|
(should (equal '("" "b") (split-string "\rb" p)))
|
|
|
|
|
(should (equal '("" "b") (split-string "\r\nb" p)))
|
|
|
|
|
|
|
|
|
|
;; two
|
|
|
|
|
(should (equal '("" "") (split-string "\r" p)))
|
|
|
|
|
(should (equal '("" "") (split-string "\n" p)))
|
|
|
|
|
(should (equal '("" "") (split-string "\r\n" p)))
|
|
|
|
|
|
|
|
|
|
;; three
|
|
|
|
|
(should (equal '("" "" "") (split-string "\r\r" p)))
|
|
|
|
|
(should (equal '("" "" "") (split-string "\n\n" p)))
|
|
|
|
|
(should (equal '("" "" "") (split-string "\n\r" p)))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest erc--blank-in-multiline-input-p ()
|
|
|
|
|
(let ((check (lambda (s)
|
|
|
|
|
(erc--blank-in-multiline-input-p
|
|
|
|
|
(split-string s erc--input-line-delim-regexp)))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("With `erc-send-whitespace-lines'")
|
|
|
|
|
(let ((erc-send-whitespace-lines t))
|
|
|
|
|
(should (funcall check ""))
|
|
|
|
|
(should-not (funcall check "\na"))
|
|
|
|
|
(should-not (funcall check "/msg a\n")) ; real /cmd
|
|
|
|
|
(should-not (funcall check "a\n\nb")) ; "" allowed
|
|
|
|
|
(should-not (funcall check "/msg a\n\nb")) ; non-/cmd
|
|
|
|
|
(should-not (funcall check " "))
|
|
|
|
|
(should-not (funcall check "\t"))
|
|
|
|
|
(should-not (funcall check "a\nb"))
|
|
|
|
|
(should-not (funcall check "a\n "))
|
|
|
|
|
(should-not (funcall check "a\n \t"))
|
|
|
|
|
(should-not (funcall check "a\n \f"))
|
|
|
|
|
(should-not (funcall check "a\n \nb"))
|
|
|
|
|
(should-not (funcall check "a\n \t\nb"))
|
|
|
|
|
(should-not (funcall check "a\n \f\nb"))))
|
|
|
|
|
|
|
|
|
|
(should (funcall check ""))
|
|
|
|
|
(should (funcall check " "))
|
|
|
|
|
(should (funcall check "\t"))
|
|
|
|
|
(should (funcall check "a\n\nb"))
|
|
|
|
|
(should (funcall check "a\n\nb"))
|
|
|
|
|
(should (funcall check "a\n "))
|
|
|
|
|
(should (funcall check "a\n \t"))
|
|
|
|
|
(should (funcall check "a\n \f"))
|
|
|
|
|
(should (funcall check "a\n \nb"))
|
|
|
|
|
(should (funcall check "a\n \t\nb"))
|
|
|
|
|
|
|
|
|
|
(should-not (funcall check "a\rb"))
|
|
|
|
|
(should-not (funcall check "a\nb"))
|
|
|
|
|
(should-not (funcall check "a\r\nb"))))
|
|
|
|
|
|
|
|
|
|
(defun erc-tests--with-process-input-spy (test)
|
|
|
|
|
(with-current-buffer (get-buffer-create "FakeNet")
|
|
|
|
|
(let* ((erc-pre-send-functions
|
|
|
|
|
(remove #'erc-add-to-input-ring erc-pre-send-functions)) ; for now
|
|
|
|
|
(inhibit-message noninteractive)
|
|
|
|
|
(erc-server-current-nick "tester")
|
|
|
|
|
(erc-last-input-time 0)
|
|
|
|
|
erc-accidental-paste-threshold-seconds
|
2022-06-30 17:15:25 -07:00
|
|
|
erc-send-modify-hook
|
Improve ERC's handling of multiline prompt input
* lisp/erc/erc.el (erc--pre-send-split-functions): Add new internal
hook allowing members to revise individual lines before sending. This
was created with an eye toward possibly exporting it publicly as a
customizable option.
(erc-last-input-time): Tweak meaning of variable to match likely
original intent, which is that it's only updated on successful calls
to `erc-send-current-line'.
(erc--discard-trailing-multiline-nulls): Conditionally truncate list
of lines to be sent, skipping trailing blanks. This constitutes a
behavioral change. But, considering the nature of the bug being
fixed, it is thought to be justified.
(erc--input-split): Add new internal struct containing split input
lines and flag for command detection.
(erc--input-line-delim-regexp): Add regex var for splitting multiline
prompt input.
(erc--blank-in-multiline-p): Add helper for detecting blank lines.
(erc--check-prompt-input-for-multiline-blanks,
erc--check-prompt-input-for-point-in-bounds,
erc--check-prompt-input-for-running-process): New functions to
encapsulate logic for various pre-flight idiot checks.
(erc--check-prompt-input-functions): Add new hook for validating
prompt input prior to clearing it, internal for now.
(erc-send-current-line): Pre-screen for blank lines and bail out if
necessary.
(erc-send-input): Add optional param to skip checking for blank lines.
Call hook `erc--pre-send-split-functions'.
* test/lisp/erc/erc-tests.el (erc-ring-previous-command): Use new test
helper.
(erc--input-line-delim-regexp,
erc--blank-in-multiline-input-p): Add tests.
(erc-tests--send-prep, erc-tests--set-fake-server-process,
erc-tests--with-process-input-spy): Add test helpers.
(erc--check-prompt-input-functions, erc-send-current-line,
erc-send-whitespace-lines): Add tests.
(Bug#54536)
2022-03-21 05:40:16 -07:00
|
|
|
;;
|
|
|
|
|
calls)
|
|
|
|
|
(cl-letf (((symbol-function 'erc-process-input-line)
|
|
|
|
|
(lambda (&rest r) (push r calls)))
|
|
|
|
|
((symbol-function 'erc-server-buffer)
|
|
|
|
|
(lambda () (current-buffer))))
|
|
|
|
|
(erc-tests--send-prep)
|
|
|
|
|
(funcall test (lambda () (pop calls)))))
|
|
|
|
|
(when noninteractive (kill-buffer))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest erc--check-prompt-input-functions ()
|
|
|
|
|
(erc-tests--with-process-input-spy
|
|
|
|
|
(lambda (next)
|
|
|
|
|
|
|
|
|
|
(ert-info ("Errors when point not in prompt area") ; actually just dings
|
|
|
|
|
(insert "/msg #chan hi")
|
|
|
|
|
(forward-line -1)
|
|
|
|
|
(let ((e (should-error (erc-send-current-line))))
|
|
|
|
|
(should (equal "Point is not in the input area" (cadr e))))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(ert-info ("Input remains untouched")
|
|
|
|
|
(should (save-excursion (erc-bol) (looking-at "/msg #chan hi")))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Errors when no process running")
|
|
|
|
|
(let ((e (should-error (erc-send-current-line))))
|
|
|
|
|
(should (equal "ERC: No process running" (cadr e))))
|
|
|
|
|
(ert-info ("Input remains untouched")
|
|
|
|
|
(should (save-excursion (erc-bol) (looking-at "/msg #chan hi")))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Errors when line contains empty newline")
|
|
|
|
|
(erc-bol)
|
|
|
|
|
(delete-region (point) (point-max))
|
|
|
|
|
(insert "one\n")
|
|
|
|
|
(let ((e (should-error (erc-send-current-line))))
|
|
|
|
|
(should (equal "Blank line - ignoring..." (cadr e))))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(ert-info ("Input remains untouched")
|
|
|
|
|
(should (save-excursion (goto-char erc-input-marker)
|
|
|
|
|
(looking-at "one\n")))))
|
|
|
|
|
|
|
|
|
|
(should (= 0 erc-last-input-time))
|
|
|
|
|
(should-not (funcall next)))))
|
|
|
|
|
|
|
|
|
|
;; These also indirectly tests `erc-send-input'
|
|
|
|
|
|
|
|
|
|
(ert-deftest erc-send-current-line ()
|
|
|
|
|
(erc-tests--with-process-input-spy
|
|
|
|
|
(lambda (next)
|
|
|
|
|
(erc-tests--set-fake-server-process "sleep" "1")
|
|
|
|
|
(should (= 0 erc-last-input-time))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Simple command")
|
|
|
|
|
(insert "/msg #chan hi")
|
|
|
|
|
(erc-send-current-line)
|
|
|
|
|
(ert-info ("Prompt restored")
|
|
|
|
|
(forward-line 0)
|
|
|
|
|
(should (looking-at-p erc-prompt)))
|
|
|
|
|
(ert-info ("Input cleared")
|
|
|
|
|
(erc-bol)
|
|
|
|
|
(should (eq (point) (point-max))))
|
|
|
|
|
;; Commands are forced (no flood protection)
|
|
|
|
|
(should (equal (funcall next) '("/msg #chan hi\n" t nil))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Simple non-command")
|
|
|
|
|
(insert "hi")
|
|
|
|
|
(erc-send-current-line)
|
|
|
|
|
(should (eq (point) (point-max)))
|
|
|
|
|
(should (save-excursion (forward-line -1)
|
|
|
|
|
(search-forward "<tester> hi")))
|
|
|
|
|
;; Non-ommands are forced only when `erc-flood-protect' is nil
|
|
|
|
|
(should (equal (funcall next) '("hi\n" nil t))))
|
|
|
|
|
|
|
|
|
|
(should (consp erc-last-input-time)))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest erc-send-whitespace-lines ()
|
|
|
|
|
(erc-tests--with-process-input-spy
|
|
|
|
|
(lambda (next)
|
|
|
|
|
(erc-tests--set-fake-server-process "sleep" "1")
|
|
|
|
|
(setq-local erc-send-whitespace-lines t)
|
|
|
|
|
|
|
|
|
|
(ert-info ("Multiline hunk with blank line correctly split")
|
|
|
|
|
(insert "one\n\ntwo")
|
|
|
|
|
(erc-send-current-line)
|
|
|
|
|
(ert-info ("Prompt restored")
|
|
|
|
|
(forward-line 0)
|
|
|
|
|
(should (looking-at-p erc-prompt)))
|
|
|
|
|
(ert-info ("Input cleared")
|
|
|
|
|
(erc-bol)
|
|
|
|
|
(should (eq (point) (point-max))))
|
|
|
|
|
(should (equal (funcall next) '("two\n" nil t)))
|
|
|
|
|
(should (equal (funcall next) '("\n" nil t)))
|
|
|
|
|
(should (equal (funcall next) '("one\n" nil t))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Multiline hunk with trailing newline filtered")
|
|
|
|
|
(insert "hi\n")
|
|
|
|
|
(erc-send-current-line)
|
|
|
|
|
(ert-info ("Input cleared")
|
|
|
|
|
(erc-bol)
|
|
|
|
|
(should (eq (point) (point-max))))
|
|
|
|
|
(should (equal (funcall next) '("hi\n" nil t)))
|
|
|
|
|
(should-not (funcall next)))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Multiline hunk with trailing carriage filtered")
|
|
|
|
|
(insert "hi\r")
|
|
|
|
|
(erc-send-current-line)
|
|
|
|
|
(ert-info ("Input cleared")
|
|
|
|
|
(erc-bol)
|
|
|
|
|
(should (eq (point) (point-max))))
|
|
|
|
|
(should (equal (funcall next) '("hi\n" nil t)))
|
|
|
|
|
(should-not (funcall next)))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Multiline command with trailing blank filtered")
|
|
|
|
|
(pcase-dolist (`(,p . ,q)
|
|
|
|
|
'(("/a b\r" "/a b\n") ("/a b\n" "/a b\n")
|
|
|
|
|
("/a b\n\n" "/a b\n") ("/a b\r\n" "/a b\n")
|
|
|
|
|
("a b\nc\n\n" "c\n" "a b\n")
|
|
|
|
|
("/a b\nc\n\n" "c\n" "/a b\n")
|
|
|
|
|
("/a b\n\nc\n\n" "c\n" "\n" "/a b\n")))
|
|
|
|
|
(insert p)
|
|
|
|
|
(erc-send-current-line)
|
|
|
|
|
(erc-bol)
|
|
|
|
|
(should (eq (point) (point-max)))
|
|
|
|
|
(while q
|
|
|
|
|
(should (equal (funcall next) (list (pop q) nil t))))
|
|
|
|
|
(should-not (funcall next))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Multiline hunk with trailing whitespace not filtered")
|
|
|
|
|
(insert "there\n ")
|
|
|
|
|
(erc-send-current-line)
|
|
|
|
|
(should (equal (funcall next) '(" \n" nil t)))
|
|
|
|
|
(should (equal (funcall next) '("there\n" nil t)))
|
|
|
|
|
(should-not (funcall next))))))
|
2021-11-06 03:09:43 +01:00
|
|
|
|
2022-04-27 02:27:32 -07:00
|
|
|
(ert-deftest erc--check-prompt-input-for-excess-lines ()
|
|
|
|
|
(ert-info ("Without `erc-inhibit-multiline-input'")
|
|
|
|
|
(should-not erc-inhibit-multiline-input)
|
|
|
|
|
(should-not (erc--check-prompt-input-for-excess-lines "" '("a" "b"))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("With `erc-inhibit-multiline-input' as t (2)")
|
|
|
|
|
(let ((erc-inhibit-multiline-input t))
|
|
|
|
|
(should-not (erc--check-prompt-input-for-excess-lines "" '("a")))
|
|
|
|
|
(should-not (erc--check-prompt-input-for-excess-lines "" '("a" "")))
|
|
|
|
|
(should (erc--check-prompt-input-for-excess-lines "" '("a" "b")))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("With `erc-inhibit-multiline-input' as 3")
|
|
|
|
|
(let ((erc-inhibit-multiline-input 3))
|
|
|
|
|
(should-not (erc--check-prompt-input-for-excess-lines "" '("a" "b")))
|
|
|
|
|
(should-not (erc--check-prompt-input-for-excess-lines "" '("a" "b" "")))
|
|
|
|
|
(should (erc--check-prompt-input-for-excess-lines "" '("a" "b" "c")))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("With `erc-ask-about-multiline-input'")
|
|
|
|
|
(let ((erc-inhibit-multiline-input t)
|
|
|
|
|
(erc-ask-about-multiline-input t))
|
|
|
|
|
(ert-simulate-keys '(?n ?\r ?y ?\r)
|
|
|
|
|
(should (erc--check-prompt-input-for-excess-lines "" '("a" "b")))
|
|
|
|
|
(should-not (erc--check-prompt-input-for-excess-lines "" '("a" "b")))))
|
|
|
|
|
(should-not erc-ask-about-multiline-input)))
|
|
|
|
|
|
2021-11-06 03:09:43 +01:00
|
|
|
;; The point of this test is to ensure output is handled identically
|
|
|
|
|
;; regardless of whether a command handler is summoned.
|
|
|
|
|
|
|
|
|
|
(ert-deftest erc-process-input-line ()
|
|
|
|
|
(let (erc-server-last-sent-time
|
|
|
|
|
erc-server-flood-queue
|
|
|
|
|
(orig-erc-cmd-MSG (symbol-function 'erc-cmd-MSG))
|
2021-06-13 02:15:55 -07:00
|
|
|
(erc-default-recipients '("#chan"))
|
2021-11-06 03:09:43 +01:00
|
|
|
calls)
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(cl-letf (((symbol-function 'erc-cmd-MSG)
|
|
|
|
|
(lambda (line)
|
|
|
|
|
(push line calls)
|
|
|
|
|
(funcall orig-erc-cmd-MSG line)))
|
|
|
|
|
((symbol-function 'erc-server-buffer)
|
|
|
|
|
(lambda () (current-buffer)))
|
|
|
|
|
((symbol-function 'erc-server-process-alive)
|
|
|
|
|
(lambda () t))
|
|
|
|
|
((symbol-function 'erc-server-send-queue)
|
2021-06-13 02:15:55 -07:00
|
|
|
#'ignore))
|
2021-11-06 03:09:43 +01:00
|
|
|
|
|
|
|
|
(ert-info ("Dispatch to user command handler")
|
|
|
|
|
|
|
|
|
|
(ert-info ("Baseline")
|
|
|
|
|
(erc-process-input-line "/msg #chan hi\n")
|
|
|
|
|
(should (equal (pop calls) " #chan hi"))
|
|
|
|
|
(should (equal (pop erc-server-flood-queue)
|
|
|
|
|
'("PRIVMSG #chan :hi\r\n" . utf-8))))
|
|
|
|
|
|
2021-06-13 02:15:55 -07:00
|
|
|
(ert-info ("Quote preserves line intact")
|
|
|
|
|
(erc-process-input-line "/QUOTE FAKE foo bar\n")
|
|
|
|
|
(should (equal (pop erc-server-flood-queue)
|
|
|
|
|
'("FAKE foo bar\r\n" . utf-8))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Unknown command respected")
|
|
|
|
|
(erc-process-input-line "/FAKE foo bar\n")
|
|
|
|
|
(should (equal (pop erc-server-flood-queue)
|
|
|
|
|
'("FAKE foo bar\r\n" . utf-8))))
|
|
|
|
|
|
2021-11-06 03:09:43 +01:00
|
|
|
(ert-info ("Spaces preserved")
|
|
|
|
|
(erc-process-input-line "/msg #chan hi you\n")
|
|
|
|
|
(should (equal (pop calls) " #chan hi you"))
|
|
|
|
|
(should (equal (pop erc-server-flood-queue)
|
|
|
|
|
'("PRIVMSG #chan :hi you\r\n" . utf-8))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Empty line honored")
|
|
|
|
|
(erc-process-input-line "/msg #chan\n")
|
|
|
|
|
(should (equal (pop calls) " #chan"))
|
|
|
|
|
(should (equal (pop erc-server-flood-queue)
|
|
|
|
|
'("PRIVMSG #chan :\r\n" . utf-8)))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Implicit cmd via `erc-send-input-line-function'")
|
|
|
|
|
|
|
|
|
|
(ert-info ("Baseline")
|
2022-03-21 19:21:57 -07:00
|
|
|
(erc-process-input-line "hi\n")
|
2021-11-06 03:09:43 +01:00
|
|
|
(should (equal (pop erc-server-flood-queue)
|
|
|
|
|
'("PRIVMSG #chan :hi\r\n" . utf-8))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Spaces preserved")
|
2022-03-21 19:21:57 -07:00
|
|
|
(erc-process-input-line "hi you\n")
|
2021-11-06 03:09:43 +01:00
|
|
|
(should (equal (pop erc-server-flood-queue)
|
|
|
|
|
'("PRIVMSG #chan :hi you\r\n" . utf-8))))
|
|
|
|
|
|
2022-03-21 19:21:57 -07:00
|
|
|
(ert-info ("Empty line transmitted with injected-space kludge")
|
|
|
|
|
(erc-process-input-line "\n")
|
2021-11-06 03:09:43 +01:00
|
|
|
(should (equal (pop erc-server-flood-queue)
|
2022-03-21 19:21:57 -07:00
|
|
|
'("PRIVMSG #chan : \r\n" . utf-8))))
|
2021-11-06 03:09:43 +01:00
|
|
|
|
|
|
|
|
(should-not calls))))))
|
|
|
|
|
|
2022-07-06 00:40:42 -07:00
|
|
|
;; Note: if adding an erc-backend-tests.el, please relocate this there.
|
|
|
|
|
|
|
|
|
|
(ert-deftest erc-message ()
|
|
|
|
|
(should-not erc-server-last-peers)
|
|
|
|
|
(let (server-proc
|
|
|
|
|
calls
|
|
|
|
|
erc-kill-channel-hook erc-kill-server-hook erc-kill-buffer-hook)
|
|
|
|
|
(cl-letf (((symbol-function 'erc-display-message)
|
|
|
|
|
(lambda (_ _ _ line) (push line calls)))
|
|
|
|
|
((symbol-function 'erc-server-send)
|
|
|
|
|
(lambda (line _) (push line calls)))
|
|
|
|
|
((symbol-function 'erc-server-buffer)
|
|
|
|
|
(lambda () (process-buffer server-proc))))
|
|
|
|
|
(with-current-buffer (get-buffer-create "ExampleNet")
|
|
|
|
|
(erc-mode)
|
|
|
|
|
(setq erc-server-current-nick "tester"
|
|
|
|
|
server-proc (start-process "sleep" (current-buffer) "sleep" "1")
|
|
|
|
|
erc-server-process server-proc
|
|
|
|
|
erc-server-last-peers (cons nil nil)
|
|
|
|
|
erc-server-users (make-hash-table :test 'equal)
|
|
|
|
|
erc-network 'ExampleNet)
|
|
|
|
|
(set-process-query-on-exit-flag erc-server-process nil))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer (get-buffer-create "#chan")
|
|
|
|
|
(erc-mode)
|
|
|
|
|
(setq erc-server-process (buffer-local-value 'erc-server-process
|
|
|
|
|
(get-buffer "ExampleNet"))
|
|
|
|
|
erc-default-recipients '("#chan")
|
|
|
|
|
erc-channel-users (make-hash-table :test 'equal)
|
|
|
|
|
erc-network 'ExampleNet)
|
|
|
|
|
(erc-update-current-channel-member "alice" "alice")
|
|
|
|
|
(erc-update-current-channel-member "tester" "tester"))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer "ExampleNet"
|
|
|
|
|
(erc-server-PRIVMSG erc-server-process
|
|
|
|
|
(make-erc-response
|
|
|
|
|
:sender "alice!~u@fsf.org"
|
|
|
|
|
:command "PRIVMSG"
|
|
|
|
|
:command-args '("#chan" "hi")
|
|
|
|
|
:unparsed ":alice!~u@fsf.org PRIVMSG #chan :hi"))
|
|
|
|
|
(should (equal erc-server-last-peers '("alice")))
|
|
|
|
|
(should (string-match "<alice>" (pop calls))))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer "#chan"
|
|
|
|
|
(ert-info ("Shortcuts usable in target buffers")
|
|
|
|
|
(should-not (local-variable-p 'erc-server-last-peers))
|
|
|
|
|
(should-not erc-server-last-peers)
|
|
|
|
|
(erc-message "PRIVMSG" ". hi")
|
|
|
|
|
(should-not erc-server-last-peers)
|
|
|
|
|
(should (eq 'no-target (pop calls)))
|
|
|
|
|
(erc-message "PRIVMSG" ", hi")
|
|
|
|
|
(should-not erc-server-last-peers)
|
|
|
|
|
(should (string-match "alice :hi" (pop calls)))))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer "ExampleNet"
|
|
|
|
|
(ert-info ("Shortcuts local in server bufs")
|
|
|
|
|
(should (equal erc-server-last-peers '("alice" . "alice")))
|
|
|
|
|
(erc-message "PRIVMSG" ", hi")
|
|
|
|
|
(should (equal erc-server-last-peers '("alice" . "alice")))
|
|
|
|
|
(should (string-match "PRIVMSG alice :hi" (pop calls)))
|
|
|
|
|
(setcdr erc-server-last-peers "bob")
|
|
|
|
|
(erc-message "PRIVMSG" ". hi")
|
|
|
|
|
(should (equal erc-server-last-peers '("alice" . "bob")))
|
|
|
|
|
(should (string-match "PRIVMSG bob :hi" (pop calls)))))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer "#chan"
|
|
|
|
|
(ert-info ("Non-shortcuts are local to server buffer")
|
|
|
|
|
(should-not (local-variable-p 'erc-server-last-peers))
|
|
|
|
|
(should-not erc-server-last-peers)
|
|
|
|
|
(erc-message "PRIVMSG" "#chan hola")
|
|
|
|
|
(should-not erc-server-last-peers)
|
|
|
|
|
(should-not (default-value 'erc-server-last-peers))
|
|
|
|
|
(should (equal (buffer-local-value 'erc-server-last-peers
|
|
|
|
|
(get-buffer "ExampleNet"))
|
|
|
|
|
'("alice" . "#chan")))
|
|
|
|
|
(should (string-match "hola" (pop calls))))))
|
|
|
|
|
|
|
|
|
|
(should-not erc-server-last-peers)
|
|
|
|
|
(should-not calls)
|
|
|
|
|
(kill-buffer "ExampleNet")
|
|
|
|
|
(kill-buffer "#chan")))
|
|
|
|
|
|
2022-07-11 05:14:57 -07:00
|
|
|
(defvar erc-tests--ipv6-examples
|
|
|
|
|
'("1:2:3:4:5:6:7:8"
|
|
|
|
|
"::ffff:10.0.0.1" "::ffff:1.2.3.4" "::ffff:0.0.0.0"
|
|
|
|
|
"1:2:3:4:5:6:77:88" "::ffff:255.255.255.255"
|
|
|
|
|
"fe08::7:8" "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"
|
|
|
|
|
"1:2:3:4:5:6:7:8" "1::" "1:2:3:4:5:6:7::" "1::8"
|
|
|
|
|
"1:2:3:4:5:6::8" "1:2:3:4:5:6::8" "1::7:8" "1:2:3:4:5::7:8"
|
|
|
|
|
"1:2:3:4:5::8" "1::6:7:8" "1:2:3:4::6:7:8" "1:2:3:4::8"
|
|
|
|
|
"1::5:6:7:8" "1:2:3::5:6:7:8" "1:2:3::8" "1::4:5:6:7:8"
|
|
|
|
|
"1:2::4:5:6:7:8" "1:2::8" "1::3:4:5:6:7:8" "1::3:4:5:6:7:8"
|
|
|
|
|
"1::8" "::2:3:4:5:6:7:8" "::2:3:4:5:6:7:8" "::8"
|
|
|
|
|
"::" "fe08::7:8%eth0" "fe08::7:8%1" "::255.255.255.255"
|
|
|
|
|
"::ffff:255.255.255.255" "::ffff:0:255.255.255.255"
|
|
|
|
|
"2001:db8:3:4::192.0.2.33" "64:ff9b::192.0.2.33"))
|
|
|
|
|
|
|
|
|
|
(ert-deftest erc--server-connect-dumb-ipv6-regexp ()
|
|
|
|
|
(dolist (a erc-tests--ipv6-examples)
|
|
|
|
|
(should-not (string-match erc--server-connect-dumb-ipv6-regexp a))
|
|
|
|
|
(should (string-match erc--server-connect-dumb-ipv6-regexp
|
|
|
|
|
(concat "[" a "]")))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest erc-select-read-args ()
|
|
|
|
|
|
|
|
|
|
(ert-info ("Defaults to TLS")
|
|
|
|
|
(should (equal (ert-simulate-keys "\r\r\r\r"
|
|
|
|
|
(erc-select-read-args))
|
|
|
|
|
(list :server "irc.libera.chat"
|
|
|
|
|
:port 6697
|
|
|
|
|
:nick (user-login-name)
|
|
|
|
|
:password nil))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Override default TLS")
|
|
|
|
|
(should (equal (ert-simulate-keys "irc://irc.libera.chat\r\r\r\r"
|
|
|
|
|
(erc-select-read-args))
|
|
|
|
|
(list :server "irc.libera.chat"
|
|
|
|
|
:port 6667
|
|
|
|
|
:nick (user-login-name)
|
|
|
|
|
:password nil))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Address includes port")
|
|
|
|
|
(should (equal (ert-simulate-keys
|
|
|
|
|
"localhost:6667\rnick\r\r"
|
|
|
|
|
(erc-select-read-args))
|
|
|
|
|
(list :server "localhost"
|
|
|
|
|
:port 6667
|
|
|
|
|
:nick "nick"
|
|
|
|
|
:password nil))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Address includes nick, password skipped via option")
|
|
|
|
|
(should (equal (ert-simulate-keys "nick@localhost:6667\r"
|
|
|
|
|
(let (erc-prompt-for-password)
|
|
|
|
|
(erc-select-read-args)))
|
|
|
|
|
(list :server "localhost"
|
|
|
|
|
:port 6667
|
|
|
|
|
:nick "nick"
|
|
|
|
|
:password nil))))
|
|
|
|
|
|
2022-11-18 15:48:22 +01:00
|
|
|
(ert-info ("Address includes nick and password")
|
2022-07-11 05:14:57 -07:00
|
|
|
(should (equal (ert-simulate-keys "nick:sesame@localhost:6667\r"
|
|
|
|
|
(erc-select-read-args))
|
|
|
|
|
(list :server "localhost"
|
|
|
|
|
:port 6667
|
|
|
|
|
:nick "nick"
|
|
|
|
|
:password "sesame"))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("IPv6 address plain")
|
|
|
|
|
(should (equal (ert-simulate-keys "::1\r\r\r\r"
|
|
|
|
|
(erc-select-read-args))
|
|
|
|
|
(list :server "[::1]"
|
|
|
|
|
:port 6667
|
|
|
|
|
:nick (user-login-name)
|
|
|
|
|
:password nil))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("IPv6 address with port")
|
|
|
|
|
(should (equal (ert-simulate-keys "[::1]:6667\r\r\r"
|
|
|
|
|
(erc-select-read-args))
|
|
|
|
|
(list :server "[::1]"
|
|
|
|
|
:port 6667
|
|
|
|
|
:nick (user-login-name)
|
|
|
|
|
:password nil))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("IPv6 address includes nick")
|
|
|
|
|
(should (equal (ert-simulate-keys "nick@[::1]:6667\r\r"
|
|
|
|
|
(erc-select-read-args))
|
|
|
|
|
(list :server "[::1]"
|
|
|
|
|
:port 6667
|
|
|
|
|
:nick "nick"
|
|
|
|
|
:password nil)))))
|
|
|
|
|
|
2022-07-11 05:14:57 -07:00
|
|
|
(ert-deftest erc-tls ()
|
|
|
|
|
(let (calls)
|
|
|
|
|
(cl-letf (((symbol-function 'user-login-name)
|
|
|
|
|
(lambda (&optional _) "tester"))
|
|
|
|
|
((symbol-function 'erc-open)
|
|
|
|
|
(lambda (&rest r) (push r calls))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Defaults")
|
|
|
|
|
(erc-tls)
|
|
|
|
|
(should (equal (pop calls)
|
|
|
|
|
'("irc.libera.chat" 6697 "tester" "unknown" t
|
|
|
|
|
nil nil nil nil nil "user" nil))))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Full")
|
|
|
|
|
(erc-tls :server "irc.gnu.org"
|
|
|
|
|
:port 7000
|
|
|
|
|
:user "bobo"
|
|
|
|
|
:nick "bob"
|
|
|
|
|
:full-name "Bob's Name"
|
|
|
|
|
:password "bob:changeme"
|
|
|
|
|
:client-certificate t
|
|
|
|
|
:id 'GNU.org)
|
|
|
|
|
(should (equal (pop calls)
|
|
|
|
|
'("irc.gnu.org" 7000 "bob" "Bob's Name" t
|
|
|
|
|
"bob:changeme" nil nil nil t "bobo" GNU.org))))
|
|
|
|
|
|
|
|
|
|
;; Values are often nil when called by lisp code, which leads to
|
|
|
|
|
;; null params. This is why `erc-open' recomputes almost
|
|
|
|
|
;; everything.
|
|
|
|
|
(ert-info ("Fallback")
|
|
|
|
|
(let ((erc-nick "bob")
|
|
|
|
|
(erc-server "irc.gnu.org")
|
|
|
|
|
(erc-email-userid "bobo")
|
|
|
|
|
(erc-user-full-name "Bob's Name"))
|
|
|
|
|
(erc-tls :server nil
|
|
|
|
|
:port 7000
|
|
|
|
|
:nick nil
|
|
|
|
|
:password "bob:changeme"))
|
|
|
|
|
(should (equal (pop calls)
|
|
|
|
|
'(nil 7000 nil "Bob's Name" t
|
|
|
|
|
"bob:changeme" nil nil nil nil "bobo" nil)))))))
|
|
|
|
|
|
2022-07-11 05:14:57 -07:00
|
|
|
(defun erc-tests--make-server-buf (name)
|
|
|
|
|
(with-current-buffer (get-buffer-create name)
|
|
|
|
|
(erc-mode)
|
|
|
|
|
(setq erc-server-process (start-process "sleep" (current-buffer)
|
|
|
|
|
"sleep" "1")
|
|
|
|
|
erc-session-server (concat "irc." name ".org")
|
|
|
|
|
erc-session-port 6667
|
|
|
|
|
erc-network (intern name))
|
|
|
|
|
(set-process-query-on-exit-flag erc-server-process nil)
|
|
|
|
|
(current-buffer)))
|
|
|
|
|
|
|
|
|
|
(defun erc-tests--make-client-buf (server name)
|
|
|
|
|
(unless (bufferp server)
|
|
|
|
|
(setq server (get-buffer server)))
|
|
|
|
|
(with-current-buffer (get-buffer-create name)
|
|
|
|
|
(erc-mode)
|
|
|
|
|
(setq erc--target (erc--target-from-string name))
|
|
|
|
|
(dolist (v '(erc-server-process
|
|
|
|
|
erc-session-server
|
|
|
|
|
erc-session-port
|
|
|
|
|
erc-network))
|
|
|
|
|
(set v (buffer-local-value v server)))
|
|
|
|
|
(current-buffer)))
|
|
|
|
|
|
|
|
|
|
(ert-deftest erc-handle-irc-url ()
|
|
|
|
|
(let* (calls
|
|
|
|
|
rvbuf
|
|
|
|
|
erc-networks-alist
|
|
|
|
|
erc-kill-channel-hook erc-kill-server-hook erc-kill-buffer-hook
|
|
|
|
|
(erc-url-connect-function
|
|
|
|
|
(lambda (&rest r)
|
|
|
|
|
(push r calls)
|
|
|
|
|
(if (functionp rvbuf) (funcall rvbuf) rvbuf))))
|
|
|
|
|
|
|
|
|
|
(cl-letf (((symbol-function 'erc-cmd-JOIN)
|
|
|
|
|
(lambda (&rest r) (push r calls))))
|
|
|
|
|
|
|
|
|
|
(with-current-buffer (erc-tests--make-server-buf "foonet")
|
|
|
|
|
(setq rvbuf (current-buffer)))
|
|
|
|
|
(erc-tests--make-server-buf "barnet")
|
|
|
|
|
(erc-tests--make-server-buf "baznet")
|
|
|
|
|
|
|
|
|
|
(ert-info ("Unknown network")
|
|
|
|
|
(erc-handle-irc-url "irc.foonet.org" 6667 "#chan" nil nil "irc")
|
|
|
|
|
(should (equal '("#chan" nil) (pop calls)))
|
|
|
|
|
(should-not calls))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Unknown network, no port")
|
|
|
|
|
(erc-handle-irc-url "irc.foonet.org" nil "#chan" nil nil "irc")
|
|
|
|
|
(should (equal '("#chan" nil) (pop calls)))
|
|
|
|
|
(should-not calls))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Known network, no port")
|
|
|
|
|
(setq erc-networks-alist '((foonet "irc.foonet.org")))
|
|
|
|
|
(erc-handle-irc-url "irc.foonet.org" nil "#chan" nil nil "irc")
|
|
|
|
|
(should (equal '("#chan" nil) (pop calls)))
|
|
|
|
|
(should-not calls))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Known network, different port")
|
|
|
|
|
(erc-handle-irc-url "irc.foonet.org" 6697 "#chan" nil nil "irc")
|
|
|
|
|
(should (equal '("#chan" nil) (pop calls)))
|
|
|
|
|
(should-not calls))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Known network, existing chan with key")
|
|
|
|
|
(erc-tests--make-client-buf "foonet" "#chan")
|
|
|
|
|
(erc-handle-irc-url "irc.foonet.org" nil "#chan?sec" nil nil "irc")
|
|
|
|
|
(should (equal '("#chan" "sec") (pop calls)))
|
|
|
|
|
(should-not calls))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Unknown network, connect, no chan")
|
|
|
|
|
(erc-handle-irc-url "irc.gnu.org" nil nil nil nil "irc")
|
|
|
|
|
(should (equal '("irc" :server "irc.gnu.org") (pop calls)))
|
|
|
|
|
(should-not calls))
|
|
|
|
|
|
|
|
|
|
(ert-info ("Unknown network, connect, chan")
|
|
|
|
|
(with-current-buffer "foonet"
|
|
|
|
|
(should-not (local-variable-p 'erc-after-connect)))
|
|
|
|
|
(setq rvbuf (lambda () (erc-tests--make-server-buf "gnu")))
|
|
|
|
|
(erc-handle-irc-url "irc.gnu.org" nil "#spam" nil nil "irc")
|
|
|
|
|
(should (equal '("irc" :server "irc.gnu.org") (pop calls)))
|
|
|
|
|
(should-not calls)
|
|
|
|
|
(with-current-buffer "gnu"
|
|
|
|
|
(should (local-variable-p 'erc-after-connect))
|
|
|
|
|
(funcall (car erc-after-connect))
|
|
|
|
|
(should (equal '("#spam" nil) (pop calls)))
|
|
|
|
|
(should-not (local-variable-p 'erc-after-connect)))
|
|
|
|
|
(should-not calls))))
|
|
|
|
|
|
|
|
|
|
(when noninteractive
|
|
|
|
|
(kill-buffer "foonet")
|
|
|
|
|
(kill-buffer "barnet")
|
|
|
|
|
(kill-buffer "baznet")
|
|
|
|
|
(kill-buffer "#chan")))
|
|
|
|
|
|
2021-09-26 01:53:56 +02:00
|
|
|
;;; erc-tests.el ends here
|