2021-04-19 12:21:01 +02:00
|
|
|
;;; eshell-tests.el --- Eshell test suite -*- lexical-binding:t -*-
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2023-01-01 05:31:12 -05:00
|
|
|
;; Copyright (C) 1999-2023 Free Software Foundation, Inc.
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2000-10-16 12:27:09 +00:00
|
|
|
;; Author: John Wiegley <johnw@gnu.org>
|
|
|
|
|
2000-06-23 05:24:10 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 03:36:21 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2000-06-23 05:24:10 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:36:21 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
;; 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
|
2017-09-13 15:52:52 -07:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
2013-05-26 19:54:01 +12:00
|
|
|
;; Eshell test suite.
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
2013-05-26 19:54:01 +12:00
|
|
|
(require 'ert)
|
2021-11-08 01:21:06 +01:00
|
|
|
(require 'ert-x)
|
2020-06-02 23:14:23 +01:00
|
|
|
(require 'esh-mode)
|
2013-05-26 19:54:01 +12:00
|
|
|
(require 'eshell)
|
2022-02-02 18:26:50 -08:00
|
|
|
(require 'eshell-tests-helpers
|
|
|
|
(expand-file-name "eshell-tests-helpers"
|
|
|
|
(file-name-directory (or load-file-name
|
|
|
|
default-directory))))
|
2013-09-13 09:11:19 -07:00
|
|
|
|
2013-05-26 19:54:01 +12:00
|
|
|
;;; Tests:
|
|
|
|
|
2022-02-04 22:41:39 -08:00
|
|
|
(ert-deftest eshell-test/pipe-headproc ()
|
|
|
|
"Check that piping a non-process to a process command waits for the process"
|
|
|
|
(skip-unless (executable-find "cat"))
|
|
|
|
(with-temp-eshell
|
2022-08-13 20:31:11 -07:00
|
|
|
(eshell-match-command-output "echo hi | *cat"
|
|
|
|
"hi")))
|
2022-02-04 22:41:39 -08:00
|
|
|
|
2022-01-27 23:13:36 -08:00
|
|
|
(ert-deftest eshell-test/pipe-tailproc ()
|
|
|
|
"Check that piping a process to a non-process command waits for the process"
|
|
|
|
(skip-unless (executable-find "echo"))
|
|
|
|
(with-temp-eshell
|
2022-08-13 20:31:11 -07:00
|
|
|
(eshell-match-command-output "*echo hi | echo bye"
|
|
|
|
"bye\nhi\n")))
|
2022-01-27 23:13:36 -08:00
|
|
|
|
2022-01-30 18:53:53 -08:00
|
|
|
(ert-deftest eshell-test/pipe-headproc-stdin ()
|
|
|
|
"Check that standard input is sent to the head process in a pipeline"
|
|
|
|
(skip-unless (and (executable-find "tr")
|
|
|
|
(executable-find "rev")))
|
|
|
|
(with-temp-eshell
|
|
|
|
(eshell-insert-command "tr a-z A-Z | rev")
|
|
|
|
(eshell-insert-command "hello")
|
|
|
|
(eshell-send-eof-to-process)
|
|
|
|
(eshell-wait-for-subprocess)
|
2022-08-13 20:31:11 -07:00
|
|
|
(should (eshell-match-output "OLLEH\n"))))
|
2022-01-30 18:53:53 -08:00
|
|
|
|
2022-05-22 17:27:48 -07:00
|
|
|
(ert-deftest eshell-test/pipe-subcommand ()
|
|
|
|
"Check that piping with an asynchronous subcommand works"
|
|
|
|
(skip-unless (and (executable-find "echo")
|
|
|
|
(executable-find "cat")))
|
|
|
|
(with-temp-eshell
|
2022-08-13 20:31:11 -07:00
|
|
|
(eshell-match-command-output "echo ${*echo hi} | *cat"
|
|
|
|
"hi")))
|
2022-05-22 17:27:48 -07:00
|
|
|
|
|
|
|
(ert-deftest eshell-test/pipe-subcommand-with-pipe ()
|
|
|
|
"Check that piping with an asynchronous subcommand with its own pipe works"
|
|
|
|
(skip-unless (and (executable-find "echo")
|
|
|
|
(executable-find "cat")))
|
|
|
|
(with-temp-eshell
|
2022-08-13 20:31:11 -07:00
|
|
|
(eshell-match-command-output "echo ${*echo hi | *cat} | *cat"
|
|
|
|
"hi")))
|
2022-05-22 17:27:48 -07:00
|
|
|
|
2022-05-24 18:56:50 -07:00
|
|
|
(ert-deftest eshell-test/subcommand-reset-in-pipeline ()
|
|
|
|
"Check that subcommands reset `eshell-in-pipeline-p'."
|
|
|
|
(skip-unless (executable-find "cat"))
|
|
|
|
(dolist (template '("echo {%s} | *cat"
|
|
|
|
"echo ${%s} | *cat"
|
|
|
|
"*cat $<%s> | *cat"))
|
2022-08-14 13:44:04 -07:00
|
|
|
(eshell-command-result-equal
|
|
|
|
(format template "echo $eshell-in-pipeline-p")
|
|
|
|
nil)
|
|
|
|
(eshell-command-result-equal
|
|
|
|
(format template "echo | echo $eshell-in-pipeline-p")
|
|
|
|
"last")
|
|
|
|
(eshell-command-result-equal
|
|
|
|
(format template "echo $eshell-in-pipeline-p | echo")
|
|
|
|
"first")
|
|
|
|
(eshell-command-result-equal
|
|
|
|
(format template "echo | echo $eshell-in-pipeline-p | echo")
|
|
|
|
"t")))
|
2022-05-24 18:56:50 -07:00
|
|
|
|
|
|
|
(ert-deftest eshell-test/lisp-reset-in-pipeline ()
|
|
|
|
"Check that interpolated Lisp forms reset `eshell-in-pipeline-p'."
|
|
|
|
(skip-unless (executable-find "cat"))
|
|
|
|
(dolist (template '("echo (%s) | *cat"
|
|
|
|
"echo $(%s) | *cat"))
|
2022-08-14 13:44:04 -07:00
|
|
|
(eshell-command-result-equal
|
|
|
|
(format template "format \"%s\" eshell-in-pipeline-p")
|
|
|
|
"nil")))
|
2022-05-24 18:56:50 -07:00
|
|
|
|
2013-05-26 19:54:01 +12:00
|
|
|
(ert-deftest eshell-test/command-running-p ()
|
|
|
|
"Modeline should show no command running"
|
|
|
|
(with-temp-eshell
|
|
|
|
(let ((eshell-status-in-mode-line t))
|
|
|
|
(should (memq 'eshell-command-running-string mode-line-format))
|
|
|
|
(should (equal eshell-command-running-string "--")))))
|
|
|
|
|
|
|
|
(ert-deftest eshell-test/forward-arg ()
|
|
|
|
"Test moving across command arguments"
|
|
|
|
(with-temp-eshell
|
|
|
|
(eshell-insert-command "echo $(+ 1 (- 4 3)) \"alpha beta\" file" 'ignore)
|
|
|
|
(let ((here (point)) begin valid)
|
|
|
|
(eshell-bol)
|
|
|
|
(setq begin (point))
|
|
|
|
(eshell-forward-argument 4)
|
|
|
|
(setq valid (= here (point)))
|
|
|
|
(eshell-backward-argument 4)
|
|
|
|
(prog1
|
|
|
|
(and valid (= begin (point)))
|
|
|
|
(eshell-bol)
|
|
|
|
(delete-region (point) (point-max))))))
|
|
|
|
|
|
|
|
(ert-deftest eshell-test/queue-input ()
|
Fix reference-counting of Eshell I/O handles
This ensures that output targets in Eshell are only closed when Eshell
is actually done with them. In particular, this means that
"{ echo foo; echo bar } | rev" prints "raboof" as expected
(bug#59545).
* lisp/eshell/esh-io.el (eshell-create-handles): Structure the handles
differently so the targets and their ref-count can be shared.
(eshell-duplicate-handles): Reimplement this to share targets between
the original and new handle sets. Add STEAL-P argument.
(eshell-protect-handles, eshell-copy-output-handle)
(eshell-interactive-output-p, eshell-output-object): Account for
changes to the handle structure.
(eshell-close-handle): New function...
(eshell-close-handles, eshell-set-output-handle): ... use it.
(eshell-get-targets): Remove. This only existed to make the previous
implementation of 'eshell-duplicate-handles' work.
* lisp/eshell/esh-cmd.el (eshell-with-copied-handles): New argument
STEAL-P.
(eshell-do-pipelines): Use STEAL-P for the last item in the pipeline.
(eshell-parse-command): Don't copy handles for the last command in the
list; explain why we can't use STEAL-P here.
(eshell-eval-command): When queuing input, set 'eshell-command-body'
and 'eshell-test-body' for the 'if' conditional (see
'eshell-do-eval').
* test/lisp/eshell/esh-io-tests.el (esh-io-test/redirect-pipe): Split
into...
(esh-io-test/pipeline/default, esh-io-test/pipeline/all): ... these.
(esh-io-test/pipeline/subcommands): New test.
* test/lisp/eshell/esh-cmd-tests.el (esh-cmd-test/for-loop-pipe)
(esh-cmd-test/while-loop-pipe, esh-cmd-test/if-statement-pipe)
esh-cmd-test/if-else-statement-pipe): New tests.
(esh-cmd-test/while-loop): Use 'pop' to simplify the test a bit.
* test/lisp/eshell/eshell-test-helpers.el
(eshell-test--max-subprocess-time): Rename to...
(eshell-test--max-wait-time): ... this.
(eshell-wait-for): New function...
(eshell-wait-for-subprocess): ... use it.
* test/lisp/eshell/eshell-tests.el (eshell-test/queue-input): Fix this
test. Previously, it didn't correctly verify that the original
command completed.
* test/lisp/eshell/em-tramp-tests.el
(em-tramp-test/should-replace-command): New macro...
(em-tramp-test/su-default, em-tramp-test/su-user)
(em-tramp-test/su-login, em-tramp-test/sudo-shell)
(em-tramp-test/sudo-user-shell, em-tramp-test/doas-shell)
(em-tramp-test/doas-user-shell): ... use it.
2022-12-24 14:31:50 -08:00
|
|
|
"Test queuing command input.
|
|
|
|
This should let the current command finish, then automatically
|
|
|
|
insert the queued one at the next prompt, and finally run it."
|
2013-05-26 19:54:01 +12:00
|
|
|
(with-temp-eshell
|
Fix reference-counting of Eshell I/O handles
This ensures that output targets in Eshell are only closed when Eshell
is actually done with them. In particular, this means that
"{ echo foo; echo bar } | rev" prints "raboof" as expected
(bug#59545).
* lisp/eshell/esh-io.el (eshell-create-handles): Structure the handles
differently so the targets and their ref-count can be shared.
(eshell-duplicate-handles): Reimplement this to share targets between
the original and new handle sets. Add STEAL-P argument.
(eshell-protect-handles, eshell-copy-output-handle)
(eshell-interactive-output-p, eshell-output-object): Account for
changes to the handle structure.
(eshell-close-handle): New function...
(eshell-close-handles, eshell-set-output-handle): ... use it.
(eshell-get-targets): Remove. This only existed to make the previous
implementation of 'eshell-duplicate-handles' work.
* lisp/eshell/esh-cmd.el (eshell-with-copied-handles): New argument
STEAL-P.
(eshell-do-pipelines): Use STEAL-P for the last item in the pipeline.
(eshell-parse-command): Don't copy handles for the last command in the
list; explain why we can't use STEAL-P here.
(eshell-eval-command): When queuing input, set 'eshell-command-body'
and 'eshell-test-body' for the 'if' conditional (see
'eshell-do-eval').
* test/lisp/eshell/esh-io-tests.el (esh-io-test/redirect-pipe): Split
into...
(esh-io-test/pipeline/default, esh-io-test/pipeline/all): ... these.
(esh-io-test/pipeline/subcommands): New test.
* test/lisp/eshell/esh-cmd-tests.el (esh-cmd-test/for-loop-pipe)
(esh-cmd-test/while-loop-pipe, esh-cmd-test/if-statement-pipe)
esh-cmd-test/if-else-statement-pipe): New tests.
(esh-cmd-test/while-loop): Use 'pop' to simplify the test a bit.
* test/lisp/eshell/eshell-test-helpers.el
(eshell-test--max-subprocess-time): Rename to...
(eshell-test--max-wait-time): ... this.
(eshell-wait-for): New function...
(eshell-wait-for-subprocess): ... use it.
* test/lisp/eshell/eshell-tests.el (eshell-test/queue-input): Fix this
test. Previously, it didn't correctly verify that the original
command completed.
* test/lisp/eshell/em-tramp-tests.el
(em-tramp-test/should-replace-command): New macro...
(em-tramp-test/su-default, em-tramp-test/su-user)
(em-tramp-test/su-login, em-tramp-test/sudo-shell)
(em-tramp-test/sudo-user-shell, em-tramp-test/doas-shell)
(em-tramp-test/doas-user-shell): ... use it.
2022-12-24 14:31:50 -08:00
|
|
|
(eshell-insert-command "sleep 1; echo slept")
|
|
|
|
(eshell-insert-command "echo alpha" #'eshell-queue-input)
|
|
|
|
(let ((start (marker-position (eshell-beginning-of-output))))
|
|
|
|
(eshell-wait-for (lambda () (not eshell-current-command)))
|
|
|
|
(should (string-match "^slept\n.*echo alpha\nalpha\n$"
|
|
|
|
(buffer-substring-no-properties
|
|
|
|
start (eshell-end-of-output)))))))
|
2013-05-26 19:54:01 +12:00
|
|
|
|
|
|
|
(ert-deftest eshell-test/flush-output ()
|
|
|
|
"Test flushing of previous output"
|
|
|
|
(with-temp-eshell
|
|
|
|
(eshell-insert-command "echo alpha")
|
|
|
|
(eshell-kill-output)
|
2022-08-13 20:31:11 -07:00
|
|
|
(should (eshell-match-output
|
|
|
|
(concat "^" (regexp-quote "*** output flushed ***\n") "$")))))
|
2013-05-26 19:54:01 +12:00
|
|
|
|
|
|
|
(ert-deftest eshell-test/run-old-command ()
|
|
|
|
"Re-run an old command"
|
|
|
|
(with-temp-eshell
|
|
|
|
(eshell-insert-command "echo alpha")
|
|
|
|
(goto-char eshell-last-input-start)
|
|
|
|
(string= (eshell-get-old-input) "echo alpha")))
|
2011-03-05 12:07:27 -08:00
|
|
|
|
2017-10-15 16:41:17 -04:00
|
|
|
(provide 'eshell-tests)
|
2007-12-05 07:09:17 +00:00
|
|
|
|
2021-09-26 01:53:56 +02:00
|
|
|
;;; eshell-tests.el ends here
|