mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-10 16:20:17 -08:00
b93757029c
* etc/ERC-NEWS: Add entry explaining that `erc-truncate-mode' no longer quasi-activates `erc-log-mode' under certain conditions. * lisp/erc/erc-log.el (erc-log--call-when-logging-enabled-sans-module): Add helper for use by the `truncate' module during initialization. * lisp/erc/erc-truncate.el (erc-truncate-mode, erc-truncate-enable, erc-truncate-disable): Warn on `erc-connect-pre-hook' when conditions exist that would have seen logging transparently activated in older ERC versions. (erc-truncate--warn-about-logging): New function to warn about implicit logging on pre-connect. (erc-truncate-buffer-to-size): Clarify some comments and revise doc string. * test/lisp/erc/erc-scenarios-log.el (erc-scenarios-log--truncate): Disable `erc-truncate-mode' even though `erc-modules' is shadowed so that `erc-insert-done-hook' and friends are not contaminated. `(Bug#60936)
208 lines
8 KiB
EmacsLisp
208 lines
8 KiB
EmacsLisp
;;; erc-scenarios-log.el --- erc-log scenarios -*- 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/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;;; Code:
|
|
|
|
(require 'ert-x)
|
|
(eval-and-compile
|
|
(let ((load-path (cons (ert-resource-directory) load-path)))
|
|
(require 'erc-scenarios-common)))
|
|
|
|
(require 'erc-log)
|
|
(require 'erc-truncate)
|
|
|
|
(defvar erc-timestamp-format-left)
|
|
|
|
(ert-deftest erc-scenarios-log--kill-hook ()
|
|
:tags '(:expensive-test)
|
|
(erc-scenarios-common-with-cleanup
|
|
((erc-scenarios-common-dialog "base/assoc/bouncer-history")
|
|
(dumb-server (erc-d-run "localhost" t 'foonet))
|
|
(tempdir (make-temp-file "erc-tests-log." t nil nil))
|
|
(erc-log-channels-directory tempdir)
|
|
(erc-modules (cons 'log erc-modules))
|
|
(port (process-contact dumb-server :service))
|
|
(logfile (expand-file-name (format "#chan!tester@127.0.0.1:%d.txt" port)
|
|
tempdir))
|
|
(erc-server-flood-penalty 0.1)
|
|
(expect (erc-d-t-make-expecter)))
|
|
|
|
(ert-info ("Connect to foonet")
|
|
(with-current-buffer (erc :server "127.0.0.1"
|
|
:port port
|
|
:nick "tester"
|
|
:password "foonet:changeme"
|
|
:full-name "tester")
|
|
(should (string= (buffer-name) (format "127.0.0.1:%d" port)))
|
|
(funcall expect 5 "foonet")))
|
|
|
|
(with-current-buffer (erc-d-t-wait-for 5 (get-buffer "#chan"))
|
|
(funcall expect 10 "was created on")
|
|
(funcall expect 10 "please your lordship")
|
|
(with-current-buffer "foonet"
|
|
(delete-process erc-server-process)
|
|
(funcall expect 5 "failed"))
|
|
(should-not (file-exists-p logfile))
|
|
(kill-buffer)
|
|
(should (file-exists-p logfile)))
|
|
|
|
(with-temp-buffer
|
|
(insert-file-contents logfile)
|
|
(funcall expect 1 "You have joined")
|
|
(funcall expect 1 "Playback Complete.")
|
|
(funcall expect 1 "please your lordship"))
|
|
|
|
(erc-log-mode -1)
|
|
(if noninteractive
|
|
(delete-directory tempdir :recursive)
|
|
(add-hook 'kill-emacs-hook
|
|
(lambda () (delete-directory tempdir :recursive))))))
|
|
|
|
;; This shows that, in addition to truncating the buffer, /clear also
|
|
;; syncs the log.
|
|
|
|
(ert-deftest erc-scenarios-log--clear-stamp ()
|
|
:tags '(:expensive-test)
|
|
(erc-scenarios-common-with-cleanup
|
|
((erc-scenarios-common-dialog "base/assoc/bouncer-history")
|
|
(dumb-server (erc-d-run "localhost" t 'foonet))
|
|
(tempdir (make-temp-file "erc-tests-log." t nil nil))
|
|
(erc-log-channels-directory tempdir)
|
|
(erc-modules (cons 'log erc-modules))
|
|
(erc-timestamp-format-left "\n[%a %b %e %Y @@STAMP@@]\n")
|
|
(port (process-contact dumb-server :service))
|
|
(logfile (expand-file-name (format "#chan!tester@127.0.0.1:%d.txt" port)
|
|
tempdir))
|
|
(erc-server-flood-penalty 0.1)
|
|
(expect (erc-d-t-make-expecter)))
|
|
|
|
(unless noninteractive
|
|
(add-hook 'kill-emacs-hook
|
|
(lambda () (delete-directory tempdir :recursive))))
|
|
|
|
(ert-info ("Connect to foonet")
|
|
(with-current-buffer (erc :server "127.0.0.1"
|
|
:port port
|
|
:nick "tester"
|
|
:password "foonet:changeme"
|
|
:full-name "tester")
|
|
(should (string= (buffer-name) (format "127.0.0.1:%d" port)))
|
|
(funcall expect 5 "foonet")))
|
|
|
|
(with-current-buffer (erc-d-t-wait-for 5 (get-buffer "#chan"))
|
|
(funcall expect 10 "@@STAMP@@")
|
|
(funcall expect 10 "Grows, lives")
|
|
(should-not (file-exists-p logfile))
|
|
(goto-char (point-max))
|
|
(erc-cmd-CLEAR)
|
|
(should (file-exists-p logfile))
|
|
(funcall expect 10 "please your lordship")
|
|
(ert-info ("Buffer truncated")
|
|
(goto-char (point-min))
|
|
(funcall expect 10 "@@STAMP@@" (point)) ; reset
|
|
(funcall expect -0.1 "Grows, lives")
|
|
(funcall expect 1 "For these two")))
|
|
|
|
(ert-info ("Current contents saved")
|
|
(with-temp-buffer
|
|
(insert-file-contents logfile)
|
|
(funcall expect 1 "@@STAMP@@")
|
|
(funcall expect 1 "You have joined")
|
|
(funcall expect 1 "Playback Complete.")
|
|
(funcall expect 1 "Grows, lives")
|
|
(funcall expect -0.01 "please your lordship")))
|
|
|
|
(ert-info ("Remainder saved, timestamp printed when option non-nil")
|
|
(with-current-buffer "foonet"
|
|
(delete-process erc-server-process)
|
|
(funcall expect 5 "failed"))
|
|
(kill-buffer "#chan")
|
|
(with-temp-buffer
|
|
(insert-file-contents logfile)
|
|
(funcall expect 1 "@@STAMP@@")
|
|
(funcall expect 1 "Grows, lives")
|
|
(funcall expect -0.01 "@@STAMP@@")
|
|
(forward-line 1) ; no blank, no timestamp
|
|
(should (looking-at (rx "<bob> alice: For these two hours,")))
|
|
(funcall expect 1 "please your lordship")))
|
|
|
|
(erc-log-mode -1)
|
|
(when noninteractive (delete-directory tempdir :recursive))))
|
|
|
|
(ert-deftest erc-scenarios-log--truncate ()
|
|
:tags '(:expensive-test)
|
|
(erc-scenarios-common-with-cleanup
|
|
((erc-scenarios-common-dialog "base/assoc/bouncer-history")
|
|
(dumb-server (erc-d-run "localhost" t 'foonet))
|
|
(tempdir (make-temp-file "erc-tests-log." t nil nil))
|
|
(erc-log-channels-directory tempdir)
|
|
(erc-modules (cons 'truncate (cons 'log erc-modules)))
|
|
(erc-max-buffer-size 512)
|
|
(port (process-contact dumb-server :service))
|
|
(logchan (expand-file-name (format "#chan!tester@127.0.0.1:%d.txt" port)
|
|
tempdir))
|
|
(logserv (expand-file-name
|
|
(format "127.0.0.1:%d!tester@127.0.0.1:%d.txt" port port)
|
|
tempdir))
|
|
(erc-server-flood-penalty 0.1)
|
|
(expect (erc-d-t-make-expecter)))
|
|
|
|
(unless noninteractive
|
|
(add-hook 'kill-emacs-hook
|
|
(lambda () (delete-directory tempdir :recursive))))
|
|
|
|
(ert-info ("Connect to foonet")
|
|
(with-current-buffer (erc :server "127.0.0.1"
|
|
:port port
|
|
:nick "tester"
|
|
:password "foonet:changeme"
|
|
:full-name "tester")
|
|
(should (string= (buffer-name) (format "127.0.0.1:%d" port)))
|
|
(should-not (file-exists-p logserv))
|
|
(should-not (file-exists-p logchan))
|
|
(funcall expect 10 "*** MAXLIST=beI:60")
|
|
(should (= (pos-bol) (point-min)))
|
|
(should (file-exists-p logserv))))
|
|
|
|
(ert-info ("Log file ahead of truncation point")
|
|
;; Log contains lines still present in buffer.
|
|
(with-temp-buffer
|
|
(insert-file-contents logserv)
|
|
(funcall expect 10 "*** MAXLIST=beI:60")))
|
|
|
|
(with-current-buffer (erc-d-t-wait-for 5 (get-buffer "#chan"))
|
|
(funcall expect 10 "please your lordship")
|
|
(should (file-exists-p logchan))
|
|
(funcall expect -0.1 "[07:04:37] alice: Here," (point-min)))
|
|
|
|
(ert-info ("Log ahead of truncation point")
|
|
(with-temp-buffer
|
|
(insert-file-contents logchan)
|
|
(funcall expect 1 "You have joined")
|
|
(funcall expect 1 "[07:04:37] alice: Here,")
|
|
(funcall expect 1 "loathed enemy")
|
|
(funcall expect -0.1 "please your lordship")))
|
|
|
|
(erc-log-mode -1)
|
|
(erc-truncate-mode -1)
|
|
(when noninteractive (delete-directory tempdir :recursive))))
|
|
|
|
;;; erc-scenarios-log.el ends here
|