mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-23 06:00:41 -08:00
50339b38fd
See bug#72220. * lisp/eshell/esh-cmd.el (eshell-with-handles): New macro... (eshell-commands): ... use it. (eshell-with-copied-handles): Remove STEAL-P and allow multiple body forms (this is an incompatible change, but the macro is currently internal despite the name). (eshell-parse-command, eshell-do-pipelines) (eshell-do-pipelines-synchronously, eshell--invoke-command-directly-p): Remove handle stealing. (eshell-structure-basic-command, eshell-do-command) (eshell-lisp-command): Remove 'eshell-close-handles'. (eshell-protect): Make obsolete. (eshell-rewrite-for-command, eshell-rewrite-while-command) (eshell-rewrite-if-command, (eshell-parse-pipeline): Remove 'eshell-protect'. * lisp/eshell/esh-io.el (eshell-duplicate-handles): Make STEAL-P obsolete. * lisp/eshell/esh-proc.el (eshell-gather-process-output): Call 'eshell-protect-handles' one more time. Remove 'eshell-close-handles'. * lisp/eshell/esh-var.el (eshell-parse-variable-ref): Reimplement $<COMMAND> form using 'eshell-with-handles'. * test/lisp/eshell/esh-cmd-tests.el (esh-cmd-test/command-not-found/pipeline): New test. * test/lisp/eshell/em-tramp-tests.el (em-tramp-test/should-replace-command): Adjust check for 'eshell-with-copied-handles'.
148 lines
6.1 KiB
EmacsLisp
148 lines
6.1 KiB
EmacsLisp
;;; em-tramp-tests.el --- em-tramp test suite -*- lexical-binding:t -*-
|
|
|
|
;; Copyright (C) 2022-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/>.
|
|
|
|
;;; Code:
|
|
|
|
(require 'ert)
|
|
(require 'em-tramp)
|
|
(require 'tramp)
|
|
|
|
(defmacro em-tramp-test/should-replace-command (form replacement)
|
|
"Check that calling FORM results in it being replaced with REPLACEMENT."
|
|
(declare (indent 1))
|
|
`(should (equal
|
|
(catch 'eshell-replace-command ,form)
|
|
(list 'eshell-with-copied-handles
|
|
(list 'eshell-do-command ,replacement)))))
|
|
|
|
(ert-deftest em-tramp-test/su-default ()
|
|
"Test Eshell `su' command with no arguments."
|
|
(em-tramp-test/should-replace-command (eshell/su)
|
|
`(eshell-named-command
|
|
"cd"
|
|
(list ,(format "/su:root@%s:%s"
|
|
tramp-default-host default-directory)))))
|
|
|
|
(ert-deftest em-tramp-test/su-user ()
|
|
"Test Eshell `su' command with USER argument."
|
|
(em-tramp-test/should-replace-command (eshell/su "USER")
|
|
`(eshell-named-command
|
|
"cd"
|
|
(list ,(format "/su:USER@%s:%s"
|
|
tramp-default-host default-directory)))))
|
|
|
|
(ert-deftest em-tramp-test/su-login ()
|
|
"Test Eshell `su' command with -/-l/--login option."
|
|
(dolist (args '(("--login")
|
|
("-l")
|
|
("-")))
|
|
(em-tramp-test/should-replace-command (apply #'eshell/su args)
|
|
`(eshell-named-command
|
|
"cd"
|
|
(list ,(format "/su:root@%s:~/" tramp-default-host))))))
|
|
|
|
(ert-deftest em-tramp-test/sudo-basic ()
|
|
"Test Eshell `sudo' command with default user."
|
|
(let ((sudo-directory (format "/sudo:root@%s:%s"
|
|
tramp-default-host default-directory)))
|
|
(should (equal (catch 'eshell-replace-command
|
|
(eshell/sudo "echo" "hi"))
|
|
`(let ((default-directory ,sudo-directory))
|
|
(eshell-named-command '"echo" '("hi")))))
|
|
(should (equal (catch 'eshell-replace-command
|
|
(eshell/sudo "echo" "-u" "hi"))
|
|
`(let ((default-directory ,sudo-directory))
|
|
(eshell-named-command '"echo" '("-u" "hi")))))))
|
|
|
|
(ert-deftest em-tramp-test/sudo-user ()
|
|
"Test Eshell `sudo' command with specified user."
|
|
(let ((sudo-directory (format "/sudo:USER@%s:%s"
|
|
tramp-default-host default-directory)))
|
|
(should (equal (catch 'eshell-replace-command
|
|
(eshell/sudo "-u" "USER" "echo" "hi"))
|
|
`(let ((default-directory ,sudo-directory))
|
|
(eshell-named-command '"echo" '("hi")))))
|
|
(should (equal (catch 'eshell-replace-command
|
|
(eshell/sudo "-u" "USER" "echo" "-u" "hi"))
|
|
`(let ((default-directory ,sudo-directory))
|
|
(eshell-named-command '"echo" '("-u" "hi")))))))
|
|
|
|
(ert-deftest em-tramp-test/sudo-shell ()
|
|
"Test Eshell `sudo' command with -s/--shell option."
|
|
(dolist (args '(("--shell")
|
|
("-s")))
|
|
(em-tramp-test/should-replace-command (apply #'eshell/sudo args)
|
|
`(eshell-named-command
|
|
"cd"
|
|
(list ,(format "/sudo:root@%s:%s"
|
|
tramp-default-host default-directory))))))
|
|
|
|
(ert-deftest em-tramp-test/sudo-user-shell ()
|
|
"Test Eshell `sudo' command with -s and -u options."
|
|
(em-tramp-test/should-replace-command (eshell/sudo "-u" "USER" "-s")
|
|
`(eshell-named-command
|
|
"cd"
|
|
(list ,(format "/sudo:USER@%s:%s"
|
|
tramp-default-host default-directory)))))
|
|
|
|
(ert-deftest em-tramp-test/doas-basic ()
|
|
"Test Eshell `doas' command with default user."
|
|
(let ((doas-directory (format "/doas:root@%s:%s"
|
|
tramp-default-host default-directory)))
|
|
(should (equal (catch 'eshell-replace-command
|
|
(eshell/doas "echo" "hi"))
|
|
`(let ((default-directory ,doas-directory))
|
|
(eshell-named-command '"echo" '("hi")))))
|
|
(should (equal (catch 'eshell-replace-command
|
|
(eshell/doas "echo" "-u" "hi"))
|
|
`(let ((default-directory ,doas-directory))
|
|
(eshell-named-command '"echo" '("-u" "hi")))))))
|
|
|
|
(ert-deftest em-tramp-test/doas-user ()
|
|
"Test Eshell `doas' command with specified user."
|
|
(let ((doas-directory (format "/doas:USER@%s:%s"
|
|
tramp-default-host default-directory)))
|
|
(should (equal (catch 'eshell-replace-command
|
|
(eshell/doas "-u" "USER" "echo" "hi"))
|
|
`(let ((default-directory ,doas-directory))
|
|
(eshell-named-command '"echo" '("hi")))))
|
|
(should (equal (catch 'eshell-replace-command
|
|
(eshell/doas "-u" "USER" "echo" "-u" "hi"))
|
|
`(let ((default-directory ,doas-directory))
|
|
(eshell-named-command '"echo" '("-u" "hi")))))))
|
|
|
|
(ert-deftest em-tramp-test/doas-shell ()
|
|
"Test Eshell `doas' command with -s/--shell option."
|
|
(dolist (args '(("--shell")
|
|
("-s")))
|
|
(em-tramp-test/should-replace-command (apply #'eshell/doas args)
|
|
`(eshell-named-command
|
|
"cd"
|
|
(list ,(format "/doas:root@%s:%s"
|
|
tramp-default-host default-directory))))))
|
|
|
|
(ert-deftest em-tramp-test/doas-user-shell ()
|
|
"Test Eshell `doas' command with -s and -u options."
|
|
(em-tramp-test/should-replace-command (eshell/doas "-u" "USER" "-s")
|
|
`(eshell-named-command
|
|
"cd"
|
|
(list ,(format "/doas:USER@%s:%s"
|
|
tramp-default-host default-directory)))))
|
|
|
|
;;; em-tramp-tests.el ends here
|