diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2023-05-15 16:25:23 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2023-05-15 16:25:23 +0200 |
| commit | 8eb129a2ca4643a78c7afecc3226f183a1deb143 (patch) | |
| tree | 03154f585ecd2435482c97e004f5aa413c38b438 /test | |
| parent | 98e8c0b2486faeba45bce68d1c20a5019ca51f71 (diff) | |
| download | emacs-8eb129a2ca4643a78c7afecc3226f183a1deb143.tar.gz | |
Fix some minor Tramp problems
* lisp/net/tramp-crypt.el (tramp-crypt-handle-file-exists-p): New defun.
(tramp-crypt-file-name-handler-alist): Add it.
* lisp/net/tramp-smb.el (tramp-smb-handle-copy-file): Flush proper file
properties.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs28-p):
New defun.
(tramp-archive-test48-auto-load): Extend test.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/net/tramp-archive-tests.el | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/test/lisp/net/tramp-archive-tests.el b/test/lisp/net/tramp-archive-tests.el index 80ec67da8d2..5485b12f74f 100644 --- a/test/lisp/net/tramp-archive-tests.el +++ b/test/lisp/net/tramp-archive-tests.el @@ -121,6 +121,12 @@ the origin of the temporary TMPFILE, have no write permissions." (directory-files tmpfile 'full directory-files-no-dot-files-regexp)) (delete-directory tmpfile))) +(defun tramp-archive--test-emacs28-p () + "Check for Emacs version >= 28.1. +Some semantics has been changed for there, without new functions or +variables, so we check the Emacs version directly." + (>= emacs-major-version 28)) + (ert-deftest tramp-archive-test00-availability () "Test availability of archive file name functions." :expected-result (if tramp-archive-enabled :passed :failed) @@ -912,12 +918,15 @@ This tests also `file-executable-p', `file-writable-p' and `set-file-modes'." (featurep 'tramp-archive))))")) (dolist (enabled '(t nil)) (dolist (default-directory - `(,temporary-file-directory + (append + `(,temporary-file-directory) ;; Starting Emacs in a directory which has ;; `tramp-archive-file-name-regexp' syntax is ;; supported only with Emacs > 27.2 (sigh!). ;; (Bug#48476) - ,(file-name-as-directory tramp-archive-test-directory))) + (and (tramp-archive--test-emacs28-p) + `(,(file-name-as-directory + tramp-archive-test-directory))))) (dolist (file `("/mock::foo" ,(concat tramp-archive-test-archive "foo"))) (should (string-match |