diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2020-08-27 20:34:36 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2020-08-27 20:34:36 +0200 |
| commit | 0016f5f149f4ca07cbe79aec54b316d8b0722aad (patch) | |
| tree | daf77b309d4488633b9b2506507a423371f1fab2 /test/lisp | |
| parent | 85f42836b6698e7fcfba9aaea7216e267e10c91b (diff) | |
| download | emacs-0016f5f149f4ca07cbe79aec54b316d8b0722aad.tar.gz | |
Adapt tramp-tests
* test/lisp/net/tramp-tests.el (tramp-test05-expand-file-name)
(tramp-test05-expand-file-name-relative): Adapt tests.
Diffstat (limited to 'test/lisp')
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index aa00c07f794..297167416d6 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -2131,16 +2131,19 @@ is greater than 10. (expand-file-name "/method:host:/path/../file") "/method:host:/file")) (should (string-equal - (expand-file-name "/method:host:/path/.") "/method:host:/path/")) + (expand-file-name "/method:host:/path/.") + (if (tramp--test-emacs28-p) "/method:host:/path/" "/method:host:/path"))) (should (string-equal (expand-file-name "/method:host:/path/..") "/method:host:/")) (should (string-equal - (expand-file-name "." "/method:host:/path/") "/method:host:/path/")) + (expand-file-name "." "/method:host:/path/") + (if (tramp--test-emacs28-p) "/method:host:/path/" "/method:host:/path"))) (should (string-equal - (expand-file-name "" "/method:host:/path/") "/method:host:/path/")) + (expand-file-name "" "/method:host:/path/") + (if (tramp--test-emacs28-p) "/method:host:/path/" "/method:host:/path"))) ;; Quoting local part. (should (string-equal @@ -2159,14 +2162,8 @@ is greater than 10. (ert-deftest tramp-test05-expand-file-name-relative () "Check `expand-file-name'." (skip-unless (tramp--test-enabled)) - - ;; These are the methods the test doesn't fail. - (when (or (tramp--test-adb-p) (tramp--test-ange-ftp-p) (tramp--test-gvfs-p) - (tramp--test-rclone-p) - (tramp--test-smb-p)) - (setf (ert-test-expected-result-type - (ert-get-test 'tramp-test05-expand-file-name-relative)) - :passed)) + ;; The bugs are fixed in Emacs 28.1. + (skip-unless (tramp--test-emacs28-p)) (should (string-equal |