[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 0016f5f: Adapt tramp-tests
From: |
Michael Albinus |
Subject: |
master 0016f5f: Adapt tramp-tests |
Date: |
Thu, 27 Aug 2020 14:34:44 -0400 (EDT) |
branch: master
commit 0016f5f149f4ca07cbe79aec54b316d8b0722aad
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
Adapt tramp-tests
* test/lisp/net/tramp-tests.el (tramp-test05-expand-file-name)
(tramp-test05-expand-file-name-relative): Adapt tests.
---
test/lisp/net/tramp-tests.el | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index aa00c07..2971674 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 0016f5f: Adapt tramp-tests,
Michael Albinus <=