mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-04-22 05:51:11 -07:00
Add test for erc-cmd-SQUERY
* lisp/erc/erc-backend.el (erc-message): Revise doc string. * test/lisp/erc/erc-scenarios-base-misc-regressions.el (erc-cmd-MOTD): Move test to another file specifically for slash commands. * test/lisp/erc/erc-scenarios-misc-commands.el: New file. * test/lisp/erc/resources/base/commands/motd.eld: Move file elsewhere. * test/lisp/erc/resources/commands/motd.eld: "New" file, moved here reusing the same Git blob from now deleted subdir base/commands. * test/lisp/erc/resources/commands/squery.eld: New file. (Bug#67209)
This commit is contained in:
F. Jason Park
parent
64174ae148
commit
cc7e008dce
5 changed files with 129 additions and 46 deletions
|
|
@ -1284,8 +1284,10 @@ protection algorithm."
|
|||
nil #'erc-server-send-queue buffer)))))))
|
||||
|
||||
(defun erc-message (message-command line &optional force)
|
||||
"Send LINE to the server as a privmsg or a notice.
|
||||
MESSAGE-COMMAND should be either \"PRIVMSG\" or \"NOTICE\".
|
||||
"Send LINE, possibly expanding a target specifier beforehand.
|
||||
Expect MESSAGE-COMMAND to be an IRC command with a single
|
||||
positional target parameter followed by a trailing parameter.
|
||||
|
||||
If the target is \",\", the last person you've got a message from will
|
||||
be used. If the target is \".\", the last person you've sent a message
|
||||
to will be used."
|
||||
|
|
|
|||
|
|
@ -124,48 +124,4 @@ Originally from scenario rebuffed/gapless as explained in Bug#48598:
|
|||
(with-current-buffer (erc-d-t-wait-for 5 (get-buffer "#chan"))
|
||||
(erc-d-t-search-for 10 "and be prosperous")))))
|
||||
|
||||
;; This defends against a partial regression in which an /MOTD caused
|
||||
;; 376 and 422 handlers in erc-networks to run.
|
||||
|
||||
(ert-deftest erc-cmd-MOTD ()
|
||||
:tags '(:expensive-test)
|
||||
(erc-scenarios-common-with-cleanup
|
||||
((erc-scenarios-common-dialog "base/commands")
|
||||
(erc-server-flood-penalty 0.1)
|
||||
(dumb-server (erc-d-run "localhost" t 'motd))
|
||||
(port (process-contact dumb-server :service))
|
||||
(expect (erc-d-t-make-expecter)))
|
||||
|
||||
(ert-info ("Connect to server")
|
||||
(with-current-buffer (erc :server "127.0.0.1"
|
||||
:port port
|
||||
:nick "tester"
|
||||
:full-name "tester")
|
||||
(funcall expect 10 "This is the default Ergo MOTD")
|
||||
(funcall expect 10 "debug mode")))
|
||||
|
||||
(ert-info ("Send plain MOTD")
|
||||
(with-current-buffer "foonet"
|
||||
(erc-cmd-MOTD)
|
||||
(funcall expect -0.2 "Unexpected state detected")
|
||||
(funcall expect 10 "This is the default Ergo MOTD")))
|
||||
|
||||
(ert-info ("Send MOTD with known target")
|
||||
(with-current-buffer "foonet"
|
||||
(erc-scenarios-common-say "/MOTD irc1.foonet.org")
|
||||
(funcall expect -0.2 "Unexpected state detected")
|
||||
(funcall expect 10 "This is the default Ergo MOTD")))
|
||||
|
||||
(ert-info ("Send MOTD with erroneous target")
|
||||
(with-current-buffer "foonet"
|
||||
(erc-scenarios-common-say "/MOTD fake.foonet.org")
|
||||
(funcall expect -0.2 "Unexpected state detected")
|
||||
(funcall expect 10 "No such server")
|
||||
;; Message may show up before the handler runs.
|
||||
(erc-d-t-wait-for 10
|
||||
(not (local-variable-p 'erc-server-402-functions)))
|
||||
(should-not (local-variable-p 'erc-server-376-functions))
|
||||
(should-not (local-variable-p 'erc-server-422-functions))
|
||||
(erc-cmd-QUIT "")))))
|
||||
|
||||
;;; erc-scenarios-base-misc-regressions.el ends here
|
||||
|
|
|
|||
94
test/lisp/erc/erc-scenarios-misc-commands.el
Normal file
94
test/lisp/erc/erc-scenarios-misc-commands.el
Normal file
|
|
@ -0,0 +1,94 @@
|
|||
;;; erc-scenarios-misc-commands.el --- Misc commands for ERC -*- lexical-binding: t -*-
|
||||
|
||||
;; Copyright (C) 2023 Free Software Foundation, Inc.
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
|
||||
;; GNU Emacs is free software: you can redistribute it and/or modify
|
||||
;; it under the terms of the GNU General Public License as published by
|
||||
;; the Free Software Foundation, either version 3 of the License, or
|
||||
;; (at your option) any later version.
|
||||
|
||||
;; GNU Emacs is distributed in the hope that it will be useful,
|
||||
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;; GNU General Public License for more details.
|
||||
|
||||
;; You should have received a copy of the GNU General Public License
|
||||
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
;;; Code:
|
||||
|
||||
(require 'ert-x)
|
||||
(eval-and-compile
|
||||
(let ((load-path (cons (ert-resource-directory) load-path)))
|
||||
(require 'erc-scenarios-common)))
|
||||
|
||||
;; This defends against a partial regression in which an /MOTD caused
|
||||
;; 376 and 422 handlers in erc-networks to run.
|
||||
|
||||
(ert-deftest erc-scenarios-misc-commands--MOTD ()
|
||||
:tags '(:expensive-test)
|
||||
(erc-scenarios-common-with-cleanup
|
||||
((erc-scenarios-common-dialog "commands")
|
||||
(erc-server-flood-penalty 0.1)
|
||||
(dumb-server (erc-d-run "localhost" t 'motd))
|
||||
(port (process-contact dumb-server :service))
|
||||
(expect (erc-d-t-make-expecter)))
|
||||
|
||||
(ert-info ("Connect to server")
|
||||
(with-current-buffer (erc :server "127.0.0.1"
|
||||
:port port
|
||||
:nick "tester"
|
||||
:full-name "tester")
|
||||
(funcall expect 10 "This is the default Ergo MOTD")
|
||||
(funcall expect 10 "debug mode")))
|
||||
|
||||
(ert-info ("Send plain MOTD")
|
||||
(with-current-buffer "foonet"
|
||||
(erc-cmd-MOTD)
|
||||
(funcall expect -0.2 "Unexpected state detected")
|
||||
(funcall expect 10 "This is the default Ergo MOTD")))
|
||||
|
||||
(ert-info ("Send MOTD with known target")
|
||||
(with-current-buffer "foonet"
|
||||
(erc-scenarios-common-say "/MOTD irc1.foonet.org")
|
||||
(funcall expect -0.2 "Unexpected state detected")
|
||||
(funcall expect 10 "This is the default Ergo MOTD")))
|
||||
|
||||
(ert-info ("Send MOTD with erroneous target")
|
||||
(with-current-buffer "foonet"
|
||||
(erc-scenarios-common-say "/MOTD fake.foonet.org")
|
||||
(funcall expect -0.2 "Unexpected state detected")
|
||||
(funcall expect 10 "No such server")
|
||||
;; Message may show up before the handler runs.
|
||||
(erc-d-t-wait-for 10
|
||||
(not (local-variable-p 'erc-server-402-functions)))
|
||||
(should-not (local-variable-p 'erc-server-376-functions))
|
||||
(should-not (local-variable-p 'erc-server-422-functions))
|
||||
(erc-cmd-QUIT "")))))
|
||||
|
||||
|
||||
(ert-deftest erc-scenarios-misc-commands--SQUERY ()
|
||||
:tags '(:expensive-test)
|
||||
(erc-scenarios-common-with-cleanup
|
||||
((erc-scenarios-common-dialog "commands")
|
||||
(erc-server-flood-penalty 0.1)
|
||||
(dumb-server (erc-d-run "localhost" t 'squery))
|
||||
(port (process-contact dumb-server :service))
|
||||
(expect (erc-d-t-make-expecter)))
|
||||
|
||||
(ert-info ("Connect to server")
|
||||
(with-current-buffer (erc :server "127.0.0.1"
|
||||
:port port
|
||||
:nick "tester"
|
||||
:full-name "tester")
|
||||
(funcall expect 10 "Your connection is secure")))
|
||||
|
||||
(ert-info ("Send SQUERY")
|
||||
(with-current-buffer "IRCnet"
|
||||
(erc-scenarios-common-say "/SQUERY alis help list")
|
||||
(funcall expect -0.1 "Incorrect arguments")
|
||||
(funcall expect 10 "See also: HELP EXAMPLES")))))
|
||||
|
||||
;;; erc-scenarios-misc-commands.el ends here
|
||||
31
test/lisp/erc/resources/commands/squery.eld
Normal file
31
test/lisp/erc/resources/commands/squery.eld
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
;; -*- mode: lisp-data; -*-
|
||||
((nick 10 "NICK tester"))
|
||||
((user 10 "USER user 0 * :tester")
|
||||
(0.07 ":ircnet.hostsailor.com 020 * :Please wait while we process your connection.")
|
||||
(0.03 ":ircnet.hostsailor.com 001 tester :Welcome to the Internet Relay Network tester!~user@93.184.216.34")
|
||||
(0.02 ":ircnet.hostsailor.com 002 tester :Your host is ircnet.hostsailor.com, running version 2.11.2p3+0PNv1.06")
|
||||
(0.03 ":ircnet.hostsailor.com 003 tester :This server was created Thu May 20 2021 at 17:13:24 EDT")
|
||||
(0.01 ":ircnet.hostsailor.com 004 tester ircnet.hostsailor.com 2.11.2p3+0PNv1.06 aoOirw abeiIklmnoOpqrRstv")
|
||||
(0.00 ":ircnet.hostsailor.com 005 tester RFC2812 PREFIX=(ov)@+ CHANTYPES=#&!+ MODES=3 CHANLIMIT=#&!+:42 NICKLEN=15 TOPICLEN=255 KICKLEN=255 MAXLIST=beIR:64 CHANNELLEN=50 IDCHAN=!:5 CHANMODES=beIR,k,l,imnpstaqrzZ :are supported by this server")
|
||||
(0.01 ":ircnet.hostsailor.com 005 tester PENALTY FNC EXCEPTS=e INVEX=I CASEMAPPING=ascii NETWORK=IRCnet :are supported by this server")
|
||||
(0.01 ":ircnet.hostsailor.com 042 tester 0PNHANAWX :your unique ID")
|
||||
(0.01 ":ircnet.hostsailor.com 251 tester :There are 18711 users and 2 services on 26 servers")
|
||||
(0.01 ":ircnet.hostsailor.com 252 tester 63 :operators online")
|
||||
(0.01 ":ircnet.hostsailor.com 253 tester 4 :unknown connections")
|
||||
(0.01 ":ircnet.hostsailor.com 254 tester 10493 :channels formed")
|
||||
(0.01 ":ircnet.hostsailor.com 255 tester :I have 933 users, 0 services and 1 servers")
|
||||
(0.01 ":ircnet.hostsailor.com 265 tester 933 1328 :Current local users 933, max 1328")
|
||||
(0.01 ":ircnet.hostsailor.com 266 tester 18711 25625 :Current global users 18711, max 25625")
|
||||
(0.02 ":ircnet.hostsailor.com 375 tester :- ircnet.hostsailor.com Message of the Day - ")
|
||||
(0.01 ":ircnet.hostsailor.com 372 tester :- 17/11/2023 3:08")
|
||||
(0.02 ":ircnet.hostsailor.com 376 tester :End of MOTD command."))
|
||||
|
||||
((mode 10 "MODE tester +i")
|
||||
(0.00 ":ircnet.hostsailor.com NOTICE tester :Your connection is secure (SSL/TLS).")
|
||||
(0.01 ":tester MODE tester :+i"))
|
||||
|
||||
((squery 10 "SQUERY alis :help list")
|
||||
(0.08 ":Alis@hub.uk NOTICE tester :Searches for a channel")
|
||||
(0.01 ":Alis@hub.uk NOTICE tester :/SQUERY Alis LIST mask [-options]")
|
||||
(0.04 ":Alis@hub.uk NOTICE tester :[...]")
|
||||
(0.01 ":Alis@hub.uk NOTICE tester :See also: HELP EXAMPLES"))
|
||||
Loading…
Add table
Add a link
Reference in a new issue