diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2021-11-24 16:54:59 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2021-11-24 16:54:59 +0100 |
| commit | 764ffa76ed00f7a69e56a6898c22383a204421eb (patch) | |
| tree | d0dd6172a00410ce1523822e1f4c216a2a24658d /test | |
| parent | 756b8a5f1bd28aeadc804fd2f93ce7e823a1d4a2 (diff) | |
| download | emacs-764ffa76ed00f7a69e56a6898c22383a204421eb.tar.gz | |
Backport Tramp fixes, don't merge
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/net/tramp-archive-tests.el | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/test/lisp/net/tramp-archive-tests.el b/test/lisp/net/tramp-archive-tests.el index 98012f4e909..0a484ff9bd1 100644 --- a/test/lisp/net/tramp-archive-tests.el +++ b/test/lisp/net/tramp-archive-tests.el @@ -265,21 +265,20 @@ variables, so we check the Emacs version directly." (concat (tramp-gvfs-url-file-name (tramp-make-tramp-file-name - tramp-archive-method - ;; User and Domain. - nil nil - ;; Host. - (url-hexify-string - (concat - "file://" - ;; `directory-file-name' does not leave file - ;; archive boundaries. So we must cut the - ;; trailing slash ourselves. - (substring - (file-name-directory - (tramp-archive-test-file-archive-hexlified)) - 0 -1))) - nil "/")) + (make-tramp-file-name + :method tramp-archive-method + :host + (url-hexify-string + (concat + "file://" + ;; `directory-file-name' does not leave file + ;; archive boundaries. So we must cut the + ;; trailing slash ourselves. + (substring + (file-name-directory + (tramp-archive-test-file-archive-hexlified)) + 0 -1))) + :localname "/"))) (file-name-nondirectory tramp-archive-test-file-archive))))) (should-not port) (should (string-equal localname "/bar")) |