procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adapt tramp-test32-shell-command

Browse source 
* test/lisp/net/tramp-tests.el (tramp-test32-shell-command):
Test error buffer for synchronous `shell-command' only.
This commit is contained in:
Michael Albinus 2020-01-24 14:42:12 +01:00
parent 0debadb4e3
commit ff630b5693
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
test/lisp/net/tramp-tests.el
View file

@ -4492,25 +4492,20 @@ INPUT, if non-nil, is a string sent to the process."
(buffer-string))))
;; Cleanup.
(ignore-errors (delete-file tmp-name)))
(ignore-errors (delete-file tmp-name))))
;; Test `{async-}shell-command' with error buffer.
(let ((stderr (generate-new-buffer "*stderr*")))
(unwind-protect
(with-temp-buffer
(funcall
this-shell-command "cat /; sleep 1" (current-buffer) stderr)
;; Check stderr.
(when (eq this-shell-command #'tramp--test-async-shell-command)
(ignore-errors
(delete-process (get-buffer-process (current-buffer)))))
(should (zerop (buffer-size)))
(with-current-buffer stderr
(should
(string-match "cat:.* Is a directory" (buffer-string)))))
;; Test `shell-command' with error buffer.
(let ((stderr (generate-new-buffer "*stderr*")))
(unwind-protect
(with-temp-buffer
(shell-command "echo foo; echo bar >&2" (current-buffer) stderr)
(should (string-equal "foo\n" (buffer-string)))
;; Check stderr.
(with-current-buffer stderr
(should (string-equal "bar\n" (buffer-string)))))
;; Cleanup.
(ignore-errors (kill-buffer stderr)))))
;; Cleanup.
(ignore-errors (kill-buffer stderr))))
;; Test sending string to `async-shell-command'.
(unwind-protect