diff options
| author | Jim Porter <jporterbugs@gmail.com> | 2022-11-19 22:26:45 -0800 |
|---|---|---|
| committer | Jim Porter <jporterbugs@gmail.com> | 2022-11-24 17:27:11 -0800 |
| commit | 339893f2e3b5cb7263ba5204e083d5605df72446 (patch) | |
| tree | 963539dbc2d8a2908c9f6eb03ca75b904ef0d8a8 /test/lisp/server-tests.el | |
| parent | 1c1a82bbedf2a70d97e266d403ba6c45cc139c9b (diff) | |
| download | emacs-339893f2e3b5cb7263ba5204e083d5605df72446.tar.gz emacs-339893f2e3b5cb7263ba5204e083d5605df72446.tar.bz2 emacs-339893f2e3b5cb7263ba5204e083d5605df72446.zip | |
; Add more tests for the Emacs server
* test/lisp/server-tests.el (server-tests/emacs-client)
(server-tests/max-wait-time): New constants.
(server-tests/start-emacsclient): New function.
(server-tests/with-server, server-tests/wait-until): New macros.
(server-tests/variable): New variable.
(server-test/server-start-sets-minor-mode): Rename to...
(server-tests/server-start/sets-minor-mode): ... this.
(server-tests/server-start/stop-prompt-with-client)
(server-tests/server-start/no-stop-prompt-without-client)
(server-tests/emacsclient/server-edit)
(server-tests/emacsclient/create-frame, server-test/emacsclient/eval):
New tests.
* test/lib-src/emacsclient-tests.el: Mention the above file.
Diffstat (limited to 'test/lisp/server-tests.el')
| -rw-r--r-- | test/lisp/server-tests.el | 111 |
1 files changed, 102 insertions, 9 deletions
diff --git a/test/lisp/server-tests.el b/test/lisp/server-tests.el index 351b8ef8d12..48ef110943e 100644 --- a/test/lisp/server-tests.el +++ b/test/lisp/server-tests.el @@ -22,20 +22,113 @@ (require 'ert) (require 'server) +(defconst server-tests/emacsclient + (if installation-directory + (expand-file-name "lib-src/emacsclient" installation-directory) + "emacsclient") + "The emacsclient binary to test.") + +(defun server-tests/start-emacsclient (&rest args) + "Run emacsclient, passing ARGS as arguments to it." + (let ((socket-name (process-get server-process :server-file))) + (make-process + :name server-tests/emacsclient + :command (append (list server-tests/emacsclient + "--socket-name" socket-name) + args)))) + +(defmacro server-tests/with-server (&rest body) + "Start the Emacs server, evaluate BODY, and then stop the server." + (declare (indent 0)) + `(progn + (server-start) + (unwind-protect + (progn (should (processp server-process)) + ,@body) + (let ((inhibit-message t)) + (server-start t t)) + (should (null server-process)) + (should (null server-clients))))) + +(defconst server-tests/max-wait-time 5 + "The maximum time to wait in `server-tests/wait-until', in seconds.") + +(defmacro server-tests/wait-until (form) + "Wait until FORM is non-nil, timing out and failing if it takes too long." + `(let ((start (current-time))) + (while (not ,form) + (when (> (float-time (time-since start)) + server-tests/max-wait-time) + (ert-fail (format "timed out waiting for %S to be non-nil" ',form))) + (sit-for 0.1)))) + +(defvar server-tests/variable nil) + ;;; Tests: -(ert-deftest server-test/server-start-sets-minor-mode () +(ert-deftest server-tests/server-start/sets-minor-mode () "Ensure that calling `server-start' also sets `server-mode' properly." - (server-start) - (unwind-protect - (progn - ;; Make sure starting the server activates the minor mode. - (should (eq server-mode t)) - (should (memq 'server-mode global-minor-modes))) - ;; Always stop the server, even if the above checks fail. - (server-start t)) + (server-tests/with-server + ;; Make sure starting the server activates the minor mode. + (should (eq server-mode t)) + (should (memq 'server-mode global-minor-modes))) ;; Make sure stopping the server deactivates the minor mode. (should (eq server-mode nil)) (should-not (memq 'server-mode global-minor-modes))) +(ert-deftest server-tests/server-start/stop-prompt-with-client () + "Ensure that stopping the server prompts when there are clients." + (server-tests/with-server + (let ((yes-or-no-p-called nil) + (emacsclient (server-tests/start-emacsclient "-c"))) + (server-tests/wait-until (length= (frame-list) 2)) + (cl-letf (((symbol-function 'yes-or-no-p) + (lambda (_prompt) + (setq yes-or-no-p-called t)))) + (server-start t) + (should yes-or-no-p-called)) + (server-tests/wait-until (eq (process-status emacsclient) 'exit))))) + +(ert-deftest server-tests/server-start/no-stop-prompt-without-client () + "Ensure that stopping the server doesn't prompt when there are no clients." + (server-tests/with-server + (let ((yes-or-no-p-called nil)) + (cl-letf (((symbol-function 'yes-or-no-p) + (lambda (_prompt) + (setq yes-or-no-p-called t)))) + (let ((inhibit-message t)) + (server-start t)) + (should-not yes-or-no-p-called))))) + +(ert-deftest server-tests/emacsclient/server-edit () + "Test that calling `server-edit' from a client buffer exits the client." + (server-tests/with-server + (let ((emacsclient (server-tests/start-emacsclient "file.txt"))) + (server-tests/wait-until (get-buffer "file.txt")) + (should (eq (process-status emacsclient) 'run)) + (should (length= server-clients 1)) + (with-current-buffer "file.txt" + (server-edit)) + (server-tests/wait-until (eq (process-status emacsclient) 'exit))))) + +(ert-deftest server-tests/emacsclient/create-frame () + "Test that \"emacsclient -c\" creates a frame." + (server-tests/with-server + (let ((emacsclient (server-tests/start-emacsclient "-c"))) + (server-tests/wait-until (length= (frame-list) 2)) + (should (eq (process-status emacsclient) 'run)) + (should (length= server-clients 1)) + (should (eq (frame-parameter (car (frame-list)) 'client) + (car server-clients))))) + ;; The client frame should go away after the server stops. + (should (length= (frame-list) 1))) + +(ert-deftest server-tests/emacsclient/eval () + "Test that \"emacsclient --eval\" works correctly." + (server-tests/with-server + (let ((value (random))) + (server-tests/start-emacsclient + "--eval" (format "(setq server-tests/variable %d)" value)) + (server-tests/wait-until (eq server-tests/variable value))))) + ;;; server-tests.el ends here |