diff options
Diffstat (limited to 'test/lisp')
| -rw-r--r-- | test/lisp/erc/erc-networks-tests.el | 7 | ||||
| -rw-r--r-- | test/lisp/erc/erc-scenarios-misc.el | 5 | ||||
| -rw-r--r-- | test/lisp/erc/resources/networks/announced-missing/foonet.eld | 3 |
3 files changed, 5 insertions, 10 deletions
diff --git a/test/lisp/erc/erc-networks-tests.el b/test/lisp/erc/erc-networks-tests.el index fc12bf7ce37..e883174e28a 100644 --- a/test/lisp/erc/erc-networks-tests.el +++ b/test/lisp/erc/erc-networks-tests.el @@ -1171,6 +1171,8 @@ (let (erc-server-announced-name (erc--isupport-params (make-hash-table)) erc-network + erc-quit-hook + (erc-server-process (erc-networks-tests--create-live-proc)) calls) (erc-mode) @@ -1183,10 +1185,7 @@ (ert-info ("Signals when table empty and NETWORK param unset") (setq erc-server-announced-name "irc.fake.gnu.org") - (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 (eq 'error (erc-networks--set-name nil (make-erc-response)))) (should (string-match-p (rx "*** Failed") (car (pop calls))))))) (erc-networks-tests--clean-bufs))) diff --git a/test/lisp/erc/erc-scenarios-misc.el b/test/lisp/erc/erc-scenarios-misc.el index 3fa05ee8a60..f1696088a48 100644 --- a/test/lisp/erc/erc-scenarios-misc.el +++ b/test/lisp/erc/erc-scenarios-misc.el @@ -98,11 +98,10 @@ :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) + (funcall expect 1 "Connection failed") + (should (string-prefix-p "Unknown" (erc-network-name))) (should (string= erc-server-announced-name "irc.foonet.org")))))) ;; Targets that are host/server masks like $*, $$*, and #* are routed diff --git a/test/lisp/erc/resources/networks/announced-missing/foonet.eld b/test/lisp/erc/resources/networks/announced-missing/foonet.eld index 79b0fb462a8..4481f27663d 100644 --- a/test/lisp/erc/resources/networks/announced-missing/foonet.eld +++ b/test/lisp/erc/resources/networks/announced-missing/foonet.eld @@ -3,6 +3,3 @@ ((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")) |