From cad6dfb67f541abaefb5d0f9784e660f39b9b645 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Fri, 7 Feb 2014 16:47:18 +0100 Subject: [PATCH] * automated/tramp-tests.el (tramp-test26-process-file): Improve test. (tramp-test27-start-file-process): Use "_p" as argument of lambda. (tramp-test28-shell-command): Improve `shell-command' test. Add `async-shell-command' tests. --- test/ChangeLog | 7 +++++++ test/automated/tramp-tests.el | 48 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/test/ChangeLog b/test/ChangeLog index 597782da416..e3902c02477 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,10 @@ +2014-02-07 Michael Albinus + + * automated/tramp-tests.el (tramp-test26-process-file): Improve test. + (tramp-test27-start-file-process): Use "_p" as argument of lambda. + (tramp-test28-shell-command): Improve `shell-command' test. Add + `async-shell-command' tests. + 2014-02-04 Michael Albinus * automated/file-notify-tests.el (file-notify--wait-for-events): diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index f038d687e34..182dc4bdfb7 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -1084,8 +1084,14 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (should-not (zerop (process-file "binary-does-not-exist"))) (with-temp-buffer (write-region "foo" nil tmp-name) - (should (zerop (process-file "ls" nil t))) - (should (> (point-max) (point-min))))) + (should (file-exists-p tmp-name)) + (should + (zerop + (process-file "ls" nil t nil (file-name-nondirectory tmp-name)))) + (should + (string-equal + (format "%s\n" (file-name-nondirectory tmp-name)) + (buffer-string))))) (ignore-errors (delete-file tmp-name))))) (ert-deftest tramp-test27-start-file-process () @@ -1130,7 +1136,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (should (processp proc)) (should (equal (process-status proc) 'run)) (set-process-filter - proc (lambda (p s) (should (string-equal s "foo")))) + proc (lambda (_p s) (should (string-equal s "foo")))) (process-send-string proc "foo") (process-send-eof proc) (accept-process-output proc 1)) @@ -1147,9 +1153,39 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (default-directory tramp-test-temporary-file-directory)) (unwind-protect (with-temp-buffer - (write-region "foo" nil tmp-name) - (shell-command "ls" (current-buffer)) - (should (> (point-max) (point-min)))) + (write-region "foo" nil tmp-name nil) + (should (file-exists-p tmp-name)) + (shell-command + (format "ls %s" (file-name-nondirectory tmp-name)) (current-buffer)) + (should + (string-equal + (format "%s\n" (file-name-nondirectory tmp-name)) (buffer-string)))) + (ignore-errors (delete-file tmp-name))) + + (unwind-protect + (with-temp-buffer + (write-region "foo" nil tmp-name nil) + (should (file-exists-p tmp-name)) + (async-shell-command + (format "ls %s" (file-name-nondirectory tmp-name)) (current-buffer)) + (sit-for 1 'nodisplay) + (should + (string-equal + (format "%s\n" (file-name-nondirectory tmp-name)) (buffer-string)))) + (ignore-errors (delete-file tmp-name))) + + (unwind-protect + (with-temp-buffer + (write-region "foo" nil tmp-name) + (should (file-exists-p tmp-name)) + (async-shell-command "read line; ls $line" (current-buffer)) + (process-send-string + (get-buffer-process (current-buffer)) + (format "%s\n" (file-name-nondirectory tmp-name))) + (sit-for 1 'nodisplay) + (should + (string-equal + (format "%s\n" (file-name-nondirectory tmp-name)) (buffer-string)))) (ignore-errors (delete-file tmp-name))))) (ert-deftest tramp-test29-utf8 () -- 2.11.4.GIT