mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity
emacs/test/lisp/erc/erc-services-tests.el
Sean Whitton 8903106bb7 Mark if-let and when-let obsolete 
* lisp/subr.el (if-let*, when-let*, if-let, when-let): Mark
if-let and when-let obsolete (bug#73853 and elsewhere).  Move
docstring text around so that if-let* and when-let* descriptions
no longer refer to if-let and when-let.

* etc/NEWS: Announce the change.

* admin/admin.el (reminder-for-release-blocking-bugs):
* doc/misc/erc.texi (display-buffer):
* lisp/ansi-color.el (ansi-color-apply)
(ansi-color--face-vec-face):
* lisp/ansi-osc.el (ansi-osc-apply-on-region)
(ansi-osc-hyperlink):
* lisp/arc-mode.el (archive-goto-file)
(archive-next-file-displayer):
* lisp/auth-source-pass.el (auth-source-pass-search)
(auth-source-pass--parse-data)
(auth-source-pass--find-match-many):
* lisp/autorevert.el (auto-revert-notify-rm-watch):
* lisp/buff-menu.el (Buffer-menu-unmark-all-buffers)
(Buffer-menu-group-by-root):
* lisp/calendar/parse-time.el (parse-iso8601-time-string):
* lisp/cedet/pulse.el (pulse-tick):
* lisp/comint.el (comint--fontify-input-ppss-flush-indirect)
(comint--intersect-regions):
* lisp/completion-preview.el (completion-preview--try-table)
(completion-preview--capf-wrapper, completion-preview--update):
* lisp/cus-edit.el (setopt--set)
(custom-dirlocals-maybe-update-cons, custom-dirlocals-validate):
* lisp/custom.el (load-theme):
* lisp/descr-text.el (describe-char):
* lisp/desktop.el (desktop--emacs-pid-running-p):
* lisp/dired-x.el (menu):
* lisp/dired.el (dired-font-lock-keywords)
(dired-insert-directory, dired--insert-disk-space, dired-mode):
* lisp/dnd.el (dnd-handle-multiple-urls):
* lisp/dom.el (dom-remove-attribute):
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker):
* lisp/emacs-lisp/bytecomp.el (bytecomp--custom-declare):
* lisp/emacs-lisp/comp-common.el (comp-function-type-spec):
* lisp/emacs-lisp/comp-cstr.el (comp--all-classes)
(comp-cstr-set-range-for-arithm, comp--cstr-union-1-no-mem)
(comp-cstr-intersection-no-mem, comp-cstr-fixnum-p)
(comp-cstr-type-p):
* lisp/emacs-lisp/comp-run.el (comp-subr-trampoline-install)
(native--compile-async):
* lisp/emacs-lisp/comp.el (comp--get-function-cstr)
(comp--function-pure-p, comp--intern-func-in-ctxt)
(comp--addr-to-bb-name, comp--emit-assume, comp--maybe-add-vmvar)
(comp--add-call-cstr, comp--compute-dominator-tree)
(comp--dom-tree-walker, comp--ssa-rename)
(comp--function-call-maybe-fold, comp--fwprop-call)
(comp--call-optim-func):
* lisp/emacs-lisp/edebug.el (edebug-global-prefix)
(edebug-remove-instrumentation):
* lisp/emacs-lisp/eieio.el (initialize-instance):
* lisp/emacs-lisp/ert-x.el (ert-resource-directory):
* lisp/emacs-lisp/ert.el (ert--expand-should-1)
(ert-test-location, ert-write-junit-test-report)
(ert-test--erts-test):
* lisp/emacs-lisp/icons.el (icon-complete-spec, icon-string)
(icons--create):
* lisp/emacs-lisp/lisp-mode.el (lisp--local-defform-body-p):
* lisp/emacs-lisp/loaddefs-gen.el
(loaddefs-generate--make-autoload)
(loaddefs-generate--parse-file):
* lisp/emacs-lisp/multisession.el
(multisession-edit-mode--revert, multisession-edit-value):
* lisp/emacs-lisp/package-vc.el (package-vc--read-archive-data)
(package-vc--version, package-vc--clone):
* lisp/emacs-lisp/package.el (package--reload-previously-loaded):
* lisp/emacs-lisp/pp.el (pp--insert-lisp):
* lisp/emacs-lisp/subr-x.el (add-display-text-property):
* lisp/emacs-lisp/tabulated-list.el (tabulated-list-print):
* lisp/emacs-lisp/timer.el (run-at-time):
* lisp/emacs-lisp/vtable.el (vtable-goto-table)
(vtable-goto-column, vtable-update-object, vtable--insert-line)
(vtable--compute-widths, vtable--make-keymap):
* lisp/emacs-lisp/warnings.el (display-warning):
* lisp/epa-file.el (epa-file-insert-file-contents):
* lisp/epa.el (epa-show-key):
* lisp/erc/erc-backend.el (erc--split-line, erc--conceal-prompt)
(PRIVMSG, erc--get-isupport-entry):
* lisp/erc/erc-button.el (erc-button-add-nickname-buttons)
(erc--button-next):
* lisp/erc/erc-common.el (erc--find-group):
* lisp/erc/erc-fill.el (erc-fill, erc-fill-static)
(erc-fill--wrap-escape-hidden-speaker)
(erc-fill--wrap-unmerge-on-date-stamp)
(erc-fill--wrap-massage-initial-message-post-clear)
(erc-fill-wrap, erc-fill--wrap-rejigger-region):
* lisp/erc/erc-goodies.el (erc--scrolltobottom-all)
(erc--keep-place-indicator-on-window-buffer-change)
(keep-place-indicator, erc--keep-place-indicator-adjust-on-clear)
(erc-keep-place-move, erc--command-indicator-display):
* lisp/erc/erc-ibuffer.el (erc-members):
* lisp/erc/erc-join.el (erc-join--remove-requested-channel)
(erc-autojoin--join):
* lisp/erc/erc-networks.el
(erc-networks--id-qualifying-init-parts, erc-networks--id-reload)
(erc-networks--id-ensure-comparable)
(erc-networks--reclaim-orphaned-target-buffers)
(erc-networks--server-select):
* lisp/erc/erc-nicks.el (erc-nicks-invert)
(erc-nicks--redirect-face-widget-link, erc-nicks--highlight)
(erc-nicks--highlight-button)
(erc-nicks--list-faces-help-button-action, erc-nicks-list-faces)
(erc-nicks-refresh, erc-nicks--colors-from-faces)
(erc-nicks--track-prioritize)
(erc-nicks--remember-face-for-track):
* lisp/erc/erc-notify.el (querypoll, erc--querypoll-get-next)
(erc--querypoll-on-352, erc--querypoll-send):
* lisp/erc/erc-sasl.el (erc-sasl--read-password):
* lisp/erc/erc-services.el
(erc-services-issue-ghost-and-retry-nick):
* lisp/erc/erc-speedbar.el (erc-speedbar--ensure, nickbar)
(erc-speedbar-toggle-nicknames-window-lock)
(erc-speedbar--compose-nicks-face):
* lisp/erc/erc-stamp.el (erc-stamp--recover-on-reconnect)
(erc-stamp-prefix-log-filter, erc--conceal-prompt)
(erc--insert-timestamp-left, erc-insert-timestamp-right)
(erc-stamp--defer-date-insertion-on-post-modify)
(erc-insert-timestamp-left-and-right)
(erc-stamp--redo-right-stamp-post-clear)
(erc-stamp--reset-on-clear, erc-stamp--dedupe-date-stamps):
* lisp/erc/erc-status-sidebar.el (bufbar)
(erc-status-sidebar-prefer-target-as-name)
(erc-status-sidebar-default-allsort, erc-status-sidebar-click):
* lisp/erc/erc-track.el (erc-track--shortened-names-get)
(erc-track--setup, erc-track--select-mode-line-face)
(erc-track-modified-channels, erc-track--collect-faces-in)
(erc-track--switch-buffer, erc-track--replace-killed-buffer):
* lisp/erc/erc-truncate.el (erc-truncate--setup)
(erc-truncate-buffer):
* lisp/erc/erc.el (erc--ensure-query-member)
(erc--ensure-query-members, erc--remove-channel-users-but)
(erc--cusr-change-status, erc--find-mode, erc--update-modules)
(erc-log-irc-protocol, erc--refresh-prompt)
(erc--restore-important-text-props)
(erc--order-text-properties-from-hash, erc-send-input-line)
(erc-cmd-IGNORE, erc--unignore-user, erc-cmd-QUERY)
(erc-cmd-BANLIST, erc--speakerize-nick)
(erc--format-speaker-input-message, erc-channel-receive-names)
(erc-send-current-line, erc-format-target-and/or-network)
(erc-kill-buffer-function, erc-restore-text-properties)
(erc--get-eq-comparable-cmd):
* lisp/eshell/em-alias.el (eshell-maybe-replace-by-alias--which)
(eshell-maybe-replace-by-alias):
* lisp/eshell/em-glob.el (eshell-glob-convert):
* lisp/eshell/em-pred.el (eshell-pred-user-or-group)
(eshell-pred-file-time, eshell-pred-file-type)
(eshell-pred-file-mode, eshell-pred-file-links)
(eshell-pred-file-size):
* lisp/eshell/em-prompt.el (eshell-forward-paragraph)
(eshell-next-prompt):
* lisp/eshell/esh-arg.el (eshell-resolve-current-argument):
* lisp/eshell/esh-cmd.el (eshell-do-eval, eshell/which)
(eshell-plain-command--which, eshell-plain-command):
* lisp/eshell/esh-io.el (eshell-duplicate-handles)
(eshell-protect-handles, eshell-get-target, eshell-close-target):
* lisp/eshell/esh-proc.el (eshell-sentinel):
* lisp/eshell/esh-var.el (eshell-parse-variable-ref)
(eshell-get-variable, eshell-set-variable):
* lisp/faces.el (face-at-point):
* lisp/ffap.el (ffap-in-project):
* lisp/filenotify.el (file-notify--rm-descriptor):
* lisp/files-x.el (read-dir-locals-file)
(connection-local-update-profile-variables)
(connection-local-value):
* lisp/files.el (file-remote-p, abbreviate-file-name)
(set-auto-mode, hack-local-variables)
(revert-buffer-restore-read-only):
* lisp/find-dired.el (find-dired-sort-by-filename):
* lisp/font-lock.el (font-lock--filter-keywords):
* lisp/gnus/gnus-art.el (article-emojize-symbols):
* lisp/gnus/gnus-int.el (gnus-close-server):
* lisp/gnus/gnus-search.el (gnus-search-transform)
(gnus-search-indexed-parse-output, gnus-search-server-to-engine):
* lisp/gnus/gnus-sum.el (gnus-collect-urls, gnus-shorten-url):
* lisp/gnus/gnus.el (gnus-check-backend-function):
* lisp/gnus/message.el (message-send-mail):
* lisp/gnus/mml.el (mml-generate-mime, mml-insert-mime-headers):
* lisp/gnus/nnatom.el (nnatom--read-feed, nnatom--read-article)
(nnatom--read-article-or-group-authors, nnatom--read-publish)
(nnatom--read-update, nnatom--read-links):
* lisp/gnus/nnfeed.el (nnfeed--read-server, nnfeed--write-server)
(nnfeed--parse-feed, nnfeed--group-data, nnfeed-retrieve-article)
(nnfeed-retrieve-headers, nnfeed--print-part)
(nnfeed-request-article, nnfeed-request-group)
(nnfeed-request-list, nnfeed--group-description)
(nnfeed-request-group-description)
(nnfeed-request-list-newsgroups, nnfeed-request-rename-group):
* lisp/gnus/nnmh.el (nnmh-update-gnus-unreads):
* lisp/help-fns.el (help-find-source)
(help-fns--insert-menu-bindings, help-fns--mention-first-release)
(help-fns--mention-shortdoc-groups)
(help-fns--customize-variable-version)
(help-fns--face-custom-version-info, describe-mode):
* lisp/help-mode.el (help-make-xrefs):
* lisp/help.el (help-key-description, help--describe-command):
* lisp/hfy-cmap.el (htmlfontify-load-rgb-file):
* lisp/ibuf-ext.el (ibuffer-jump-to-filter-group)
(ibuffer-kill-filter-group, ibuffer-kill-line)
(ibuffer-save-filter-groups, ibuffer-save-filters, filename)
(basename, file-extension, ibuffer-diff-buffer-with-file-1)
(ibuffer-mark-by-file-name-regexp)
(ibuffer-mark-by-content-regexp):
* lisp/ibuf-macs.el (ibuffer-aif, ibuffer-awhen):
* lisp/ibuffer.el (ibuffer-mouse-toggle-mark)
(ibuffer-toggle-marks, ibuffer-mark-interactive)
(ibuffer-compile-format, process, ibuffer-map-lines):
* lisp/image.el (image--compute-map)
(image--compute-original-map):
* lisp/image/exif.el (exif-parse-buffer):
* lisp/image/image-converter.el (image-convert-p, image-convert)
(image-converter--find-converter):
* lisp/image/image-dired-util.el
(image-dired-file-name-at-point):
* lisp/image/image-dired.el (image-dired-track-original-file)
(image-dired--on-file-in-dired-buffer)
(image-dired--with-thumbnail-buffer)
(image-dired-jump-original-dired-buffer)
(image-dired--slideshow-step, image-dired-display-image):
* lisp/image/wallpaper.el (wallpaper--init-action-kill)
(wallpaper--find-setter, wallpaper--find-command)
(wallpaper--find-command-args, wallpaper--x-monitor-name):
* lisp/info-look.el (info-lookup-interactive-arguments)
(info-complete)::(:mode):
* lisp/info.el (info-pop-to-buffer, Info-read-node-name-1):
* lisp/international/emoji.el (emoji--adjust-displayable-1)
(emoji--add-recent):
* lisp/jsonrpc.el (jsonrpc--call-deferred)
(jsonrpc--process-sentinel, jsonrpc--remove):
* lisp/keymap.el (keymap-local-lookup):
* lisp/mail/emacsbug.el (report-emacs-bug-hook)
(submit-emacs-patch):
* lisp/mail/ietf-drums.el (ietf-drums-parse-addresses):
* lisp/mail/mailclient.el (mailclient-send-it):
* lisp/mail/rfc6068.el (rfc6068-parse-mailto-url):
* lisp/mail/undigest.el (rmail-digest-parse-mixed-mime):
* lisp/minibuffer.el (completion-metadata-get)
(completions--after-change)
(minibuffer-visible-completions--filter):
* lisp/net/browse-url.el (browse-url-url-at-point)
(browse-url-file-url, browse-url-emacs):
* lisp/net/dbus.el (dbus-byte-array-to-string)
(dbus-monitor-goto-serial):
* lisp/net/dictionary.el (dictionary-search):
* lisp/net/eww.el (eww--download-directory)
(eww-auto-rename-buffer, eww-open-in-new-buffer, eww-submit)
(eww-follow-link, eww-read-alternate-url)
(eww-copy-alternate-url):
* lisp/net/goto-addr.el (goto-address-at-point):
* lisp/net/mailcap.el (mailcap-mime-info):
* lisp/net/rcirc.el (rcirc, rcirc-connect, rcirc-send-string)
(rcirc-kill-buffer-hook, rcirc-print, rcirc-when)
(rcirc-color-attributes, rcirc-handler-NICK)
(rcirc-handler-TAGMSG, rcirc-handler-BATCH):
* lisp/net/shr.el (shr-descend, shr-adaptive-fill-function)
(shr-correct-dom-case, shr-tag-a):
* lisp/net/sieve.el (sieve-manage-quit):
* lisp/outline.el (outline-cycle-buffer):
* lisp/pcmpl-git.el (pcmpl-git--tracked-file-predicate):
* lisp/proced.el (proced-auto-update-timer):
* lisp/progmodes/bug-reference.el
(bug-reference-try-setup-from-vc):
* lisp/progmodes/c-ts-common.el (c-ts-common--fill-paragraph):
* lisp/progmodes/c-ts-mode.el (c-ts-mode--preproc-offset)
(c-ts-mode--anchor-prev-sibling, c-ts-mode-indent-defun):
* lisp/progmodes/compile.el (compilation-error-properties)
(compilation-find-file-1):
* lisp/progmodes/eglot.el (eglot--check-object)
(eglot--read-server, eglot-upgrade-eglot)
(eglot-handle-notification, eglot--CompletionParams)
(eglot-completion-at-point, eglot--sig-info)
(eglot-register-capability):
* lisp/progmodes/elisp-mode.el
(emacs-lisp-native-compile-and-load)
(elisp-eldoc-var-docstring-with-value):
* lisp/progmodes/erts-mode.el (erts-mode--goto-start-of-test):
* lisp/progmodes/flymake.el (flymake--update-eol-overlays)
(flymake-eldoc-function):
* lisp/progmodes/gdb-mi.el (gdb-breakpoints-list-handler-custom)
(gdb-frame-handler):
* lisp/progmodes/go-ts-mode.el (go-ts-mode-docstring)
(go-ts-mode--comment-on-previous-line-p)
(go-ts-mode--get-test-regexp-at-point)
(go-ts-mode-test-this-file):
* lisp/progmodes/grep.el (lgrep, rgrep-default-command)
(grep-file-at-point):
* lisp/progmodes/perl-mode.el (perl--end-of-format-p):
* lisp/progmodes/php-ts-mode.el
(php-ts-mode--anchor-prev-sibling, php-ts-mode--indent-defun):
* lisp/progmodes/project.el (project--other-place-command)
(project--find-default-from, project--transplant-file-name)
(project-prefixed-buffer-name, project--remove-from-project-list)
(project-prompt-project-name, project-remember-projects-under)
(project--switch-project-command)
(project-uniquify-dirname-transform, project-mode-line-format):
* lisp/progmodes/python.el
(python-font-lock-keywords-maximum-decoration)
(python--treesit-fontify-union-types)
(python-shell-get-process-name, python-shell-restart)
(python-shell-completion-at-point, python-ffap-module-path)
(python-util-comint-end-of-output-p, python--import-sources)
(python-add-import, python-remove-import, python-fix-imports):
* lisp/progmodes/xref.el (xref--add-log-current-defun):
* lisp/repeat.el (repeat-echo-message-string):
* lisp/saveplace.el (save-place-dired-hook):
* lisp/server.el (server-save-buffers-kill-terminal):
* lisp/shadowfile.el (shadow-make-fullname)
(shadow-contract-file-name, shadow-define-literal-group):
* lisp/shell.el (shell-highlight-undef-mode):
* lisp/simple.el (command-completion-using-modes-p)
(command-execute, file-user-uid, file-group-gid)
(first-completion, last-completion, switch-to-completions):
* lisp/startup.el (startup--load-user-init-file):
* lisp/tab-line.el (tab-line-tabs-buffer-group-by-project):
* lisp/tar-mode.el (tar-goto-file, tar-next-file-displayer):
* lisp/term/android-win.el (android-encode-select-string)
(gui-backend-set-selection):
* lisp/term/haiku-win.el (haiku-dnd-convert-string)
(haiku-select-encode-xstring, haiku-select-encode-utf-8-string):
* lisp/textmodes/emacs-news-mode.el (emacs-news--buttonize):
* lisp/textmodes/ispell.el (ispell-completion-at-point):
* lisp/textmodes/sgml-mode.el (sgml-validate)
(html-mode--complete-at-point):
* lisp/textmodes/tex-mode.el (tex-recenter-output-buffer)
(xref-backend-references):
* lisp/thingatpt.el (thing-at-point-file-at-point)
(thing-at-point-face-at-point):
* lisp/thread.el (thread-list--get-status):
* lisp/time.el (world-clock-copy-time-as-kill, world-clock):
* lisp/touch-screen.el (touch-screen-handle-touch):
* lisp/treesit.el (treesit-language-at, treesit-node-at)
(treesit-node-on, treesit-buffer-root-node)
(treesit-node-field-name, treesit-local-parsers-at)
(treesit-local-parsers-on, treesit--cleanup-local-range-overlays)
(treesit-font-lock-recompute-features)
(treesit-font-lock-fontify-region, treesit-transpose-sexps)
(treesit-add-log-current-defun, treesit-major-mode-setup)
(treesit--explorer-refresh, treesit-install-language-grammar):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/vc/smerge-mode.el (smerge-diff):
* lisp/vc/vc-dir.el (vc-dir):
* lisp/vc/vc-dispatcher.el (vc-do-async-command):
* lisp/vc/vc-git.el (vc-git-dir--branch-headers)
(vc-git-dir--stash-headers, vc-git--log-edit-summary-check)
(vc-git-stash-list):
* lisp/vc/vc.el (vc-responsible-backend, vc-buffer-sync-fileset)
(vc-clone):
* lisp/visual-wrap.el (visual-wrap--apply-to-line):
* lisp/wid-edit.el (widget-text)
(widget-editable-list-insert-before):
* lisp/window-tool-bar.el
(window-tool-bar--keymap-entry-to-string):
* lisp/window.el (display-buffer, display-buffer-full-frame)
(window-point-context-set, window-point-context-use)
(window-point-context-use-default-function):
* lisp/xdg.el (xdg-current-desktop):
* lisp/xwidget.el (xwidget-webkit-callback):
* lisp/yank-media.el (yank-media--get-selection)
(yank-media-types):
* test/lisp/comint-tests.el
(comint-tests/test-password-function):
* test/lisp/completion-preview-tests.el
(completion-preview-tests--capf):
* test/lisp/cus-edit-tests.el (with-cus-edit-test):
* test/lisp/erc/erc-scenarios-base-local-modules.el
(-phony-sblm-):
* test/lisp/erc/erc-scenarios-stamp.el
(erc-scenarios-stamp--on-post-modify):
* test/lisp/erc/erc-services-tests.el
(erc-services-tests--asp-parse-entry):
* test/lisp/erc/erc-tests.el (erc-modules--internal-property)
(erc--find-mode, erc-tests--update-modules):
* test/lisp/erc/resources/erc-d/erc-d-i.el
(erc-d-i--parse-message):
* test/lisp/erc/resources/erc-d/erc-d-t.el
(erc-d-t-kill-related-buffers, erc-d-t-with-cleanup):
* test/lisp/erc/resources/erc-d/erc-d-tests.el
(erc-d-i--parse-message--irc-parser-tests):
* test/lisp/erc/resources/erc-d/erc-d-u.el
(erc-d-u--read-exchange-slowly):
* test/lisp/erc/resources/erc-d/erc-d.el (erc-d--expire)
(erc-d--finalize-done, erc-d--command-handle-all):
* test/lisp/erc/resources/erc-scenarios-common.el
(erc-scenarios-common-with-cleanup):
* test/lisp/erc/resources/erc-tests-common.el
(erc-tests--common-display-message)
(erc-tests-common-create-subprocess):
* test/lisp/ibuffer-tests.el (ibuffer-test-Bug25058):
* test/lisp/international/mule-tests.el
(mule-cmds-tests--ucs-names-missing-names):
* test/lisp/progmodes/python-tests.el
(python-tests-get-shell-interpreter)
(python-tests--get-interpreter-info):
* test/lisp/progmodes/ruby-ts-mode-tests.el
(ruby-ts-resource-file):
* test/lisp/replace-tests.el (replace-tests-with-undo):
* test/src/emacs-tests.el (emacs-tests--seccomp-debug):
* test/src/process-tests.el (process-tests--emacs-command)
(process-tests--emacs-binary, process-tests--dump-file):
* test/src/treesit-tests.el (treesit--ert-test-defun-navigation):
Replace use of the now-obsolete if-let and when-let.
2024-10-24 16:50:07 +08:00

585 lines
23 KiB
EmacsLisp
Raw Blame History

;;; erc-services-tests.el --- Tests for erc-services. -*- lexical-binding:t -*-
;; Copyright (C) 2020-2024 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/>.
;;; Commentary:
;; TODO: move the auth-source tests somewhere else. They've been
;; stashed here for pragmatic reasons.
;;; Code:
(require 'ert-x)
(require 'erc-services)
(require 'erc-compat)
(require 'secrets)
;;;; Core auth-source
(ert-deftest erc--auth-source-determine-params-merge ()
(let ((erc-session-server "irc.gnu.org")
(erc-server-announced-name "my.gnu.org")
(erc-session-port 6697)
(erc-network 'fake)
(erc-server-current-nick "tester")
(erc-networks--id (erc-networks--id-create 'GNU.chat)))
(should (equal (erc--auth-source-determine-params-merge)
'(:host ("GNU.chat" "my.gnu.org" "irc.gnu.org")
:port ("6697" "irc")
:require (:secret))))
(should (equal (erc--auth-source-determine-params-merge :host "fake")
'(:host ("fake" "GNU.chat" "my.gnu.org" "irc.gnu.org")
:port ("6697" "irc")
:require (:secret))))
(should (equal (erc--auth-source-determine-params-merge
:host '("fake") :require :host)
'(:host ("fake" "GNU.chat" "my.gnu.org" "irc.gnu.org")
:require (:host :secret)
:port ("6697" "irc"))))
(should (equal (erc--auth-source-determine-params-merge
:host '("fake" "GNU.chat") :port "1234" :x "x")
'(:host ("fake" "GNU.chat" "my.gnu.org" "irc.gnu.org")
:port ("1234" "6697" "irc")
:x ("x")
:require (:secret))))))
(defun erc-services-tests--wrap-search (s)
(lambda (&rest r) (erc--unfun (apply s r))))
;; Some of the following may be related to bug#23438.
(defun erc-services-tests--auth-source-standard (search)
(setq search (erc-services-tests--wrap-search search))
(ert-info ("Session ID wins")
(let ((erc-session-server "irc.gnu.org")
(erc-server-announced-name "my.gnu.org")
(erc-session-port 6697)
(erc-network 'fake)
(erc-server-current-nick "tester")
(erc-networks--id (erc-networks--id-create 'GNU.chat)))
(should (string= (funcall search :user "#chan") "foo"))))
(ert-info ("Network wins")
(let* ((erc-session-server "irc.gnu.org")
(erc-server-announced-name "my.gnu.org")
(erc-session-port 6697)
(erc-network 'GNU.chat)
(erc-server-current-nick "tester")
(erc-networks--id (erc-networks--id-create nil)))
(should (string= (funcall search :user "#chan") "foo"))))
(ert-info ("Announced wins")
(let ((erc-session-server "irc.gnu.org")
(erc-server-announced-name "my.gnu.org")
(erc-session-port 6697)
(erc-networks--id (erc-networks--id-create nil)))
(should (string= (funcall search :user "#chan") "baz"))))
(ert-info ("Dialed wins")
(let ((erc-session-server "irc.gnu.org")
(erc-session-port 6697)
(erc-networks--id (erc-networks--id-create nil)))
(should (string= (funcall search :user "#chan") "bar")))))
(defun erc-services-tests--auth-source-announced (search)
(setq search (erc-services-tests--wrap-search search))
(let* ((erc--isupport-params (make-hash-table))
(erc-server-parameters '(("CHANTYPES" . "&#")))
(erc--target (erc--target-from-string "&chan")))
;; Pretend #chan is just some account name and not a channel.
(ert-info ("Host priorities reversed when target is local")
(ert-info ("Announced wins")
(let* ((erc-session-server "irc.gnu.org")
(erc-server-announced-name "my.gnu.org")
(erc-session-port 6697)
(erc-network 'GNU.chat)
(erc-server-current-nick "tester")
(erc-networks--id (erc-networks--id-create nil)))
(should (string= (funcall search :user "#chan") "baz"))))
(ert-info ("Dialed next")
(let* ((erc-server-announced-name "irc.gnu.org")
(erc-session-port 6697)
(erc-network 'GNU.chat)
(erc-server-current-nick "tester")
(erc-networks--id (erc-networks--id-create nil)))
(should (string= (funcall search :user "#chan") "bar"))))
(ert-info ("Network used as fallback")
(let* ((erc-session-port 6697)
(erc-network 'GNU.chat)
(erc-server-current-nick "tester")
(erc-networks--id (erc-networks--id-create nil)))
(should (string= (funcall search :user "#chan") "foo")))))))
(defun erc-services-tests--auth-source-overrides (search)
(setq search (erc-services-tests--wrap-search search))
(let* ((erc-session-server "irc.gnu.org")
(erc-server-announced-name "my.gnu.org")
(erc-network 'GNU.chat)
(erc-server-current-nick "tester")
(erc-networks--id (erc-networks--id-create nil))
(erc-session-port 6667))
(ert-info ("Specificity and overrides")
(ert-info ("More specific port")
(let ((erc-session-port 6697))
(should (string= (funcall search :user "#chan") "spam"))))
(ert-info ("More specific user (network loses)")
(should (string= (funcall search :user '("#fsf")) "42")))
(ert-info ("Actual override")
(should (string= (funcall search :port "6667") "sesame")))
(ert-info ("Overrides don't interfere with post-processing")
(should (string= (funcall search :host "MyHost") "123"))))))
;; auth-source netrc backend
(defvar erc-services-tests--auth-source-entries
'("machine irc.gnu.org port irc user \"#chan\" password bar"
"machine my.gnu.org port irc user \"#chan\" password baz"
"machine GNU.chat port irc user \"#chan\" password foo"))
;; FIXME explain what this is for
(defun erc-services-tests--auth-source-shuffle (&rest extra)
(string-join `(,@(sort (append erc-services-tests--auth-source-entries extra)
(lambda (&rest _) (zerop (random 2))))
"")
"\n"))
(ert-deftest erc--auth-source-search--netrc-standard ()
(ert-with-temp-file netrc-file
:prefix "erc--auth-source-search--standard"
:text (erc-services-tests--auth-source-shuffle)
(let ((auth-sources (list netrc-file))
(auth-source-do-cache nil))
(erc-services-tests--auth-source-standard #'erc-auth-source-search))))
(ert-deftest erc--auth-source-search--netrc-announced ()
(ert-with-temp-file netrc-file
:prefix "erc--auth-source-search--announced"
:text (erc-services-tests--auth-source-shuffle)
(let ((auth-sources (list netrc-file))
(auth-source-do-cache nil))
(erc-services-tests--auth-source-announced #'erc-auth-source-search))))
(ert-deftest erc--auth-source-search--netrc-overrides ()
(ert-with-temp-file netrc-file
:prefix "erc--auth-source-search--overrides"
:text (erc-services-tests--auth-source-shuffle
"machine GNU.chat port 6697 user \"#chan\" password spam"
"machine my.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")
(let ((auth-sources (list netrc-file))
(auth-source-do-cache nil))
(erc-services-tests--auth-source-overrides #'erc-auth-source-search))))
;; auth-source plstore backend
(defun erc-services-test--call-with-plstore (&rest args)
(advice-add 'epg-decrypt-string :override
(lambda (&rest r) (prin1-to-string (cadr r)))
'((name . erc--auth-source-plstore)))
(advice-add 'epg-find-configuration :override
(lambda (&rest _) "" '((program . "/bin/true")))
'((name . erc--auth-source-plstore)))
(unwind-protect
(apply #'erc-auth-source-search args)
(advice-remove 'epg-decrypt-string 'erc--auth-source-plstore)
(advice-remove 'epg-find-configuration 'erc--auth-source-plstore)))
(defvar erc-services-tests--auth-source-plstore-standard-announced "\
;;; public entries -*- mode: plstore -*-
((\"ba950d38118a76d71f9f0591bb373d6cb366a512\"
:secret-secret t
:host \"irc.gnu.org\"
:user \"#chan\"
:port \"irc\")
(\"7f17ca445d11158065e911a6d0f4cbf52ca250e3\"
:secret-secret t
:host \"my.gnu.org\"
:user \"#chan\"
:port \"irc\")
(\"fcd3c8bd6daf4509de0ad6ee98e744ce0fca9377\"
:secret-secret t
:host \"GNU.chat\"
:user \"#chan\"
:port \"irc\"))
;;; secret entries
((\"ba950d38118a76d71f9f0591bb373d6cb366a512\" :secret \"bar\")
(\"7f17ca445d11158065e911a6d0f4cbf52ca250e3\" :secret \"baz\")
(\"fcd3c8bd6daf4509de0ad6ee98e744ce0fca9377\" :secret \"foo\"))")
(ert-deftest erc--auth-source-search--plstore-standard ()
(ert-with-temp-file plstore-file
:suffix ".plist"
:text erc-services-tests--auth-source-plstore-standard-announced
(let ((auth-sources (list plstore-file))
(auth-source-do-cache nil))
(erc-services-tests--auth-source-standard
#'erc-services-test--call-with-plstore))
(kill-buffer (get-file-buffer plstore-file))))
(ert-deftest erc--auth-source-search--plstore-announced ()
(ert-with-temp-file plstore-file
:suffix ".plist"
:text erc-services-tests--auth-source-plstore-standard-announced
(let ((auth-sources (list plstore-file))
(auth-source-do-cache nil))
(erc-services-tests--auth-source-announced
#'erc-services-test--call-with-plstore))
(kill-buffer (get-file-buffer plstore-file))))
(ert-deftest erc--auth-source-search--plstore-overrides ()
(ert-with-temp-file plstore-file
:suffix ".plist"
:text "\
;;; public entries -*- mode: plstore -*-
((\"ba950d38118a76d71f9f0591bb373d6cb366a512\"
:secret-secret t :host \"irc.gnu.org\" :user \"#chan\" :port \"irc\")
(\"7f17ca445d11158065e911a6d0f4cbf52ca250e3\"
:secret-secret t :host \"my.gnu.org\" :user \"#chan\" :port \"irc\")
(\"fcd3c8bd6daf4509de0ad6ee98e744ce0fca9377\"
:secret-secret t :host \"GNU.chat\" :user \"#chan\" :port \"irc\")
(\"1b3fab249a8dff77a4d8fe7eb4b0171b25cc711a\"
:secret-secret t :host \"GNU.chat\" :user \"#chan\" :port \"6697\")
(\"6cbcdc39476b8cfcca6f3e9a7876f41ec3f708cc\"
:secret-secret t :host \"my.gnu.org\" :user \"#fsf\" :port \"irc\")
(\"a33e2b3bd2d6f33995a4b88710a594a100c5e41d\"
:secret-secret t :host \"irc.gnu.org\" :port \"6667\")
(\"ab2fd349b2b7d6a9215bb35a92d054261b0b1537\"
:secret-secret t :host \"MyHost\" :port \"irc\")
(\"61a6bd552059494f479ff720e8de33e22574650a\"
:secret-secret t :host \"MyHost\" :port \"6667\"))
;;; secret entries
((\"ba950d38118a76d71f9f0591bb373d6cb366a512\" :secret \"bar\")
(\"7f17ca445d11158065e911a6d0f4cbf52ca250e3\" :secret \"baz\")
(\"fcd3c8bd6daf4509de0ad6ee98e744ce0fca9377\" :secret \"foo\")
(\"1b3fab249a8dff77a4d8fe7eb4b0171b25cc711a\" :secret \"spam\")
(\"6cbcdc39476b8cfcca6f3e9a7876f41ec3f708cc\" :secret \"42\")
(\"a33e2b3bd2d6f33995a4b88710a594a100c5e41d\" :secret \"sesame\")
(\"ab2fd349b2b7d6a9215bb35a92d054261b0b1537\" :secret \"456\")
(\"61a6bd552059494f479ff720e8de33e22574650a\" :secret \"123\"))"
(let ((auth-sources (list plstore-file))
(auth-source-do-cache nil))
(erc-services-tests--auth-source-overrides
#'erc-services-test--call-with-plstore))
(kill-buffer (get-file-buffer plstore-file))))
;; auth-source JSON backend
(defvar erc-services-tests--auth-source-json-standard-announced "\
[{\"host\": \"irc.gnu.org\",
\"port\": \"irc\",
\"user\": \"#chan\",
\"secret\": \"bar\"},
{\"host\": \"my.gnu.org\",
\"port\": \"irc\",
\"user\": \"#chan\",
\"secret\": \"baz\"},
{\"host\": \"GNU.chat\",
\"port\": \"irc\",
\"user\": \"#chan\",
\"secret\": \"foo\"}]")
(ert-deftest erc--auth-source-search--json-standard ()
(ert-with-temp-file json-store
:text erc-services-tests--auth-source-json-standard-announced
:suffix ".json"
(let ((auth-sources (list json-store))
(auth-source-do-cache nil))
(erc-services-tests--auth-source-standard #'erc-auth-source-search))))
(ert-deftest erc--auth-source-search--json-announced ()
(ert-with-temp-file plstore-file
:suffix ".json"
:text erc-services-tests--auth-source-json-standard-announced
(let ((auth-sources (list plstore-file))
(auth-source-do-cache nil))
(erc-services-tests--auth-source-announced #'erc-auth-source-search))))
(ert-deftest erc--auth-source-search--json-overrides ()
(ert-with-temp-file json-file
:suffix ".json"
:text "\
[{\"host\": \"irc.gnu.org\",
\"port\": \"irc\",
\"user\": \"#chan\",
\"secret\": \"bar\"},
{\"host\": \"my.gnu.org\",
\"port\": \"irc\",
\"user\": \"#chan\",
\"secret\": \"baz\"},
{\"host\": \"GNU.chat\",
\"port\": \"irc\",
\"user\": \"#chan\",
\"secret\": \"foo\"},
{\"host\": \"GNU.chat\",
\"user\": \"#chan\",
\"port\": \"6697\",
\"secret\": \"spam\"},
{\"host\": \"my.gnu.org\",
\"user\": \"#fsf\",
\"port\": \"irc\",
\"secret\": \"42\"},
{\"host\": \"irc.gnu.org\",
\"port\": \"6667\",
\"secret\": \"sesame\"},
{\"host\": \"MyHost\",
\"port\": \"irc\",
\"secret\": \"456\"},
{\"host\": \"MyHost\",
\"port\": \"6667\",
\"secret\": \"123\"}]"
(let ((auth-sources (list json-file))
(auth-source-do-cache nil))
(erc-services-tests--auth-source-overrides #'erc-auth-source-search))))
;; auth-source-secrets backend
(defvar erc-services-tests--auth-source-secrets-standard-entries
'(("#chan@irc.gnu.org:irc" ; label
(:host . "irc.gnu.org")
(:user . "#chan")
(:port . "irc")
(:xdg:schema . "org.freedesktop.Secret.Generic"))
("#chan@my.gnu.org:irc"
(:host . "my.gnu.org")
(:user . "#chan")
(:port . "irc")
(:xdg:schema . "org.freedesktop.Secret.Generic"))
("#chan@GNU.chat:irc"
(:host . "GNU.chat")
(:user . "#chan")
(:port . "irc")
(:xdg:schema . "org.freedesktop.Secret.Generic"))))
(defvar erc-services-tests--auth-source-secrets-standard-secrets
'(("#chan@irc.gnu.org:irc" . "bar")
("#chan@my.gnu.org:irc" . "baz")
("#chan@GNU.chat:irc" . "foo")))
(defun erc-services-tests--secrets-search-items (entries _ &rest r)
(mapcan (lambda (s)
(and (seq-every-p (pcase-lambda (`(,k . ,v))
(equal v (alist-get k (cdr s))))
(map-pairs r))
(list (car s))))
entries))
(ert-deftest erc--auth-source-search--secrets-standard ()
(skip-unless (bound-and-true-p secrets-enabled))
(let ((auth-sources '("secrets:Test"))
(auth-source-do-cache nil)
(entries erc-services-tests--auth-source-secrets-standard-entries)
(secrets erc-services-tests--auth-source-secrets-standard-secrets))
(cl-letf (((symbol-function 'secrets-search-items)
(apply-partially #'erc-services-tests--secrets-search-items
entries))
((symbol-function 'secrets-get-secret)
(lambda (_ label) (assoc-default label secrets)))
((symbol-function 'secrets-get-attributes)
(lambda (_ label) (assoc-default label entries))))
(erc-services-tests--auth-source-standard #'erc-auth-source-search))))
(ert-deftest erc--auth-source-search--secrets-announced ()
(skip-unless (bound-and-true-p secrets-enabled))
(let ((auth-sources '("secrets:Test"))
(auth-source-do-cache nil)
(entries erc-services-tests--auth-source-secrets-standard-entries)
(secrets erc-services-tests--auth-source-secrets-standard-secrets))
(cl-letf (((symbol-function 'secrets-search-items)
(apply-partially #'erc-services-tests--secrets-search-items
entries))
((symbol-function 'secrets-get-secret)
(lambda (_ label) (assoc-default label secrets)))
((symbol-function 'secrets-get-attributes)
(lambda (_ label) (assoc-default label entries))))
(erc-services-tests--auth-source-announced #'erc-auth-source-search))))
(ert-deftest erc--auth-source-search--secrets-overrides ()
(skip-unless (bound-and-true-p secrets-enabled))
(let ((auth-sources '("secrets:Test"))
(auth-source-do-cache nil)
(entries `(,@erc-services-tests--auth-source-secrets-standard-entries
("#chan@GNU.chat:6697"
(:host . "GNU.chat") (:user . "#chan") (:port . "6697")
(:xdg:schema . "org.freedesktop.Secret.Generic"))
("#fsf@my.gnu.org:irc"
(:host . "my.gnu.org") (:user . "#fsf") (:port . "irc")
(:xdg:schema . "org.freedesktop.Secret.Generic"))
("irc.gnu.org:6667"
(:host . "irc.gnu.org") (:port . "6667")
(:xdg:schema . "org.freedesktop.Secret.Generic"))
("MyHost:irc"
(:host . "MyHost") (:port . "irc")
(:xdg:schema . "org.freedesktop.Secret.Generic"))
("MyHost:6667"
(:host . "MyHost") (:port . "6667")
(:xdg:schema . "org.freedesktop.Secret.Generic"))))
(secrets `(,@erc-services-tests--auth-source-secrets-standard-secrets
("#chan@GNU.chat:6697" . "spam")
("#fsf@my.gnu.org:irc" . "42" )
("irc.gnu.org:6667" . "sesame")
("MyHost:irc" . "456")
("MyHost:6667" . "123"))))
(cl-letf (((symbol-function 'secrets-search-items)
(apply-partially #'erc-services-tests--secrets-search-items
entries))
((symbol-function 'secrets-get-secret)
(lambda (_ label) (assoc-default label secrets)))
((symbol-function 'secrets-get-attributes)
(lambda (_ label) (assoc-default label entries))))
(erc-services-tests--auth-source-overrides #'erc-auth-source-search))))
;; auth-source-pass backend
(require 'auth-source-pass)
;; `auth-source-pass--find-match-unambiguous' returns something like:
;;
;; (list :host "irc.gnu.org"
;; :port "6697"
;; :user "rms"
;; :secret
;; #[0 "\301\302\300\"\207"
;; [((secret . "freedom")) auth-source-pass--get-attr secret] 3])
;;
;; This function gives ^ (faked here to avoid gpg and file IO). See
;; `auth-source-pass--with-store' in ../auth-source-pass-tests.el
(defun erc-services-tests--asp-parse-entry (store entry)
(when-let* ((found (cl-find entry store :key #'car :test #'string=)))
(list (assoc 'secret (cdr found)))))
(defvar erc-join-tests--auth-source-pass-entries
'(("irc.gnu.org:irc/#chan" (secret . "bar"))
("my.gnu.org:irc/#chan" (secret . "baz"))
("GNU.chat:irc/#chan" (secret . "foo"))))
(ert-deftest erc--auth-source-search--pass-standard ()
(let ((store erc-join-tests--auth-source-pass-entries)
(auth-sources '(password-store))
(auth-source-do-cache nil))
(cl-letf (((symbol-function 'auth-source-pass-parse-entry)
(apply-partially #'erc-services-tests--asp-parse-entry store))
((symbol-function 'auth-source-pass-entries)
(lambda () (mapcar #'car store))))
(erc-services-tests--auth-source-standard #'erc-auth-source-search))))
(ert-deftest erc--auth-source-search--pass-announced ()
(let ((store erc-join-tests--auth-source-pass-entries)
(auth-sources '(password-store))
(auth-source-do-cache nil))
(cl-letf (((symbol-function 'auth-source-pass-parse-entry)
(apply-partially #'erc-services-tests--asp-parse-entry store))
((symbol-function 'auth-source-pass-entries)
(lambda () (mapcar #'car store))))
(erc-services-tests--auth-source-announced #'erc-auth-source-search))))
(ert-deftest erc--auth-source-search--pass-overrides ()
(let ((store
`(,@erc-join-tests--auth-source-pass-entries
("GNU.chat:6697/#chan" (secret . "spam"))
("my.gnu.org:irc/#fsf" (secret . "42"))
("irc.gnu.org:6667" (secret . "sesame"))
("MyHost:irc" (secret . "456"))
("MyHost:6667" (secret . "123"))))
(auth-sources '(password-store))
(auth-source-do-cache nil))
(cl-letf (((symbol-function 'auth-source-pass-parse-entry)
(apply-partially #'erc-services-tests--asp-parse-entry store))
((symbol-function 'auth-source-pass-entries)
(lambda () (mapcar #'car store))))
(erc-services-tests--auth-source-overrides #'erc-auth-source-search))))
;;;; The services module
(ert-deftest erc-nickserv-get-password ()
(should erc-prompt-for-nickserv-password)
(ert-with-temp-file netrc-file
:prefix "erc-nickserv-get-password"
:text (mapconcat 'identity
'("machine GNU/chat port 6697 user bob password spam"
"machine FSF.chat port 6697 user bob password sesame"
"machine MyHost port irc password 123")
"\n")
(let* ((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 "my.gnu.org")
(erc-network 'FSF.chat)
(erc-server-current-nick "tester")
(erc-networks--id (erc-networks--id-create nil))
(erc-session-port 6697)
(search (erc-services-tests--wrap-search
#'erc-nickserv-get-password)))
(ert-info ("Lookup custom option")
(should (string= (funcall search "alice") "foo")))
(ert-info ("Auth source")
(ert-info ("Network")
(should (string= (funcall search "bob") "sesame")))
(ert-info ("Network ID")
(let ((erc-networks--id (erc-networks--id-create 'GNU/chat)))
(should (string= (funcall search "bob") "spam")))))
(ert-info ("Read input")
(should (string=
(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
Reference in a new issue View git blame Copy permalink