[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 7e07bb2: Test `shell-command-width' in Tramp
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master 7e07bb2: Test `shell-command-width' in Tramp |
Date: |
Wed, 17 Apr 2019 05:42:13 -0400 (EDT) |
branch: master
commit 7e07bb2d2911f1a1dd3696227187501d7b7278a9
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
Test `shell-command-width' in Tramp
* test/lisp/net/tramp-tests.el
(tramp--test-shell-command-to-string-asynchronously): Move up.
(tramp-test32-shell-command): Test `shell-command-width'.
---
test/lisp/net/tramp-tests.el | 42 ++++++++++++++++++++++++++++++++----------
1 file changed, 32 insertions(+), 10 deletions(-)
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index cc3200b..64eb1dd 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -4079,6 +4079,16 @@ This tests also `make-symbolic-link', `file-truename'
and `add-name-to-file'."
;; Cleanup.
(ignore-errors (delete-process proc)))))
+(defun tramp--test-shell-command-to-string-asynchronously (command)
+ "Like `shell-command-to-string', but for asynchronous processes."
+ (with-temp-buffer
+ (async-shell-command command (current-buffer))
+ (with-timeout
+ ((if (getenv "EMACS_EMBA_CI") 30 10) (tramp--test-timeout-handler))
+ (while (accept-process-output
+ (get-buffer-process (current-buffer)) nil nil t)))
+ (buffer-substring-no-properties (point-min) (point-max))))
+
(ert-deftest tramp-test32-shell-command ()
"Check `shell-command'."
:tags '(:expensive-test)
@@ -4094,6 +4104,8 @@ This tests also `make-symbolic-link', `file-truename' and
`add-name-to-file'."
;; Suppress nasty messages.
(inhibit-message t)
kill-buffer-query-functions)
+
+ ;; Test ordinary `shell-command'.
(unwind-protect
(with-temp-buffer
(write-region "foo" nil tmp-name)
@@ -4114,6 +4126,7 @@ This tests also `make-symbolic-link', `file-truename' and
`add-name-to-file'."
;; Cleanup.
(ignore-errors (delete-file tmp-name)))
+ ;; Test ordinary `async-shell-command'.
(unwind-protect
(with-temp-buffer
(write-region "foo" nil tmp-name)
@@ -4142,6 +4155,7 @@ This tests also `make-symbolic-link', `file-truename' and
`add-name-to-file'."
;; Cleanup.
(ignore-errors (delete-file tmp-name)))
+ ;; Test sending string to `async-shell-command'.
(unwind-protect
(with-temp-buffer
(write-region "foo" nil tmp-name)
@@ -4169,17 +4183,25 @@ This tests also `make-symbolic-link', `file-truename'
and `add-name-to-file'."
(buffer-string))))
;; Cleanup.
- (ignore-errors (delete-file tmp-name))))))
+ (ignore-errors (delete-file tmp-name)))
-(defun tramp--test-shell-command-to-string-asynchronously (command)
- "Like `shell-command-to-string', but for asynchronous processes."
- (with-temp-buffer
- (async-shell-command command (current-buffer))
- (with-timeout
- ((if (getenv "EMACS_EMBA_CI") 30 10) (tramp--test-timeout-handler))
- (while (accept-process-output
- (get-buffer-process (current-buffer)) nil nil t)))
- (buffer-substring-no-properties (point-min) (point-max))))
+ ;; Test `shell-command-width' of `async-shell-command'.
+ (when (tramp--test-sh-p)
+ (let (shell-command-width)
+ (should
+ (string-equal
+ ;; `frame-width' does not return a proper value.
+ ;; `process-lines' uses `call-process', it doesn't care
+ ;; about `shell-command-width'.
+ (format "%s\n" (car (process-lines "tput" "cols")))
+ (tramp--test-shell-command-to-string-asynchronously
+ "tput cols")))
+ (setq shell-command-width 1024)
+ (should
+ (string-equal
+ "1024\n"
+ (tramp--test-shell-command-to-string-asynchronously
+ "tput cols"))))))))
;; This test is inspired by Bug#23952.
(ert-deftest tramp-test33-environment-variables ()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 7e07bb2: Test `shell-command-width' in Tramp,
Michael Albinus <=