diff options
| author | Michael Albinus | 2023-02-14 18:51:44 +0100 |
|---|---|---|
| committer | Michael Albinus | 2023-02-14 18:51:44 +0100 |
| commit | 82133dea0d021eb2e395d9265f0cfe58822f2c57 (patch) | |
| tree | aa552684696351a89915fbc59d88796baafc2bf2 /test | |
| parent | 864bf5dda4a0f84041d30165a995f2160d1e92f9 (diff) | |
| download | emacs-82133dea0d021eb2e395d9265f0cfe58822f2c57.tar.gz emacs-82133dea0d021eb2e395d9265f0cfe58822f2c57.zip | |
Tramp cleanup
* lisp/net/tramp.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-sh.el: Use `string-join'.
* test/lisp/net/tramp-tests.el: Use `string-join'.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 51fc07117c5..d29e48c0774 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el | |||
| @@ -5542,7 +5542,7 @@ If UNSTABLE is non-nil, the test is tagged as `:unstable'." | |||
| 5542 | ;; (tramp--test-message "%s" attributes) | 5542 | ;; (tramp--test-message "%s" attributes) |
| 5543 | (should (equal (cdr (assq 'comm attributes)) (car command))) | 5543 | (should (equal (cdr (assq 'comm attributes)) (car command))) |
| 5544 | (should (equal (cdr (assq 'args attributes)) | 5544 | (should (equal (cdr (assq 'args attributes)) |
| 5545 | (mapconcat #'identity command " "))))) | 5545 | (string-join command " "))))) |
| 5546 | 5546 | ||
| 5547 | ;; Cleanup. | 5547 | ;; Cleanup. |
| 5548 | (ignore-errors (delete-process proc))))) | 5548 | (ignore-errors (delete-process proc))))) |
| @@ -6103,8 +6103,7 @@ INPUT, if non-nil, is a string sent to the process." | |||
| 6103 | ;; We make a super long `tramp-remote-path'. | 6103 | ;; We make a super long `tramp-remote-path'. |
| 6104 | (make-directory tmp-name) | 6104 | (make-directory tmp-name) |
| 6105 | (should (file-directory-p tmp-name)) | 6105 | (should (file-directory-p tmp-name)) |
| 6106 | (while (tramp-compat-length< | 6106 | (while (tramp-compat-length< (string-join orig-exec-path ":") 5000) |
| 6107 | (mapconcat #'identity orig-exec-path ":") 5000) | ||
| 6108 | (let ((dir (make-temp-file (file-name-as-directory tmp-name) 'dir))) | 6107 | (let ((dir (make-temp-file (file-name-as-directory tmp-name) 'dir))) |
| 6109 | (should (file-directory-p dir)) | 6108 | (should (file-directory-p dir)) |
| 6110 | (setq tramp-remote-path | 6109 | (setq tramp-remote-path |
| @@ -6126,8 +6125,7 @@ INPUT, if non-nil, is a string sent to the process." | |||
| 6126 | tramp-test-vec "pipe-buf" 4096)) | 6125 | tramp-test-vec "pipe-buf" 4096)) |
| 6127 | ;; The last element of `exec-path' is `exec-directory'. | 6126 | ;; The last element of `exec-path' is `exec-directory'. |
| 6128 | (should | 6127 | (should |
| 6129 | (string-equal | 6128 | (string-equal path (string-join (butlast orig-exec-path) ":")))) |
| 6130 | path (mapconcat #'identity (butlast orig-exec-path) ":")))) | ||
| 6131 | ;; The shell "sh" shall always exist. | 6129 | ;; The shell "sh" shall always exist. |
| 6132 | (should (executable-find "sh" 'remote))) | 6130 | (should (executable-find "sh" 'remote))) |
| 6133 | 6131 | ||
| @@ -7182,7 +7180,7 @@ This requires restrictions of file name syntax." | |||
| 7182 | ;; Simplify test in order to speed up. | 7180 | ;; Simplify test in order to speed up. |
| 7183 | (apply #'tramp--test-check-files | 7181 | (apply #'tramp--test-check-files |
| 7184 | (if (tramp--test-expensive-test-p) | 7182 | (if (tramp--test-expensive-test-p) |
| 7185 | files (list (mapconcat #'identity files "")))))) | 7183 | files (list (string-join files "")))))) |
| 7186 | 7184 | ||
| 7187 | (tramp--test-deftest-with-stat tramp-test41-special-characters) | 7185 | (tramp--test-deftest-with-stat tramp-test41-special-characters) |
| 7188 | 7186 | ||