diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2023-06-11 20:33:34 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2023-06-11 20:33:34 +0200 |
| commit | 4256123c4673d8b13f9acd6b0e06a80d258f140a (patch) | |
| tree | 7129d6875aca44b23831acf5982e5044971c0258 /test/lisp | |
| parent | acfd261a61a5bdc00f714aeec74635ac9ef87457 (diff) | |
| download | emacs-4256123c4673d8b13f9acd6b0e06a80d258f140a.tar.gz emacs-4256123c4673d8b13f9acd6b0e06a80d258f140a.tar.bz2 emacs-4256123c4673d8b13f9acd6b0e06a80d258f140a.zip | |
Fix tramp-sshfs
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-exists-p): New defun.
(tramp-fuse-mount-timeout): Move up.
(tramp-fuse-mount-point): Use `tramp-fuse-mount-timeout'.
(tramp-fuse-unmount): Flush "mount-point" file property.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-fuse-handle-file-exists-p'.
* test/lisp/net/tramp-tests.el (all): Use function read syntax
where appropriate.
(tramp-test39-detect-external-change): Let-bind
`read-from-minibuffer' instead of `yes-or-no-p'.
Diffstat (limited to 'test/lisp')
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 017cb73f3bb..0b01c13470a 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -2559,7 +2559,7 @@ This checks also `file-name-as-directory', `file-name-directory', ;; Do not overwrite if excluded. (cl-letf (((symbol-function #'y-or-n-p) #'tramp-compat-always) ;; Ange-FTP. - ((symbol-function 'yes-or-no-p) #'tramp-compat-always)) + ((symbol-function #'yes-or-no-p) #'tramp-compat-always)) (write-region "foo" nil tmp-name nil nil nil 'mustbenew)) (should-error (cl-letf (((symbol-function #'y-or-n-p) #'ignore) @@ -6737,8 +6737,9 @@ INPUT, if non-nil, is a string sent to the process." (insert "foo") ;; Bug#53207: with `create-lockfiles' nil, saving the ;; buffer results in a prompt. - (cl-letf (((symbol-function 'yes-or-no-p) - (lambda (_) (ert-fail "Test failed unexpectedly")))) + (cl-letf (((symbol-function #'read-from-minibuffer) + (lambda (&rest _) + (ert-fail "Test failed unexpectedly")))) (should (buffer-modified-p)) (save-buffer) (should-not (buffer-modified-p))) @@ -6756,7 +6757,7 @@ INPUT, if non-nil, is a string sent to the process." ;; modification time properly, for them it doesn't ;; make sense to test. (when (not (verify-visited-file-modtime)) - (cl-letf (((symbol-function 'read-char-choice) + (cl-letf (((symbol-function #'read-char-choice) (lambda (prompt &rest _) (message "%s" prompt) ?y))) (ert-with-message-capture captured-messages (insert "bar") @@ -6772,9 +6773,9 @@ INPUT, if non-nil, is a string sent to the process." (should (file-locked-p tmp-name))))) ;; `save-buffer' removes the file lock. - (cl-letf (((symbol-function 'yes-or-no-p) + (cl-letf (((symbol-function #'yes-or-no-p) #'tramp-compat-always) - ((symbol-function 'read-char-choice) + ((symbol-function #'read-char-choice) (lambda (&rest _) ?y))) (should (buffer-modified-p)) (save-buffer) |