diff options
author | Michael Albinus <michael.albinus@gmx.de> | 2023-01-15 18:49:37 +0100 |
---|---|---|
committer | Michael Albinus <michael.albinus@gmx.de> | 2023-01-15 18:49:37 +0100 |
commit | 4d37504c432aad019a68698e590912a538c09d36 (patch) | |
tree | 67140a3e6ebb6b9f5212609c6b184c4c9c390231 | |
parent | ead86da14bffe1ce7471745bc9f443b7001f362a (diff) | |
download | emacs-4d37504c432aad019a68698e590912a538c09d36.tar.gz |
Improve Tramp robustness
* lisp/net/tramp-cmds.el (tramp-cleanup-connection):
Protect `delete-process'.
* test/lisp/net/tramp-tests.el (tramp-test29-start-file-process)
(tramp-test30-make-process): Don't test disabled process filter.
-rw-r--r-- | lisp/net/tramp-cmds.el | 2 | ||||
-rw-r--r-- | test/lisp/net/tramp-tests.el | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el index dc967dccf68..6627ef47ee2 100644 --- a/lisp/net/tramp-cmds.el +++ b/lisp/net/tramp-cmds.el @@ -127,7 +127,7 @@ When called interactively, a Tramp connection has to be selected." (or (not keep-processes) (eq key (tramp-get-process vec)))) (tramp-flush-connection-properties key) - (delete-process key))) + (ignore-errors (delete-process key)))) ;; Remove buffers. (dolist diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 6172535a655..168933b6b46 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -4852,8 +4852,8 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." ;; Cleanup. (ignore-errors (delete-process proc))) - ;; Disabled process filter. "sshfs" does not cooperate. - (unless (tramp--test-sshfs-p) + ;; Disabled process filter. It doesn't work reliable. + (unless t (unwind-protect (with-temp-buffer (setq command '("cat") @@ -5046,8 +5046,8 @@ If UNSTABLE is non-nil, the test is tagged as `:unstable'." ;; Cleanup. (ignore-errors (delete-process proc))) - ;; Disabled process filter. "sshfs" does not cooperate. - (unless (tramp--test-sshfs-p) + ;; Disabled process filter. It doesn't work reliable. + (unless t (unwind-protect (with-temp-buffer (setq command '("cat") |