aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMichael Albinus2022-07-03 18:23:55 +0200
committerMichael Albinus2022-07-03 18:23:55 +0200
commitc8da2a991ee042742f4da65e99f751c14da8354a (patch)
tree124121b64ea6fe542b6ef3ad1832ee29ca47967a /test
parent676d38cfc34a001d0eebbb512468bafb3ba292cf (diff)
downloademacs-c8da2a991ee042742f4da65e99f751c14da8354a.tar.gz
emacs-c8da2a991ee042742f4da65e99f751c14da8354a.zip
Tramp code cleanup
* lisp/net/tramp-cache.el (tramp-get-file-property) (tramp-get-connection-property): Make DEFAULT optional. Adapt callees. * lisp/net/tramp.el: * lisp/net/tramp-adb.el: * lisp/net/tramp-cmds.el: * lisp/net/tramp-compat.el: * lisp/net/tramp-crypt.el: * lisp/net/tramp-ftp.el: * lisp/net/tramp-fuse.el: * lisp/net/tramp-gvfs.el: * lisp/net/tramp-integration.el: * lisp/net/tramp-sh.el: * lisp/net/tramp-smb.el: * lisp/net/tramp-sshfs.el: * lisp/net/trampver.el: Code cleanup. * test/lisp/net/tramp-tests.el (tramp--test-sh-no-ls--dired-p) (tramp--test-with-proper-process-name-and-buffer): Code cleanup.
Diffstat (limited to 'test')
-rw-r--r--test/lisp/net/tramp-tests.el16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 63fd96cae80..a53fc7ec7ac 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -6570,7 +6570,7 @@ Additionally, ls does not support \"--dired\"."
6570 ;; This fails for tramp-crypt.el, so we ignore that. 6570 ;; This fails for tramp-crypt.el, so we ignore that.
6571 (ignore-errors 6571 (ignore-errors
6572 (insert-directory ert-remote-temporary-file-directory "-al")) 6572 (insert-directory ert-remote-temporary-file-directory "-al"))
6573 (not (tramp-get-connection-property tramp-test-vec "ls--dired" nil))))) 6573 (not (tramp-get-connection-property tramp-test-vec "ls--dired")))))
6574 6574
6575(defun tramp--test-share-p () 6575(defun tramp--test-share-p ()
6576 "Check, whether the method needs a share." 6576 "Check, whether the method needs a share."
@@ -7141,13 +7141,13 @@ The values are derived from PROC. Run BODY.
7141This is needed in timer functions as well as process filters and sentinels." 7141This is needed in timer functions as well as process filters and sentinels."
7142 ;; FIXME: For tramp-sshfs.el, `processp' does not work. 7142 ;; FIXME: For tramp-sshfs.el, `processp' does not work.
7143 (declare (indent 1) (debug (processp body))) 7143 (declare (indent 1) (debug (processp body)))
7144 `(let* ((v (tramp-get-connection-property ,proc "vector" nil)) 7144 `(let* ((v (tramp-get-connection-property ,proc "vector"))
7145 (pname (tramp-get-connection-property v "process-name" nil)) 7145 (pname (tramp-get-connection-property v "process-name"))
7146 (pbuffer (tramp-get-connection-property v "process-buffer" nil))) 7146 (pbuffer (tramp-get-connection-property v "process-buffer")))
7147 (tramp--test-message 7147 (tramp--test-message
7148 "tramp--test-with-proper-process-name-and-buffer before %s %s" 7148 "tramp--test-with-proper-process-name-and-buffer before %s %s"
7149 (tramp-get-connection-property v "process-name" nil) 7149 (tramp-get-connection-property v "process-name")
7150 (tramp-get-connection-property v "process-buffer" nil)) 7150 (tramp-get-connection-property v "process-buffer"))
7151 (if (process-name ,proc) 7151 (if (process-name ,proc)
7152 (tramp-set-connection-property v "process-name" (process-name ,proc)) 7152 (tramp-set-connection-property v "process-name" (process-name ,proc))
7153 (tramp-flush-connection-property v "process-name")) 7153 (tramp-flush-connection-property v "process-name"))
@@ -7157,8 +7157,8 @@ This is needed in timer functions as well as process filters and sentinels."
7157 (tramp-flush-connection-property v "process-buffer")) 7157 (tramp-flush-connection-property v "process-buffer"))
7158 (tramp--test-message 7158 (tramp--test-message
7159 "tramp--test-with-proper-process-name-and-buffer changed %s %s" 7159 "tramp--test-with-proper-process-name-and-buffer changed %s %s"
7160 (tramp-get-connection-property v "process-name" nil) 7160 (tramp-get-connection-property v "process-name")
7161 (tramp-get-connection-property v "process-buffer" nil)) 7161 (tramp-get-connection-property v "process-buffer"))
7162 (unwind-protect 7162 (unwind-protect
7163 (progn ,@body) 7163 (progn ,@body)
7164 (if pname 7164 (if pname